Skip to content

Commit 282a862

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #3860 from jrvaldes/master-submodule-update-03-11
WINC-1566: React to 1.35 kube rebase and use go 1.25
2 parents 78b0f7d + 74cab41 commit 282a862

2,771 files changed

Lines changed: 113377 additions & 121909 deletions

File tree

Some content is hidden

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

‎.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.24-openshift-4.21
5+
tag: rhel-9-release-golang-1.25-openshift-4.22

‎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.24 as build
1+
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.25 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.24 as image-replacer
1+
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.25 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:e9b8b6186b0d9095601e77d1dd5e82214a21220399a7aafbbb00eb744c9f2f4f|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.22.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.34.2+047d962
10+
KUBELET_GIT_VERSION=v1.35.1+ac14da2
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.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.24-openshift-4.21 as build
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 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.24-openshift-4.21 as build
6+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 as build
77
LABEL stage=build
88

99
# Silence go compliance shim output
@@ -192,7 +192,7 @@ mkdir /payload/generated && \
192192
chmod 0777 /payload/generated
193193

194194

195-
FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.21
195+
FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.25-openshift-4.22
196196
LABEL stage=operator
197197

198198
WORKDIR /

‎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.24-openshift-4.21 as build
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 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
@@ -537,7 +537,7 @@ spec:
537537
- email: team-winc@redhat.com
538538
name: Red Hat, Windows Container Support for OpenShift
539539
maturity: stable
540-
minKubeVersion: 1.34.0
540+
minKubeVersion: 1.35.0
541541
provider:
542542
name: Red Hat
543543
version: 10.22.0

‎cloud-provider-aws‎

Submodule cloud-provider-aws updated 1138 files

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ spec:
176176
- email: team-winc@redhat.com
177177
name: Red Hat, Windows Container Support for OpenShift
178178
maturity: stable
179-
minKubeVersion: 1.34.0
179+
minKubeVersion: 1.35.0
180180
provider:
181181
name: Red Hat
182182
version: 0.0.0

0 commit comments

Comments
 (0)