core: Ensure cluster name is available on cluster info #9212
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
The cluster info is important context for the cluster controller to create the cluster, and all the fields must be properly set. A test cluster name was being set temporarily, resulting in mons incorrectly getting the wrong cluster CR name. There is no known issue from the temporary value, it was just exposed by rook#8678 setting the value to a label. Now the functions are more clearly named so only unit and integration tests should be using the test value for the cluster name where it is not important. Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
travisn
force-pushed
the
admin-test-cluster
branch
from
9ddb162
to
1afd322
Compare
parth-gr
approved these changes
Nov 19, 2021
parth-gr
reviewed
Nov 19, 2021
| @@ -67,7 +67,7 @@ func startCleanUp(cmd *cobra.Command, args []string) error { | |||
| } | |||
|
|
|||
| namespace := os.Getenv(k8sutil.PodNamespaceEnvVar) | |||
| clusterInfo := client.AdminClusterInfo(namespace) | |||
| clusterInfo := client.AdminClusterInfo(namespace, "") | |||
There was a problem hiding this comment.
Not sure about this case, the empty string may be fine here.
There was a problem hiding this comment.
By setting it to empty, if this code path tries to use the cephcluster CR name it will throw an exception and immediately crash and help us realize it is required. I don't believe it is required in this scenario though.
leseb
approved these changes
Nov 22, 2021
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.
Description of your changes:
The cluster info is important context for the cluster controller to create the cluster, and all the fields must be properly set. A test cluster name was being set temporarily, resulting in mons incorrectly getting the wrong cluster CR name. There is no known issue from the temporary value, it was just exposed by #8678 setting the value to a label.
Now the functions are more clearly named so only unit and integration tests should be using the test value for the cluster name where it is not important.
Checklist:
make codegen) has been run to update object specifications, if necessary.