Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent double applying annotation when namespace annotation is used #198

Merged
merged 4 commits into from
Nov 9, 2022
Merged

Prevent double applying annotation when namespace annotation is used #198

merged 4 commits into from
Nov 9, 2022

Conversation

ThetaDR
Copy link
Contributor

@ThetaDR ThetaDR commented Oct 31, 2022

Signed-off-by: Vyacheslav Tumanov [email protected]

Related issue: networkservicemesh/deployments-k8s#7676

.golangci.yml Outdated Show resolved Hide resolved
Signed-off-by: Vyacheslav Tumanov <[email protected]>
main.go Outdated
@@ -86,7 +86,12 @@ func (s *admissionWebhookServer) Review(ctx context.Context, in *admissionv1.Adm
annotation := podMetaPtr.Annotations[s.config.Annotation]

// use namespace annotation only if resource doesn't have it's own
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor comment:
We can move this comment below

Copy link
Contributor Author

@ThetaDR ThetaDR Nov 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree, forgot to move when new if statement have been added. Fixed 👍

Signed-off-by: Vyacheslav Tumanov <[email protected]>
@denis-tingaikin denis-tingaikin merged commit 36b6bbe into networkservicemesh:main Nov 9, 2022
nsmbot pushed a commit to networkservicemesh/deployments-k8s that referenced this pull request Nov 9, 2022
…d-admission-webhook-k8s@main

PR link: networkservicemesh/cmd-admission-webhook-k8s#198

Commit: 36b6bbe
Author: Denis Tingaikin
Date: 2022-11-09 12:12:12 +0300
Message:
  - Merge pull request #198 from ThetaDR/namespace-annotation-fix
Signed-off-by: NSMBot <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants