Skip to content

Fix SECVULN-42899: Upgrade Helm and Kubernetes dependencies - #1807

Merged
rigalGit merged 4 commits into
hashicorp:mainfrom
Angel-4903:Angel-4903/SECVULN-42899-helm-vulnerability-patch
Jun 29, 2026
Merged

Fix SECVULN-42899: Upgrade Helm and Kubernetes dependencies#1807
rigalGit merged 4 commits into
hashicorp:mainfrom
Angel-4903:Angel-4903/SECVULN-42899-helm-vulnerability-patch

Conversation

@Angel-4903

Copy link
Copy Markdown
Contributor

Rollback Plan

If a change needs to be reverted, we will publish an updated version of the library.

Changes to Security Controls

Are there any changes to security controls (access controls, encryption, logging) in this pull request? If so, explain.

Description

This PR addresses security vulnerability SECVULN-42899 by upgrading Helm and Kubernetes dependencies to their latest secure versions.

  • Upgraded helm.sh/helm/v3 from v3.18.5 to v3.20.2
  • Upgraded Kubernetes dependencies from v0.33.3 to v0.35.1
  • Updated structured-merge-diff from v4 to v6 for compatibility
  • Updated test fixture to match new Kubernetes API serialization format

Acceptance tests

  • Have you added an acceptance test for the functionality being added?

Release Note

Release note for CHANGELOG:

...

References

Community Note

  • Please vote on this issue by adding a 👍 reaction to the original issue to help the community and maintainers prioritize this request
  • If you are interested in working on this issue or have submitted a pull request, please leave a comment

- Upgrade helm.sh/helm/v3 from v3.18.5 to v3.20.2
- Upgrade Kubernetes dependencies from v0.33.3 to v0.35.1
- Update structured-merge-diff from v4 to v6 for compatibility
- Update test fixture to match new Kubernetes API serialization format
@Angel-4903
Angel-4903 requested review from a team, iam404 and rigalGit as code owners June 26, 2026 06:23
@hashicorp-cla-app

Copy link
Copy Markdown

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


Angel Raphael 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.

1 similar comment
@hashicorp-cla-app

Copy link
Copy Markdown

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


Angel Raphael 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.

Angel Raphael added 2 commits June 26, 2026 11:56
Add --plain-http flag to helm push and helm registry login commands
to support HTTP-only test registry with upgraded Helm version.

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull request overview

This PR addresses SECVULN-42899 by upgrading Helm and Kubernetes-related dependencies and adjusting code/tests/fixtures for compatibility with the newer APIs and CLI behaviors.

Changes:

  • Upgrade helm.sh/helm/v3 and Kubernetes libraries to newer versions (plus related indirect dependency updates).
  • Update code to use sigs.k8s.io/structured-merge-diff/v6 and adjust OCI registry test commands for updated Helm behavior.
  • Refresh a rendered-manifest JSON fixture to match updated Kubernetes serialization output.

Reviewed changes

Copilot reviewed 5 out of 6 changed files in this pull request and generated 3 comments.

Show a summary per file
File Description
go.mod Bumps Helm/Kubernetes deps; needs follow-up cleanup for structured-merge-diff v6 vs v4 alignment.
go.sum Records checksums for upgraded dependencies.
helm/kube_resources.go Switches structured-merge-diff import from v4 to v6.
helm/resource_helm_release_test.go Adds --plain-http to Helm OCI login/push in tests for local registry usage.
helm/testdata/manifest_json/rendered_manifest.json Updates fixture output (removes creationTimestamp: null).
.changelog/1807.txt Adds release note entry, but formatting/fences are currently malformed.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread go.mod
Comment on lines +24 to +27
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912
k8s.io/kubectl v0.35.1
sigs.k8s.io/structured-merge-diff/v4 v4.6.0
sigs.k8s.io/yaml v1.5.0
sigs.k8s.io/yaml v1.6.0
Comment thread go.mod
Comment on lines +178 to 181
sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
)
Comment thread .changelog/1807.txt Outdated
Comment on lines +1 to +9
Upgrade `helm.sh/helm/v3` from `3.18.5` to `3.20.2` to address security vulnerability SECVULN-42899
```

```release-note:dependency
Upgrade Kubernetes dependencies (`k8s.io/api`, `k8s.io/apimachinery`, `k8s.io/cli-runtime`, `k8s.io/client-go`, `k8s.io/kubectl`) from `0.33.3` to `0.35.1`
```

```release-note:dependency
Update `sigs.k8s.io/structured-merge-diff` from `v4` to `v6` to support upgraded Kubernetes dependencies No newline at end of file
@rigalGit
rigalGit merged commit a4f1c1d into hashicorp:main Jun 29, 2026
17 of 18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants