Merge pull request #2881 from wgahnagl/master-4.20

branching day tasks for 4.20 release

Author: openshift-merge-bot[bot]

.gitmodules

@@ -1,11 +1,11 @@
 [submodule "ovn-kubernetes"]
 	path = ovn-kubernetes
 	url = https://github.com/openshift/ovn-kubernetes
-	branch = release-4.19
+	branch = release-4.20
 [submodule "containernetworking-plugins"]
 	path = containernetworking-plugins
 	url = https://github.com/openshift/containernetworking-plugins
-	branch = release-4.19
+	branch = release-4.20
 [submodule "promu"]
 	path = promu
 	url = https://github.com/openshift/prometheus-promu
@@ -15,24 +15,24 @@
 [submodule "kubelet"]
 	path = kubelet
 	url = https://github.com/openshift/kubernetes
-	branch = release-4.19
+	branch = release-4.20
 [submodule "containerd"]
 	path = containerd
 	url = https://github.com/openshift/containerd
-	branch = release-4.19
+	branch = release-4.20
 [submodule "hcsshim"]
 	path = hcsshim
 	url = https://github.com/openshift/hcsshim
-	branch = release-4.19
+	branch = release-4.20
 [submodule "cloud-provider-azure"]
 	path = cloud-provider-azure
 	url = https://github.com/openshift/cloud-provider-azure
-	branch = release-4.19
+	branch = release-4.20
 [submodule "csi-proxy"]
 	path = csi-proxy
 	url = https://github.com/openshift/csi-proxy
-	branch = release-4.19
+	branch = release-4.20
 [submodule "cloud-provider-aws"]
 	path = cloud-provider-aws
 	url = https://github.com/openshift/cloud-provider-aws
-	branch = release-4.19
+	branch = release-4.20

Containerfile

@@ -201,6 +201,6 @@ RUN  /usr/local/bin/user_setup
 ENTRYPOINT ["/usr/local/bin/entrypoint"]
 
 # Used to tag the released image. Should be a semver.
-LABEL version="v10.19.0"
+LABEL version="v10.20.0"
 
 USER ${USER_UID}

Containerfile.bundle

@@ -16,7 +16,7 @@ LABEL name="openshift4-wincw/windows-machine-config-operator-bundle" \
     io.openshift.tags=""
 
 # Used to tag the released image. Should be a semver.
-LABEL version="v10.19.0"
+LABEL version="v10.20.0"
 # Component to file bugs against
 LABEL com.redhat.component="Windows Containers"
 
@@ -32,8 +32,8 @@ LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
 
 LABEL distribution-scope=public
-LABEL release="10.19.0"
-LABEL url="https://docs.openshift.com/container-platform/4.19/windows_containers/index.html"
+LABEL release="10.20.0"
+LABEL url="https://docs.openshift.com/container-platform/4.20/windows_containers/index.html"
 LABEL vendor="Red Hat, Inc."
 
 # Copy files to locations specified by labels.

Makefile

@@ -3,7 +3,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the WMCO_VERSION as arg of the bundle target (e.g make bundle WMCO_VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export WMCO_VERSION=0.0.2)
-WMCO_VERSION ?= 10.19.0
+WMCO_VERSION ?= 10.20.0
 
 # *_GIT_VERSION are the k8s versions. Any update to the build line could potentially require an update to the sed
 # command in generate_k8s_version_commit() in hack/update_submodules.sh

build/Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 as build
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.20 as build
 
 LABEL stage=build
 

build/Dockerfile.base

@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 as build
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.20 as build
 LABEL stage=build
 
 # Silence go compliance shim output

build/Dockerfile.ci

@@ -3,7 +3,7 @@
 # building the operator from the PR source without using the operator-sdk.
 
 # build stage for building binaries
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 as build
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.20 as build
 LABEL stage=build
 WORKDIR /build/
 
@@ -133,7 +133,7 @@ RUN make build-daemon
 #│   └── windows-exporter-webconfig.yaml
 #└── windows-instance-config-daemon.exe
 
-FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19
+FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.20
 LABEL stage=operator
 
 WORKDIR /payload/

build/Dockerfile.wmco

@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 as build
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.20 as build
 LABEL stage=build
 
 # Silence go compliance shim output

bundle.Dockerfile

@@ -1,34 +1,5 @@
 FROM scratch
 
-# This block are standard Red Hat container labels
-LABEL name="openshift4-wincw/windows-machine-config-operator-bundle" \
-    License="ASL 2.0" \
-    io.k8s.display-name="Windows Machine Config Operator bundle" \
-    io.k8s.description="Windows Machine Config Operator's OLM bundle image" \
-    summary="Windows Machine Config Operator's OLM bundle image" \
-    maintainer="Team Windows Containers <[email protected]>"
-
-# These are three labels needed to control how the pipeline should handle this container image
-# This first label tells the pipeline that this is a bundle image and should be
-# delivered via an index image
-LABEL com.redhat.delivery.operator.bundle=true
-
-# This second label tells the pipeline which versions of OpenShift the operator supports.
-# This is used to control which index images should include this operator.
-LABEL com.redhat.openshift.versions="=v4.19"
-
-# This third label tells the pipeline that this operator should *also* be supported on OCP 4.4 and
-# earlier.  It is used to control whether or not the pipeline should attempt to automatically
-# backport this content into the old appregistry format and upload it to the quay.io application
-# registry endpoints.
-LABEL com.redhat.delivery.backport=false
-
-# This label gets replaced by render_templates, so it is safer to keep it on its own
-LABEL version="v0.0.0"
-
-# This label maps to the brew build target
-LABEL com.redhat.component="windows-machine-config-operator-bundle-container"
-
 # Core bundle labels.
 LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
@@ -40,6 +11,11 @@ LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.32.0
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
 
+# Labels for testing.
+LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1
+LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/
+
 # Copy files to locations specified by labels.
 COPY bundle/manifests /manifests/
 COPY bundle/metadata /metadata/
+COPY bundle/tests/scorecard /tests/scorecard/

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

@@ -27,7 +27,7 @@ metadata:
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/openshift/windows-machine-config-operator
     support: Red Hat
-  name: windows-machine-config-operator.v10.19.0
+  name: windows-machine-config-operator.v10.20.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -411,7 +411,9 @@ spec:
           - use
         serviceAccountName: windows-machine-config-operator
       deployments:
-      - name: windows-machine-config-operator
+      - label:
+          name: windows-machine-config-operator
+        name: windows-machine-config-operator
         spec:
           replicas: 1
           selector:
@@ -528,4 +530,4 @@ spec:
   minKubeVersion: 1.32.0
   provider:
     name: Red Hat
-  version: 10.19.0
+  version: 10.20.0