maintenance: remove hardcoded crd constants in restoreCrd #354
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
travisn
requested changes
Jan 30, 2025
There was a problem hiding this comment.
In the kubectl-rook-ceph repo we will only want to include upstream Rook resources. Instead, I would suggest that this ResourceCrd() method could accept arguments for a resource group name. In this repo the command will only set the ceph.rook.io group, while external repos that are extending this code could pass a different group name.
OdedViner
force-pushed
the
add_ocs_crs
branch
3 times, most recently
from
72aafbd to
1b30ff8
Compare
travisn
requested changes
Feb 5, 2025
cmd/commands/restore.go
Outdated
| @@ -31,6 +31,6 @@ var RestoreCmd = &cobra.Command{ | |||
| verifyOperatorPodIsRunning(cmd.Context(), clientSets) | |||
| }, | |||
| Run: func(cmd *cobra.Command, args []string) { | |||
| restore.RestoreCrd(cmd.Context(), clientSets, operatorNamespace, cephClusterNamespace, args) | |||
| restore.RestoreCrd(cmd.Context(), clientSets, operatorNamespace, cephClusterNamespace, nil, nil, args) | |||
There was a problem hiding this comment.
Suggested change
| restore.RestoreCrd(cmd.Context(), clientSets, operatorNamespace, cephClusterNamespace, nil, nil, args) | |
| restore.RestoreCrd(cmd.Context(), clientSets, operatorNamespace, cephClusterNamespace, crds.CephRookIoGroup, crds.CephRookResourcesVersion, args) |
pkg/restore/crd.go
Outdated
| @@ -32,7 +32,8 @@ import ( | |||
| "k8s.io/apimachinery/pkg/types" | |||
| ) | |||
|
|
|||
| func RestoreCrd(ctx context.Context, k8sclientset *k8sutil.Clientsets, operatorNamespace, clusterNamespace string, args []string) { | |||
| func RestoreCrd(ctx context.Context, k8sclientset *k8sutil.Clientsets, operatorNamespace, clusterNamespace string, | |||
| groupNameOptional, versionResourceOptional *string, args []string) { | |||
There was a problem hiding this comment.
Let's just require these names, it seems simpler this way.
Suggested change
| groupNameOptional, versionResourceOptional *string, args []string) { | |
| groupName, versionResource string, args []string) { |
pkg/restore/crd.go
Outdated
| crdList, err := k8sclientset.ListResourcesDynamically(ctx, crds.CephRookIoGroup, crds.CephRookResourcesVersion, crd, clusterNamespace) | ||
| var groupName, versionResource string | ||
| // Set default values for groupName and versionResource | ||
| if groupNameOptional == nil || versionResourceOptional == nil { |
There was a problem hiding this comment.
No need for these checks if we just require them
OdedViner
force-pushed
the
add_ocs_crs
branch
2 times, most recently
from
01d0437 to
3648b9a
Compare
OdedViner
changed the title
OdedViner
force-pushed
the
add_ocs_crs
branch
from
3648b9a to
e35bdae
Compare
OdedViner
changed the title
travisn
requested changes
Feb 6, 2025
pkg/restore/crd.go
Outdated
| @@ -32,7 +32,8 @@ import ( | |||
| "k8s.io/apimachinery/pkg/types" | |||
| ) | |||
|
|
|||
| func RestoreCrd(ctx context.Context, k8sclientset *k8sutil.Clientsets, operatorNamespace, clusterNamespace string, args []string) { | |||
| func RestoreCrd(ctx context.Context, k8sclientset *k8sutil.Clientsets, operatorNamespace, clusterNamespace string, | |||
There was a problem hiding this comment.
Suggested change
| func RestoreCrd(ctx context.Context, k8sclientset *k8sutil.Clientsets, operatorNamespace, clusterNamespace string, | |
| func RestoreCrd(ctx context.Context, k8sclientset *k8sutil.Clientsets, operatorNamespace, clusterNamespace, |
Refactored the RestoreCrd function to accept groupName and versionResource as parameters instead of relying on the hardcoded constants crds.CephRookIoGroup and crds.CephRookResourcesVersion. This improves flexibility and allows the function to handle different CRDs dynamically. Signed-off-by: Oded Viner <[email protected]>
OdedViner
force-pushed
the
add_ocs_crs
branch
from
e35bdae to
0774806
Compare
subhamkrai
approved these changes
Feb 10, 2025
travisn
approved these changes
Feb 17, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refactored the RestoreCrd function to accept groupName and
versionResource as parameters instead of relying on the hardcoded
constants crds.CephRookIoGroup and crds.CephRookResourcesVersion.
This improves flexibility and allows the function to handle
different CRDs dynamically.
Checklist: