From 27345319bcc7f0fd2adbb2b18c0dd001c3ca992f Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Wed, 8 Dec 2021 11:48:29 +0100 Subject: [PATCH 1/2] internal/cli/cmd: use default version in upgrade command usage So far we've always bumped the version in the example `cilium upgrade` command in the long usage message. Instead of having to do this manually, use the default version defined in the defaults package. Signed-off-by: Tobias Klauser --- internal/cli/cmd/install.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/cli/cmd/install.go b/internal/cli/cmd/install.go index fc6395d787..b3b9300de3 100644 --- a/internal/cli/cmd/install.go +++ b/internal/cli/cmd/install.go @@ -133,15 +133,15 @@ func newCmdUpgrade() *cobra.Command { cmd := &cobra.Command{ Use: "upgrade", Short: "Upgrade Cilium in a Kubernetes cluster", - Long: `Upgrade Cilium in a Kubernetes cluster + Long: fmt.Sprintf(`Upgrade Cilium in a Kubernetes cluster Examples: # Upgrade Cilium to the latest patch release: cilium upgrade # Upgrade Cilium to a specific version -cilium upgrade --version v1.10.5 -`, +cilium upgrade --version %s +`, defaults.Version), RunE: func(cmd *cobra.Command, args []string) error { installer, err := install.NewK8sInstaller(k8sClient, params) if err != nil { From a397e6255b55948d9e66f35ec366cc4622837f21 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Wed, 8 Dec 2021 11:48:36 +0100 Subject: [PATCH 2/2] Update default Cilium version to 1.11.0 Signed-off-by: Tobias Klauser --- defaults/defaults.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/defaults.go b/defaults/defaults.go index 0695ca424a..bec0355255 100644 --- a/defaults/defaults.go +++ b/defaults/defaults.go @@ -69,7 +69,7 @@ const ( ConnectivityCheckJSONMockImage = "quay.io/cilium/json-mock:v1.3.0@sha256:2729064827fa9dbfface8d3df424feb6c792a0ba07117b844349635c93c06d2b" ConfigMapName = "cilium-config" - Version = "v1.10.5" + Version = "v1.11.0" HubbleUIVersion = "v0.8.3" TunnelType = "vxlan"