This repository has been archived by the owner on Jul 11, 2023. It is now read-only.
fix(cli): osm namespace add should fail when adding osm-system NS #1499
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
This has changes to return an error when a user tries to add a ns which has osm control plane installed to the mesh. This will fix openservicemesh#1196.
ksubrmnn
previously approved these changes
Aug 11, 2020
ksubrmnn
reviewed
Aug 11, 2020
cmd/cli/namespace_add.go
Outdated
| if err != nil { | ||
| return errors.Errorf("Could not label namespace [%s]: %v", ns, err) | ||
| deploymentsClient := a.clientSet.AppsV1().Deployments(ns) | ||
| labelSelector := metav1.LabelSelector{MatchLabels: map[string]string{"app": "osm-controller"}} |
There was a problem hiding this comment.
we should probably make this a constant
|
@Sheshagiri, thanks for the change, would you mind adding tests prior to merging? |
Sure, I have a todo. I'll add those and mark this as ready for review. |
This has changes to return an error when a user tries to add
a ns which has osm control plane installed to the mesh.
This will fix openservicemesh#1196.
ksubrmnn
suggested changes
Aug 17, 2020
Sheshagiri
changed the title
ksubrmnn
approved these changes
Aug 18, 2020
ksubrmnn
changed the title
ksubrmnn
changed the title
michelleN
approved these changes
Aug 18, 2020
| fakeClientSet.AppsV1().Deployments(testNamespace).Create(context.TODO(), deploymentSpec, metav1.CreateOptions{}) | ||
|
|
||
| nsSpec := createNamespaceSpec(testNamespace, "") | ||
| fakeClientSet.CoreV1().Namespaces().Create(context.TODO(), nsSpec, metav1.CreateOptions{}) |
There was a problem hiding this comment.
I was surprised to see that we're creating the namespace after creating the deployment in the namespace. Does this work because we're using fakeClientSet so it is not validating that the value of testNamespace exists before creating the Deployment with that Namespace?
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
fixes: #1196
This has changes to return an error when a user tries to add a namespace which has osm control plane running in it.
Please mark with X for applicable areas.
Please answer the following questions with yes/no.
todo: