Cilium update to 1.15.2 (#259)

canonical · Apr 5, 2024 · d03cf87 · d03cf87
1 parent faaf96c
commit d03cf87
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 19 deletions.
diff --git a/build-scripts/hack/update-gateway-api-chart.sh b/build-scripts/hack/update-gateway-api-chart.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION="v0.7.1"
+VERSION="v1.0.0"
 DIR=`realpath $(dirname "${0}")`
 
 CHARTS_PATH="$DIR/../../k8s/components/charts"
@@ -16,6 +16,7 @@ rm -rf gateway-api/templates/*
 rm -rf gateway-api/charts
 cp gateway-api-src/config/crd/standard/* gateway-api/templates/
 cp gateway-api-src/config/crd/experimental/gateway.networking.k8s.io_tlsroutes.yaml gateway-api/templates/
+cp gateway-api-src/config/crd/experimental/gateway.networking.k8s.io_grpcroutes.yaml gateway-api/templates/
 sed -i 's/^\(version: \).*$/\1'"${VERSION:1}"'/' gateway-api/Chart.yaml
 sed -i 's/^\(appVersion: \).*$/\1'"${VERSION:1}"'/' gateway-api/Chart.yaml
 sed -i 's/^\(description: \).*$/\1'"A Helm Chart containing Gateway API CRDs"'/' gateway-api/Chart.yaml

diff --git a/k8s/components/charts/cilium-1.14.1.tgz b/k8s/components/charts/cilium-1.14.1.tgz
diff --git a/k8s/components/charts/cilium-1.15.2.tgz b/k8s/components/charts/cilium-1.15.2.tgz
diff --git a/k8s/components/charts/ck-loadbalancer/Chart.yaml b/k8s/components/charts/ck-loadbalancer/Chart.yaml
@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.1.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.1.0"
+appVersion: "0.1.1"
diff --git a/k8s/components/charts/ck-loadbalancer/templates/lb-ip-pool.yaml b/k8s/components/charts/ck-loadbalancer/templates/lb-ip-pool.yaml
@@ -7,7 +7,7 @@ metadata:
     {{- include "ck-loadbalancer.labels" . | nindent 4 }}
 spec:
   {{- with .Values.ipPool.cidrs }}
-  cidrs:
+  blocks:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 {{- end }}
diff --git a/k8s/components/charts/gateway-api-0.7.1.tgz b/k8s/components/charts/gateway-api-0.7.1.tgz
diff --git a/k8s/components/charts/gateway-api-1.0.0.tgz b/k8s/components/charts/gateway-api-1.0.0.tgz
diff --git a/src/k8s/pkg/component/images.go b/src/k8s/pkg/component/images.go
@@ -4,10 +4,10 @@ const dnsImageRepository = "ghcr.io/canonical/coredns"
 const dnsImageTag = "1.11.1-ck1"
 
 const ciliumAgentImageRepository = "ghcr.io/canonical/cilium"
-const ciliumAgentImageTag = "1.14.5-ck1"
+const ciliumAgentImageTag = "1.15.2-ck0"
 
 const ciliumOperatorImageRepository = "ghcr.io/canonical/cilium-operator"
-const ciliumOperatorImageTag = "1.14.5-ck2"
+const ciliumOperatorImageTag = "1.15.2-ck0"
 
 const storageImageRepository = "ghcr.io/canonical/rawfile-localpv"
 const storageImageTag = "0.8.0-ck5"

diff --git a/src/k8s/pkg/component/network.go b/src/k8s/pkg/component/network.go
@@ -70,6 +70,7 @@ func UpdateNetworkComponent(ctx context.Context, s snap.Snap, isRefresh bool, po
 		"nodePort": map[string]any{
 			"enabled": true,
 		},
+		"disableEnvoyVersionCheck": true,
 	}
 
 	if s.Strict() {

diff --git a/src/k8s/pkg/snap/snap.go b/src/k8s/pkg/snap/snap.go
@@ -196,7 +196,7 @@ func (s *snap) Components() map[string]types.Component {
 	return map[string]types.Component{
 		"network": {
 			ReleaseName:  "ck-network",
-			ManifestPath: path.Join(s.snapDir, "k8s", "components", "charts", "cilium-1.14.1.tgz"),
+			ManifestPath: path.Join(s.snapDir, "k8s", "components", "charts", "cilium-1.15.2.tgz"),
 			Namespace:    "kube-system",
 		},
 		"dns": {
@@ -213,7 +213,7 @@ func (s *snap) Components() map[string]types.Component {
 		"ingress": {},
 		"gateway": {
 			ReleaseName:  "ck-gateway",
-			ManifestPath: path.Join(s.snapDir, "k8s", "components", "charts", "gateway-api-0.7.1.tgz"),
+			ManifestPath: path.Join(s.snapDir, "k8s", "components", "charts", "gateway-api-1.0.0.tgz"),
 			Namespace:    "kube-system",
 		},
 		"load-balancer": {

diff --git a/tests/integration/tests/test_cilium_e2e.py b/tests/integration/tests/test_cilium_e2e.py
@@ -12,7 +12,7 @@
 
 ARCH = platform.machine()
 CILIUM_CLI_ARCH_MAP = {"aarch64": "arm64", "x86_64": "amd64"}
-CILIUM_CLI_VERSION = "v0.15.19"
+CILIUM_CLI_VERSION = "v0.16.3"
 CILIUM_CLI_TAR_GZ = f"https://github.com/cilium/cilium-cli/releases/download/{CILIUM_CLI_VERSION}/cilium-linux-{CILIUM_CLI_ARCH_MAP.get(ARCH)}.tar.gz"  # noqa
 
 

diff --git a/tests/integration/tests/test_gateway.py b/tests/integration/tests/test_gateway.py
@@ -91,8 +91,6 @@ def test_gateway(instances: List[harness.Instance]):
     )
     gateway_http_port = p.stdout.decode().replace("'", "")
 
-    p = instance.exec(
-        ["curl", f"localhost:{gateway_http_port}"],
-        capture_output=True,
-    )
-    assert "Welcome to nginx!" in p.stdout.decode()
+    util.stubbornly(retries=5, delay_s=5).on(instance).until(
+        lambda p: "Welcome to nginx!" in p.stdout.decode()
+    ).exec(["curl", f"localhost:{gateway_http_port}"])
diff --git a/tests/integration/tests/test_ingress.py b/tests/integration/tests/test_ingress.py
@@ -95,8 +95,6 @@ def test_ingress(instances: List[harness.Instance]):
         ]
     )
 
-    p = instance.exec(
-        ["curl", f"localhost:{ingress_http_port}", "-H", "Host: foo.bar.com"],
-        capture_output=True,
-    )
-    assert "Welcome to nginx!" in p.stdout.decode()
+    util.stubbornly(retries=5, delay_s=5).on(instance).until(
+        lambda p: "Welcome to nginx!" in p.stdout.decode()
+    ).exec(["curl", f"localhost:{ingress_http_port}", "-H", "Host: foo.bar.com"])