Allow installing Cilium snapshot versions #1452

tklauser · 2023-03-14T09:49:49Z

The first commit updates the vendored github.com/cilium/cilium packages to latest master to pull in cilium/cilium#24286.

The second commit refactors internal/utils.CheckVersion to avoid some boilerplate and to de-duplicate the error message returned upon failure to parse a version.

The third commit fixes matching of snapshot releases in cilium-cli.

With the cilium binary installed from this PR, Cilium 1.14.0-snapshot.0 can be installed as expected:

$ cilium install --version v1.14.0-snapshot.0
🔮 Auto-detected Kubernetes kind: kind
✨ Running "kind" validation checks
✅ Detected kind version "0.17.0"
ℹ️  Using Cilium version 1.14.0-snapshot.0
🔮 Auto-detected cluster name: kind-kind
🔮 Auto-detected datapath mode: tunnel
🔮 Auto-detected kube-proxy has been installed
ℹ️  helm template --namespace kube-system cilium cilium/cilium --version 1.14.0-snapshot.0 --set cluster.id=0,cluster.name=kind-kind,encryption.nodeEncryption=false,ipam.mode=kubernetes,kubeProxyReplacement=disabled,operator.replicas=1,serviceAccounts.cilium.name=cilium,serviceAccounts.operator.name=cilium-operator,tunnel=vxlan
ℹ️  Storing helm values file in kube-system/cilium-cli-helm-values Secret
🔑 Created CA in secret cilium-ca
🔑 Generating certificates for Hubble...
🚀 Creating Service accounts...
🚀 Creating Cluster roles...
🚀 Creating ConfigMap for Cilium version 1.14.0-snapshot.0...
🚀 Creating Agent DaemonSet...
🚀 Creating Operator Deployment...
⌛ Waiting for Cilium to be installed and ready...
✅ Cilium was successfully installed! Run 'cilium status' to view installation health

/cc @jspaleta

Fixes #1448

…k fix cilium-cli uses the github.com/cilium/cilium/pkg/versioncheck package to parse Cilium versions. In the latest version, this package was fixed to allow parsing snapshot release versions, cf. cilium/cilium#24286 For #1448 Signed-off-by: Tobias Klauser <tobias@cilium.io>

This allows to get rid of some boilerplate and de-duplicate the error message. Signed-off-by: Tobias Klauser <tobias@cilium.io>

Currently, installing snapshot version results in an error: $ cilium install --version v1.14.0-snapshot.0 invalid parameters: invalid syntax "v1.14.0-snapshot.0" for image tag Fix it by allowing dots in the part after the dash. Fixes #1448 Signed-off-by: Tobias Klauser <tobias@cilium.io>

sayboras

Checked last two commits, and tested locally ✔️

tklauser added 3 commits March 14, 2023 10:46

internal/utils: refactor CheckVersion to return an error

785790c

This allows to get rid of some boilerplate and de-duplicate the error message. Signed-off-by: Tobias Klauser <tobias@cilium.io>

tklauser requested review from a team as code owners March 14, 2023 09:49

tklauser requested review from sayboras, chancez and rolinh March 14, 2023 09:49

tklauser temporarily deployed to ci March 14, 2023 09:49 — with GitHub Actions Inactive

sayboras approved these changes Mar 14, 2023

View reviewed changes

chancez approved these changes Mar 14, 2023

View reviewed changes

tklauser merged commit a2058ff into master Mar 15, 2023

tklauser deleted the pr/tklauser/version-allow-snapshot branch March 15, 2023 03:58

chenrui333 mentioned this pull request Mar 21, 2023

cilium-cli 0.13.2 Homebrew/homebrew-core#126245

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow installing Cilium snapshot versions #1452

Allow installing Cilium snapshot versions #1452

tklauser commented Mar 14, 2023 •

edited

sayboras left a comment

Allow installing Cilium snapshot versions #1452

Allow installing Cilium snapshot versions #1452

Conversation

tklauser commented Mar 14, 2023 • edited

sayboras left a comment

Choose a reason for hiding this comment

tklauser commented Mar 14, 2023 •

edited