Release IP back to datastore if CNI failed to set Pod's namespace #127
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
nckturner
approved these changes
Jul 11, 2018
| @@ -179,6 +179,25 @@ func add(args *skel.CmdArgs, cniTypes typeswrapper.CNITYPES, grpcClient grpcwrap | |||
| if err != nil { | |||
| log.Errorf("Failed SetupPodNetwork for pod %s namespace %s container %s: %v", | |||
| string(k8sArgs.K8S_POD_NAME), string(k8sArgs.K8S_POD_NAMESPACE), string(k8sArgs.K8S_POD_INFRA_CONTAINER_ID), err) | |||
|
|
|||
There was a problem hiding this comment.
Do we want metrics for this branch?
There was a problem hiding this comment.
Yes. there is a metrics for this in ipamd.go, and reason indicates why Pod is deleted.
+ addIPCnt = prometheus.NewCounter(
+ prometheus.CounterOpts{
+ Name: "add_ip_req_count",
+ Help: "The number of add IP address request",
+ },
+ )
+ delIPCnt = prometheus.NewCounterVec(
+ prometheus.CounterOpts{
+ Name: "del_ip_req_count",
+ Help: "The number of delete IP address request",
+ },
+ []string{"reason"},
+ )
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.
Issue #59
Description of changes:
Whenever CNI fails to setup network stack for a Pod, it should release Pod's IP back to ipamD data store. Otherwise, kubelet will never invoke delete pod request for this pod and this Pod's IP is leaked.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.