Skip to content

Commit

Permalink
[release/v1.58] Update AMI filter for rocky linux (#1803) / Bump OSM …
Browse files Browse the repository at this point in the history
…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>
  • Loading branch information
xrstf and ahmedwaleedmalik authored Jun 5, 2024
1 parent dfa65ae commit 86ced77
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
6 changes: 3 additions & 3 deletions examples/operating-system-manager.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
7 changes: 5 additions & 2 deletions hack/ci/setup-kind-cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkg/cloudprovider/provider/aws/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
Expand Down

0 comments on commit 86ced77

Please sign in to comment.