Skip to content

🌱 feat(builder): Use builder 1.1.35 - #349

Merged
jschoone merged 2 commits into
mainfrom
feat/builder-1.1.35
Nov 9, 2026
Merged

jschoone merged 2 commits into
mainfrom
feat/builder-1.1.35

Conversation

@jschoone

@jschoone jschoone commented Nov 6, 2026

Copy link
Copy Markdown
Contributor

New builder resulted from #348

Signed-off-by: Jan Schoone <6106846+jschoone@users.noreply.github.com>
@jschoone jschoone changed the title 🌱 feat(builder): Use builder 1.1.35 🌱 feat(builder): Use builder 1.1.35 Nov 6, 2026
The builder image 1.1.35 contains golangci-lint v2.10.1 (was v2.2.1), which reports 15 findings
in the existing code and fails the lint job.

- noctx: run helm with exec.CommandContext and pass the context through
  (helmTemplate, helmTemplateClusterAddon, helmTemplateNewClusterStack,
  templateClusterClassHelmChart). helm is now stopped when the reconcile context is
  cancelled. Use a net.Dialer with DialContext in WaitForWebhooks.
- prealloc: build the helm argument lists in one literal.
- revive enforce-switch-style: add default clauses to the switches in
  clusteraddon_controller.go, clusterstackrelease/util.go, pkg/kube/helpers.go and
  pkg/version/version.go. They do nothing, the behaviour is unchanged.
- revive var-naming: the package name version conflicts with the standard library package
  go/version. pkg/version is public, so it is not renamed; the finding is excluded for
  pkg/version in .golangci.yaml.
- gosec G703 in unTarContent: header.Name of a tar entry was joined to the destination
  without a check, so an entry with ../ could be written outside of it. Reject entries for
  which filepath.IsLocal is false. gosec does not recognize this check, so the remaining
  report is suppressed with a reason. G204 for the fixed command helm is suppressed with a
  reason as well (it showed up once noctx was fixed).
- gosec G704: the URL in handleRedirect is the download location the GitHub API returned for
  the release asset; suppressed with a reason.
- gosec G602 in the test: replace equalStringSlices by slices.Equal.

Add TestUnTarContent. It passes with the check and fails without it.

Checked with the published image ghcr.io/sovereigncloudstack/cso-builder:1.1.35 on a
temporary OpenStack VM: make lint-golang-ci reports 0 issues; go vet, the unit tests of
pkg, extension and internal/clusterstackrelease and the controller suite (envtest with
Kubernetes 1.29.3 and 1.35.0) pass. Not run: the integration tests that need kind.

Signed-off-by: Jan Schoone <6106846+jschoone@users.noreply.github.com>
@jschoone
jschoone merged commit bb0a811 into main Nov 9, 2026
7 checks passed
@jschoone
jschoone deleted the feat/builder-1.1.35 branch November 9, 2026 08:13
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.

2 participants