Skip to content

Commit ac3065c

Browse files
[release/v1.59] Update AMI filter for rocky linux (#1803) (#1809)
* [release/v1.59] Update AMI filter for rocky linux (#1803) * pin cluster-exposer to KKP 2.25 (Go 1.22) --------- Co-authored-by: Waleed Malik <[email protected]>
1 parent eba98e3 commit ac3065c

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

hack/ci/setup-kind-cluster.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,11 @@ if [ -z "${DISABLE_CLUSTER_EXPOSER:-}" ]; then
157157
cd /tmp/kubermatic
158158
echodate "Cloning cluster exposer"
159159
KKP_REPO_URL="${KKP_REPO_URL:-https://github.com/kubermatic/kubermatic.git}"
160-
KKP_REPO_TAG="${KKP_REPO_BRANCH:-main}"
161-
git clone --depth 1 --branch "${KKP_REPO_TAG}" "${KKP_REPO_URL}" .
160+
KKP_REPO_TAG="${KKP_REPO_BRANCH:-release/v2.25}"
161+
(
162+
set -x
163+
git clone --depth 1 --branch "${KKP_REPO_TAG}" "${KKP_REPO_URL}" .
164+
)
162165

163166
echodate "Building cluster exposer"
164167
CGO_ENABLED=0 go build --tags ce -v -o /tmp/clusterexposer ./pkg/test/clusterexposer/cmd

pkg/cloudprovider/provider/aws/provider.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,12 @@ var (
115115
},
116116
providerconfigtypes.OperatingSystemRockyLinux: {
117117
awstypes.CPUArchitectureX86_64: {
118-
description: "*Rocky-8-ec2-8*.x86_64",
118+
description: "*Rocky-8-EC2-*.x86_64",
119119
// The AWS marketplace ID from Rocky Linux Community Platform Engineering (CPE)
120120
owner: "792107900819",
121121
},
122122
awstypes.CPUArchitectureARM64: {
123-
description: "*Rocky-8-ec2-8*.aarch64",
123+
description: "*Rocky-8-EC2-*.aarch64",
124124
// The AWS marketplace ID from Rocky Linux Community Platform Engineering (CPE)
125125
owner: "792107900819",
126126
},

0 commit comments

Comments
 (0)