Skip to content

Add helm v3 and v4 to the tooling image (WTO-475) - #87

Merged
dkwon17 merged 2 commits into
redhat-developer:mainfrom
btjd:wto-475-helm-v3-v4
Oct 29, 2026
Merged

dkwon17 merged 2 commits into
redhat-developer:mainfrom
btjd:wto-475-helm-v3-v4

Conversation

@btjd

@btjd btjd commented Oct 27, 2026

Copy link
Copy Markdown
Contributor

What

Adds helm v3 and v4 side-by-side to the Web Terminal tooling image, for WTO-475.

  • Both versions are installed as explicit helm3 and helm4 binaries.
  • The bare helm command is symlinked to v4, which is the default as of OCP 5.0.
  • Binaries come from the OpenShift mirror (FIPS-compliant builds).
Command Resolves to
helm helm v4 (default)
helm3 helm v3.22.0-90
helm4 helm v4.3.0

This targets WTO 1.18.0 / OCP 5.0, where v4 becomes the default while v3 is still supported. The helm3/helm4 names stay stable across upgrades, so the only transition later (OCP 5.2, when v3 is dropped) is removing helm3.

Changes

  • tooling_versions.env: pin HELM3_VER=3.22.0-90 and HELM4_VER=4.3.0
  • get-sources.sh: download both versions from their mirror tarballs, verify checksums, install as helm3/helm4; record both in rh-manifest.txt
  • Dockerfile: symlink helm → helm4; generate bash completion for helm, helm3, helm4
  • etc/get-tooling-versions.sh: report helm3 and helm4 in the installed-tools banner
  • README.md: document both versions and the helm → v4 default

Testing

Built locally with ./build.sh and smoke-tested in the image:

  • ✅ helm version → v4.3.0, helm3 version → v3.22.0+90.el9, helm4 version → v4.3.0
  • ✅ helm symlink → /usr/local/bin/helm4
  • ✅ bash completion present for all three, each registered to its own command name and dispatching to its own binary
  • ✅ installed-tools banner lists helm3 and helm4

Notes / follow-ups

  • The same change will be needed in the downstream (codeready-workspaces) tooling image.
  • amd64 only, matching the current build (the mirror also has arm64/ppc64le/s390x for v4 if multi-arch is pursued separately).
  • The committed rh-manifest.txt has some pre-existing drift (stale kubectl version, oc URL trailing slash) unrelated to helm; left untouched here to keep this PR focused.

🤖 Generated with Claude Code

Install helm v3 and v4 side-by-side so OCP 5.0 users have both versions
available during the v3 -> v4 migration. Both are downloaded from the
OpenShift mirror (FIPS-compliant builds) and installed as explicit `helm3`
and `helm4` binaries; the bare `helm` command is symlinked to v4, which is
the default as of OCP 5.0.

- tooling_versions.env: pin HELM3_VER=3.22.0-90 and HELM4_VER=4.3.0
- get-sources.sh: download both versions from their tarballs and verify
  checksums; record both in rh-manifest.txt
- Dockerfile: symlink `helm` -> helm4 and generate bash completion for
  helm, helm3 and helm4
- get-tooling-versions.sh: report helm3 and helm4 in the installed-tools banner
- README.md: document that both versions ship and `helm` defaults to v4

WTO-475

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
@btjd
btjd requested review from dkwon17 and ibuziuk as code owners October 27, 2026 19:33
Comment thread Dockerfile Resolved
Comment thread etc/get-tooling-versions.sh Resolved
@rohanKanojia

rohanKanojia commented Oct 28, 2026 •

Copy link
Copy Markdown
Collaborator

I tested this PR and it seems to be working as expected ✔️

  • Printing tooling info
IMG=web-terminal-tooling:local
podman run --rm --entrypoint bash $IMG -c '
  set -x
  helm version --short
  helm3 version --short
  helm4 version --short
  readlink -f "$(command -v helm)"          # expect /usr/local/bin/helm4
  D=$(pkg-config --variable=completionsdir bash-completion)
  wc -c $D/helm $D/helm3 $D/helm4           # all should be non-zero
  grep -h "^ *complete .*__start_helm" $D/helm $D/helm3 $D/helm4
  cat /tmp/installed_tools.txt
'
+ helm version --short
v4.3.0+gc34fd18
+ helm3 version --short
v3.22.0+90.el9+g16a3510
+ helm4 version --short
v4.3.0+gc34fd18
++ command -v helm
+ readlink -f /usr/local/bin/helm
/usr/local/bin/helm4
++ pkg-config --variable=completionsdir bash-completion
+ D=/usr/share/bash-completion/completions
+ wc -c /usr/share/bash-completion/completions/helm /usr/share/bash-completion/completions/helm3 /usr/share/bash-completion/completions/helm4
16033 /usr/share/bash-completion/completions/helm
16345 /usr/share/bash-completion/completions/helm3
16345 /usr/share/bash-completion/completions/helm4
48723 total
+ grep -h '^ *complete .*__start_helm' /usr/share/bash-completion/completions/helm /usr/share/bash-completion/completions/helm3 /usr/share/bash-completion/completions/helm4
    complete -o default -F __start_helm helm
    complete -o default -o nospace -F __start_helm helm
    complete -o default -F __start_helm helm3
    complete -o default -o nospace -F __start_helm helm3
    complete -o default -F __start_helm helm3
    complete -o default -o nospace -F __start_helm helm3
    complete -o default -F __start_helm helm4
    complete -o default -o nospace -F __start_helm helm4
    complete -o default -F __start_helm helm4
    complete -o default -o nospace -F __start_helm helm4
+ cat /tmp/installed_tools.txt
Command    Version         Name
oc         4.21.0          OpenShift CLI
kubectl    1.34.1          Kubernetes CLI
kustomize  5.8.1           Kustomize CLI
helm3      3.22.0          Helm CLI v3
helm4      4.3.0           Helm CLI v4 (default 'helm')
kn         1.15.0          KNative CLI
tkn        0.42.0          Tekton CLI
subctl     0.22.1          Submariner CLI
virtctl    1.7.1           KubeVirt CLI
rhoas      0.53.0          Red Hat OpenShift Application Services CLI
jq         1.6             jq

Fail with a clear message if helm4 is missing (e.g. an old
container-root tarball reused without ./build.sh -u), instead of a
confusing symlink error.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
@dkwon17

dkwon17 commented Oct 29, 2026

Copy link
Copy Markdown
Collaborator

LGTM:
image

@dkwon17
dkwon17 merged commit 4969090 into redhat-developer:main Oct 29, 2026
1 check passed
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.

3 participants