From 86ced775e8d1a39f1bbf9169e55400fe8112318f Mon Sep 17 00:00:00 2001
From: Christoph Mewes <christoph@kubermatic.com>
Date: Wed, 5 Jun 2024 19:36:04 +0200
Subject: [PATCH] [release/v1.58] Update AMI filter for rocky linux (#1803) /
 Bump OSM to 1.4.3 (#1808)

* [release/v1.58] Update AMI filter for rocky linux (#1803)

* pin cluster-exposer to KKP 2.24 (Go 1.21)

* bump OSM to 1.4.3

---------

Co-authored-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
---
 examples/operating-system-manager.yaml     | 6 +++---
 hack/ci/setup-kind-cluster.sh              | 7 +++++--
 pkg/cloudprovider/provider/aws/provider.go | 4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/examples/operating-system-manager.yaml b/examples/operating-system-manager.yaml
index 17097db75..31d12a7ae 100644
--- a/examples/operating-system-manager.yaml
+++ b/examples/operating-system-manager.yaml
@@ -1,4 +1,4 @@
-# Source: https://github.com/kubermatic/operating-system-manager/tree/v0.5.0/deploy
+# Source: https://github.com/kubermatic/operating-system-manager/tree/v1.4.3/deploy
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -990,7 +990,7 @@ spec:
     spec:
       serviceAccountName: operating-system-manager-webhook
       containers:
-        - image: quay.io/kubermatic/operating-system-manager:v1.4.1
+        - image: quay.io/kubermatic/operating-system-manager:v1.4.3
           imagePullPolicy: Always
           name: webhook
           command:
@@ -1318,7 +1318,7 @@ spec:
     spec:
       serviceAccountName: operating-system-manager
       containers:
-        - image: quay.io/kubermatic/operating-system-manager:v1.4.1
+        - image: quay.io/kubermatic/operating-system-manager:v1.4.3
           imagePullPolicy: Always
           name: operating-system-manager
           command:
diff --git a/hack/ci/setup-kind-cluster.sh b/hack/ci/setup-kind-cluster.sh
index c68467511..75e95c9a0 100755
--- a/hack/ci/setup-kind-cluster.sh
+++ b/hack/ci/setup-kind-cluster.sh
@@ -157,8 +157,11 @@ if [ -z "${DISABLE_CLUSTER_EXPOSER:-}" ]; then
     cd /tmp/kubermatic
     echodate "Cloning cluster exposer"
     KKP_REPO_URL="${KKP_REPO_URL:-https://github.com/kubermatic/kubermatic.git}"
-    KKP_REPO_TAG="${KKP_REPO_BRANCH:-main}"
-    git clone --depth 1 --branch "${KKP_REPO_TAG}" "${KKP_REPO_URL}" .
+    KKP_REPO_TAG="${KKP_REPO_BRANCH:-release/v2.24}"
+    (
+      set -x
+      git clone --depth 1 --branch "${KKP_REPO_TAG}" "${KKP_REPO_URL}" .
+    )
 
     echodate "Building cluster exposer"
     CGO_ENABLED=0 go build --tags ce -v -o /tmp/clusterexposer ./pkg/test/clusterexposer/cmd
diff --git a/pkg/cloudprovider/provider/aws/provider.go b/pkg/cloudprovider/provider/aws/provider.go
index 1320f6147..862ea8676 100644
--- a/pkg/cloudprovider/provider/aws/provider.go
+++ b/pkg/cloudprovider/provider/aws/provider.go
@@ -115,12 +115,12 @@ var (
 		},
 		providerconfigtypes.OperatingSystemRockyLinux: {
 			awstypes.CPUArchitectureX86_64: {
-				description: "*Rocky-8-ec2-8*.x86_64",
+				description: "*Rocky-8-EC2-*.x86_64",
 				// The AWS marketplace ID from Rocky Linux Community Platform Engineering (CPE)
 				owner: "792107900819",
 			},
 			awstypes.CPUArchitectureARM64: {
-				description: "*Rocky-8-ec2-8*.aarch64",
+				description: "*Rocky-8-EC2-*.aarch64",
 				// The AWS marketplace ID from Rocky Linux Community Platform Engineering (CPE)
 				owner: "792107900819",
 			},