Skip to content

Commit ea36c7b

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #3161 from mansikulkarni96/WINC-1363
WINC-1414: React to 1.33 kube rebase and use go 1.24 in WMCO
2 parents ca2a8d6 + 158fb42 commit ea36c7b

File tree

1,165 files changed

+68468
-70005
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,165 files changed

+68468
-70005
lines changed

‎.ci-operator.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
build_root_image:
33
namespace: openshift
44
name: release
5-
tag: rhel-9-release-golang-1.23-openshift-4.19
5+
tag: rhel-9-release-golang-1.24-openshift-4.20

‎Containerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.23 as build
1+
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.24 as build
22

33
LABEL stage=build
44

‎Containerfile.bundle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.23 as image-replacer
1+
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.24 as image-replacer
22
COPY bundle/manifests /manifests
33
RUN sed -i "s|REPLACE_IMAGE|registry.redhat.io/openshift4-wincw/windows-machine-config-rhel9-operator@sha256:6f39eaf06f5c3e49c9d1026fed1a1942efe2dcd6c3d043fb0ca9c8f7c22a65a9|g" /manifests/windows-machine-config-operator.clusterserviceversion.yaml
44
RUN sed -i "s|REPLACE_DATE|$(date "+%Y-%m-%dT%H:%M:%SZ")|g" /manifests/windows-machine-config-operator.clusterserviceversion.yaml

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ WMCO_VERSION ?= 10.20.0
77

88
# *_GIT_VERSION are the k8s versions. Any update to the build line could potentially require an update to the sed
99
# command in generate_k8s_version_commit() in hack/update_submodules.sh
10-
KUBELET_GIT_VERSION=v1.32.6+e52b13b
10+
KUBELET_GIT_VERSION=v1.33.3+50d892e
1111
CONTAINERD_GIT_VERSION=v1.7.27
1212
# CHANNELS define the bundle channels used in the bundle.
1313
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "preview,fast,stable")

‎build/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.20 as build
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-penshift-4.20 as build
22

33
LABEL stage=build
44

‎build/Dockerfile.base‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.20 as build
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 as build
22
LABEL stage=build
33

44
# Silence go compliance shim output

‎build/Dockerfile.ci‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# building the operator from the PR source without using the operator-sdk.
44

55
# build stage for building binaries
6-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.20 as build
6+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 as build
77
LABEL stage=build
88
WORKDIR /build/
99

@@ -133,7 +133,7 @@ RUN make build-daemon
133133
#│ └── windows-exporter-webconfig.yaml
134134
#└── windows-instance-config-daemon.exe
135135

136-
FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.20
136+
FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20
137137
LABEL stage=operator
138138

139139
WORKDIR /payload/

‎build/Dockerfile.wmco‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.20 as build
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 as build
22
LABEL stage=build
33

44
# Silence go compliance shim output

‎bundle/manifests/windows-machine-config-operator.clusterserviceversion.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ spec:
526526
- email: [email protected]
527527
name: Red Hat, Windows Container Support for OpenShift
528528
maturity: stable
529-
minKubeVersion: 1.32.0
529+
minKubeVersion: 1.33.0
530530
provider:
531531
name: Red Hat
532532
version: 10.20.0

‎cloud-provider-aws‎

Submodule cloud-provider-aws updated 3437 files

0 commit comments

Comments
 (0)