Add support of namespace annotations #181
Merged
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
Signed-off-by: Marina Shustova <marina.shustova@xored.com>
… update operations. Signed-off-by: anastasia.malysheva <anastasia.malysheva@xored.com>
Signed-off-by: anastasia.malysheva <anastasia.malysheva@xored.com>
main.go
Outdated
Comment on lines
297
to
308
| func getClientSet() *kubernetes.Clientset { | ||
| c, err := rest.InClusterConfig() | ||
| if err != nil { | ||
| panic(err.Error()) | ||
| } | ||
| clientset, err := kubernetes.NewForConfig(c) | ||
| if err != nil { | ||
| panic(err.Error()) | ||
| } | ||
| return clientset | ||
| } | ||
|
|
There was a problem hiding this comment.
Suggested change
| func getClientSet() *kubernetes.Clientset { | |
| c, err := rest.InClusterConfig() | |
| if err != nil { | |
| panic(err.Error()) | |
| } | |
| clientset, err := kubernetes.NewForConfig(c) | |
| if err != nil { | |
| panic(err.Error()) | |
| } | |
| return clientset | |
| } |
There was a problem hiding this comment.
Please re-use our sdk-k8s utils pkg https://github.com/networkservicemesh/sdk-k8s/blob/main/pkg/tools/k8s/kubeutils.go#L50
It will make webhook always up to date with sdk-k8s, k8s deps.
main.go
Outdated
| logger: logger.Named("admissionWebhookServer"), | ||
| config: conf, | ||
| logger: logger.Named("admissionWebhookServer"), | ||
| clientset: getClientSet(), |
There was a problem hiding this comment.
Suggested change
| clientset: getClientSet(), |
| logger: logger.Named("admissionWebhookServer"), | ||
| config: conf, | ||
| logger: logger.Named("admissionWebhookServer"), | ||
| clientset: getClientSet(), | ||
| } |
There was a problem hiding this comment.
Suggested change
| } | |
| } | |
| _ , clientset, err := k8s.NewVersionedClient() | |
| if err != nil { | |
| logger.Fatal(err.Error()) | |
| } |
There was a problem hiding this comment.
@denis-tingaikin I've added fixes as you proposed. Please, take a look.
Signed-off-by: anastasia.malysheva <anastasia.malysheva@xored.com>
main.go
Outdated
| @@ -82,6 +84,15 @@ func (s *admissionWebhookServer) Review(in *admissionv1.AdmissionRequest) *admis | |||
| } | |||
| annotation := podMetaPtr.Annotations[s.config.Annotation] | |||
|
|
|||
| // use namespace annotation only if resource doesn't have it's own | |||
| if annotation == "" { | |||
| namespace, err := s.clientset.CoreV1().Namespaces().Get(ctx, in.Namespace, v1.GetOptions{}) | |||
There was a problem hiding this comment.
Please add a timeout for the context here to avoid a potential goroutines leak/improve responsiveness.
denis-tingaikin
requested changes
Aug 16, 2022
main.go
Outdated
| @@ -82,6 +84,15 @@ func (s *admissionWebhookServer) Review(in *admissionv1.AdmissionRequest) *admis | |||
| } | |||
| annotation := podMetaPtr.Annotations[s.config.Annotation] | |||
|
|
|||
| // use namespace annotation only if resource doesn't have it's own | |||
| if annotation == "" { | |||
| namespace, err := s.clientset.CoreV1().Namespaces().Get(ctx, in.Namespace, v1.GetOptions{}) | |||
There was a problem hiding this comment.
Suggested change
| namespace, err := s.clientset.CoreV1().Namespaces().Get(ctx, in.Namespace, v1.GetOptions{}) | |
| timeoutCtx, cancel := context.WithTimeout(ctx, time.Second) | |
| defer cancel() | |
| namespace, err := s.clientset.CoreV1().Namespaces().Get(timeoutCtx, in.Namespace, v1.GetOptions{}) |
…ebhook-k8s into add-namespace-support � Conflicts: � go.mod � go.sum
Signed-off-by: anastasia.malysheva <anastasia.malysheva@xored.com>
denis-tingaikin
approved these changes
Aug 17, 2022
nsmbot
pushed a commit
to networkservicemesh/deployments-k8s
that referenced
this pull request
Aug 17, 2022
…d-admission-webhook-k8s@main PR link: networkservicemesh/cmd-admission-webhook-k8s#181 Commit: f61ab27 Author: Denis Tingaikin Date: 2022-08-17 12:45:11 +0300 Message: - Merge pull request #181 from anastasia-malysheva/add-namespace-support Signed-off-by: NSMBot <nsmbot@networkservicmesh.io>
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.
Add support of namespace annotations
Issue
#126