Skip to content

Conversation

@vdinesh4738
Copy link
Contributor

This PR is copy auto-generated from #5062 to be assessed for backporting due to the inclusion of the label backport/1.7.x.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.
The person who merged in the original PR is:
@vdinesh4738
This person should resolve the merge-conflict(s) by either:

Manually completing the cherry picks into this branch
Creating a new branch and manually cherry-picking all commits being backported
merge conflict error: POST https://api.github.com/repos/hashicorp/consul-k8s/merges: 409 Merge conflict []
The below text is copied from the body of the original PR.

Provided fix for the segmentation fault or SIGSEGV with consul-cni network plugin's code, which is common across the platform till date on Multus cni extension.

Background:
As per jira, when we enable cni and Multus, and then deploy the application with the api-resource 'network-attachment-definition' annotation like 'k8s.v1.cni.cncf.io/networks': '[{"namespace": "consul", "name":"consul-consul-cni"}]' is attached to the application pod, the application pod fails to come up at pod init with error in

Failed to create pod sandbox: rpc error: code = Unknown desc = failed to create pod network sandbox. (more detailed in the jira: https://hashicorp.atlassian.net/browse/CSL-13047

Root cause:
Creation of client with unavailable Kubeconfig or with the wrong Kubeconfig file name causing nil pointer dereference.

Fix:
Created the function to looks/fetch the latest Kubeconfig file and creates client.

Validation:
With the cni and Multus enabled: we update the iptables in the pod network ns.
With this fix : App is up and running and the iptables are updated in the pod network ns.

temp and others added 2 commits January 9, 2026 19:02
…ork plugin's code on 1.9.1 (#5062)

* looks for kubeconfig created for cni plugin

* added tcs

* added leader Renewal params

* added changelog

* added timeout for leader renewal--mainly on ocp

* renamed file name

* changelog file name

* updated code to reduce complexity to O(n)
@vdinesh4738 vdinesh4738 requested a review from a team as a code owner January 12, 2026 09:56
@hashicorp-cla-app
Copy link

hashicorp-cla-app bot commented Jan 12, 2026

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


2 out of 3 committers have signed the CLA.

  • vdinesh4738
  • bharath-k1999
  • temp

temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA.
If you have already a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

@hashicorp-cla-app
Copy link

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


1 out of 2 committers have signed the CLA.

  • vdinesh4738
  • temp

temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA.
If you have already a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

@vdinesh4738 vdinesh4738 added the pr/no-backport signals that a PR will not contain a backport label label Jan 12, 2026
@vdinesh4738 vdinesh4738 enabled auto-merge (squash) January 12, 2026 13:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr/no-backport signals that a PR will not contain a backport label

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants