From d0ef77222aa35a21fc9a4334eb966ecfa8d5b306 Mon Sep 17 00:00:00 2001
From: Angelos Kolaitis <angelos.kolaitis@canonical.com>
Date: Thu, 20 Jun 2024 11:06:53 +0300
Subject: [PATCH] use cilium 1.15.2-ck2 images (#503)

---
 src/k8s/pkg/k8sd/features/cilium/chart.go    | 6 +++---
 src/k8s/pkg/k8sd/features/cilium/network.go  | 2 +-
 src/k8s/pkg/k8sd/features/cilium/register.go | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/k8s/pkg/k8sd/features/cilium/chart.go b/src/k8s/pkg/k8sd/features/cilium/chart.go
index 66ea2a64d..76d518b5a 100644
--- a/src/k8s/pkg/k8sd/features/cilium/chart.go
+++ b/src/k8s/pkg/k8sd/features/cilium/chart.go
@@ -32,11 +32,11 @@ var (
 	ciliumAgentImageRepo = "ghcr.io/canonical/cilium"
 
 	// ciliumAgentImageTag is the tag to use for the cilium-agent image.
-	ciliumAgentImageTag = "1.15.2-ck1"
+	ciliumAgentImageTag = "1.15.2-ck2"
 
 	// ciliumOperatorImageRepo is the image to use for cilium-operator.
-	ciliumOperatorImageRepository = "ghcr.io/canonical/cilium-operator"
+	ciliumOperatorImageRepo = "ghcr.io/canonical/cilium-operator"
 
 	// ciliumOperatorImageTag is the tag to use for the cilium-operator image.
-	ciliumOperatorImageTag = "1.15.2-ck1"
+	ciliumOperatorImageTag = "1.15.2-ck2"
 )
diff --git a/src/k8s/pkg/k8sd/features/cilium/network.go b/src/k8s/pkg/k8sd/features/cilium/network.go
index c51ff8b41..13f268f19 100644
--- a/src/k8s/pkg/k8sd/features/cilium/network.go
+++ b/src/k8s/pkg/k8sd/features/cilium/network.go
@@ -48,7 +48,7 @@ func ApplyNetwork(ctx context.Context, snap snap.Snap, cfg types.Network, _ type
 		"operator": map[string]any{
 			"replicas": 1,
 			"image": map[string]any{
-				"repository": ciliumOperatorImageRepository,
+				"repository": ciliumOperatorImageRepo,
 				"tag":        ciliumOperatorImageTag,
 				"useDigest":  false,
 			},
diff --git a/src/k8s/pkg/k8sd/features/cilium/register.go b/src/k8s/pkg/k8sd/features/cilium/register.go
index 6eaf1c93b..e3d2dfdf1 100644
--- a/src/k8s/pkg/k8sd/features/cilium/register.go
+++ b/src/k8s/pkg/k8sd/features/cilium/register.go
@@ -9,6 +9,6 @@ import (
 func init() {
 	images.Register(
 		fmt.Sprintf("%s:%s", ciliumAgentImageRepo, ciliumAgentImageTag),
-		fmt.Sprintf("%s:%s", ciliumOperatorImageRepository, ciliumOperatorImageTag),
+		fmt.Sprintf("%s-generic:%s", ciliumOperatorImageRepo, ciliumOperatorImageTag),
 	)
 }