Merge branch 'master' into OCPBUGS-45027

.tekton/windows-machine-config-operator-bundle-master-pull-request.yaml

@@ -10,7 +10,7 @@ metadata:
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request"
       && target_branch == "master"
-      && "build/bundle-konflux.Dockerfile".pathChanged()
+      && "Containerfile.bundle".pathChanged()
   labels:
     appstudio.openshift.io/application: windows-machine-config-operator-master
     appstudio.openshift.io/component: windows-machine-config-operator-bundle-master
@@ -26,7 +26,7 @@ spec:
   - name: prefetch-input
     value: '{"type": "gomod", "path": "."}'
   - name: dockerfile
-    value: build/bundle-konflux.Dockerfile
+    value: Containerfile.bundle
   - name: git-url
     value: '{{source_url}}'
   - name: image-expires-after

.tekton/windows-machine-config-operator-bundle-master-push.yaml

@@ -9,7 +9,7 @@ metadata:
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "push"
       && target_branch == "master"
-      && "build/bundle-konflux.Dockerfile".pathChanged()
+      && "Containerfile.bundle".pathChanged()
   labels:
     appstudio.openshift.io/application: windows-machine-config-operator-master
     appstudio.openshift.io/component: windows-machine-config-operator-bundle-master
@@ -25,7 +25,7 @@ spec:
   - name: prefetch-input
     value: '{"type": "gomod", "path": "."}'
   - name: dockerfile
-    value: build/bundle-konflux.Dockerfile
+    value: Containerfile.bundle
   - name: git-url
     value: '{{source_url}}'
   - name: output-image

.tekton/windows-machine-config-operator-master-pull-request.yaml

@@ -26,7 +26,7 @@ spec:
   - name: prefetch-input
     value: '{"type": "gomod", "path": "."}'
   - name: dockerfile
-    value: build/Dockerfile.konflux
+    value: Containerfile
   - name: git-url
     value: '{{source_url}}'
   - name: image-expires-after

.tekton/windows-machine-config-operator-master-push.yaml

@@ -9,7 +9,7 @@ metadata:
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "push"
       && target_branch == "master"
-      && !files.all.all(x, x.matches('^docs/|\\.md$|^(?:.*/)?(?:\\.gitignore|OWNERS|PROJECT|LICENSE|bundle-konflux.Dockerfile)$'))
+      && !files.all.all(x, x.matches('^docs/|\\.md$|^(?:.*/)?(?:\\.gitignore|OWNERS|PROJECT|LICENSE|Containerfile.bundle)$'))
   labels:
     appstudio.openshift.io/application: windows-machine-config-operator-master
     appstudio.openshift.io/component: windows-machine-config-operator-master
@@ -25,7 +25,7 @@ spec:
   - name: prefetch-input
     value: '{"type": "gomod", "path": "."}'
   - name: dockerfile
-    value: build/Dockerfile.konflux
+    value: Containerfile
   - name: git-url
     value: '{{source_url}}'
   - name: output-image

build/bundle-konflux.Dockerfile → Containerfile.bundle

@@ -1,6 +1,6 @@
 FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.22 as image-replacer
 COPY bundle/manifests /manifests
-RUN sed -i "s|REPLACE_IMAGE|registry.stage.redhat.io/openshift4-wincw/windows-machine-config-rhel9-operator@sha256:33a8acc690dc8e961b155afe677f8ef6c25609fe2cffb171ae1e9b843a8b6fa5|g" /manifests/windows-machine-config-operator.clusterserviceversion.yaml
+RUN sed -i "s|REPLACE_IMAGE|registry.stage.redhat.io/openshift4-wincw/windows-machine-config-rhel9-operator@sha256:ead54083e6820683668a010e48bc66d83379b14fd4da94a05c224926b5fad22c|g" /manifests/windows-machine-config-operator.clusterserviceversion.yaml
 
 FROM scratch
 
@@ -14,26 +14,10 @@ LABEL name="openshift4-wincw/windows-machine-config-operator-bundle" \
     maintainer="Team Windows Containers <[email protected]>" \
     io.openshift.tags=""
 
-# 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
-
 # Used to tag the released image. Should be a semver.
 LABEL version="v10.19.0"
-
-# This label maps to the brew build target
-LABEL com.redhat.component="windows-machine-config-operator-bundle-container"
+# Component to file bugs against
+LABEL com.redhat.component="Windows Containers"
 
 # Core bundle labels.
 LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
@@ -48,7 +32,7 @@ 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.17/windows_containers/index.html"
+LABEL url="https://docs.openshift.com/container-platform/4.19/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.18.0
+WMCO_VERSION ?= 10.19.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

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

@@ -18,7 +18,7 @@ metadata:
     features.operators.openshift.io/token-auth-aws: "false"
     features.operators.openshift.io/token-auth-azure: "false"
     features.operators.openshift.io/token-auth-gcp: "false"
-    olm.skipRange: '>=10.17.0 <10.18.0'
+    olm.skipRange: '>=10.18.0 <10.19.0'
     operatorframework.io/cluster-monitoring: "true"
     operatorframework.io/suggested-namespace: openshift-windows-machine-config-operator
     operators.openshift.io/valid-subscription: '["Red Hat OpenShift support for Windows
@@ -27,16 +27,16 @@ 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.18.0
+  name: windows-machine-config-operator.v10.19.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
   customresourcedefinitions: {}
   description: |-
     ### Introduction
     The Windows Machine Config Operator configures Windows Machines into nodes, enabling Windows container workloads to
-    be run on OCP clusters. Windows instances can be added either by creating a [MachineSet](https://docs.openshift.com/container-platform/4.18/machine_management/creating_machinesets/creating-machineset-aws.html#machine-api-overview_creating-machineset-aws),
-    or by specifying existing instances through a [ConfigMap](https://docs.openshift.com/container-platform/4.18/windows_containers/byoh-windows-instance.html)
+    be run on OCP clusters. Windows instances can be added either by creating a [MachineSet](https://docs.openshift.com/container-platform/4.19/machine_management/creating_machinesets/creating-machineset-aws.html#machine-api-overview_creating-machineset-aws),
+    or by specifying existing instances through a [ConfigMap](https://docs.openshift.com/container-platform/4.19/windows_containers/byoh-windows-instance.html)
     The operator completes all the necessary steps to configure the Windows instance so that it can join the cluster as a worker node.
 
     Usage of this operator requires an OpenShift Container Platform for Windows Containers subscription. Users looking to
@@ -46,8 +46,8 @@ spec:
 
     ### Pre-requisites
     * A Red Hat OpenShift Container Platform for Windows Containers [subscription](https://access.redhat.com/support/policy/updates/openshift#windows)
-    * OCP 4.18 cluster running on Azure, AWS, GCP or vSphere configured with hybrid OVN Kubernetes networking
-    * [WMCO prerequisites](https://docs.openshift.com/container-platform/4.18/windows_containers/understanding-windows-container-workloads.html#wmco-prerequisites__understanding-windows-container-workloads)
+    * OCP 4.19 cluster running on Azure, AWS, GCP or vSphere configured with hybrid OVN Kubernetes networking
+    * [WMCO prerequisites](https://docs.openshift.com/container-platform/4.19/windows_containers/understanding-windows-container-workloads.html#wmco-prerequisites__understanding-windows-container-workloads)
 
     ### Usage
     Once the `openshift-windows-machine-config-operator` namespace has been created, a secret must be created containing
@@ -57,7 +57,7 @@ spec:
     oc create secret generic cloud-private-key --from-file=private-key.pem=/path/to/key -n openshift-windows-machine-config-operator
     ```
     We strongly recommend not using the same
-    [private key](https://docs.openshift.com/container-platform/4.18/installing/installing_azure/installing-azure-default.html#ssh-agent-using_installing-azure-default)
+    [private key](https://docs.openshift.com/container-platform/4.19/installing/installing_azure/installing-azure-default.html#ssh-agent-using_installing-azure-default)
     used when installing the cluster
 
     Below is an example of a vSphere Windows MachineSet which can create Windows Machines that the WMCO can react upon.
@@ -142,9 +142,9 @@ spec:
                 server: <vCenter Server FQDN/IP>
     ```
     Example MachineSet for other cloud providers:
-    - [AWS](https://docs.openshift.com/container-platform/4.18/windows_containers/creating_windows_machinesets/creating-windows-machineset-aws.html)
-    - [Azure](https://docs.openshift.com/container-platform/4.18/windows_containers/creating_windows_machinesets/creating-windows-machineset-azure.html)
-    - [GCP](https://docs.openshift.com/container-platform/4.18/windows_containers/creating_windows_machinesets/creating-windows-machineset-gcp.html)
+    - [AWS](https://docs.openshift.com/container-platform/4.19/windows_containers/creating_windows_machinesets/creating-windows-machineset-aws.html)
+    - [Azure](https://docs.openshift.com/container-platform/4.19/windows_containers/creating_windows_machinesets/creating-windows-machineset-azure.html)
+    - [GCP](https://docs.openshift.com/container-platform/4.19/windows_containers/creating_windows_machinesets/creating-windows-machineset-gcp.html)
 
     ### Limitations
     #### DeploymentConfigs
@@ -153,7 +153,7 @@ spec:
 
     ### Reporting issues
     Support for this distribution of WMCO requires a Red Hat OpenShfit subscription. Support should be requested through the Red Hat Customer Portal.
-    Please read through the [troubleshooting document](https://docs.openshift.com/container-platform/4.18/support/troubleshooting/troubleshooting-windows-container-workload-issues.html)
+    Please read through the [troubleshooting document](https://docs.openshift.com/container-platform/4.19/support/troubleshooting/troubleshooting-windows-container-workload-issues.html)
     before opening a support case.
   displayName: Windows Machine Config Operator
   icon:
@@ -520,4 +520,4 @@ spec:
   minKubeVersion: 1.31.0
   provider:
     name: Red Hat
-  version: 10.18.0
+  version: 10.19.0

bundle/metadata/annotations.yaml

@@ -9,7 +9,7 @@ annotations:
   operators.operatorframework.io.metrics.builder: operator-sdk-v1.32.0
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3
-  com.redhat.openshift.versions: "=v4.17"
+
   # Annotations for testing.
   operators.operatorframework.io.test.mediatype.v1: scorecard+v1
   operators.operatorframework.io.test.config.v1: tests/scorecard/

bundle/windows-machine-config-operator.package.yaml

@@ -1,4 +1,4 @@
 channels:
-  - currentCSV: windows-machine-config-operator.v10.18.0
+  - currentCSV: windows-machine-config-operator.v10.19.0
     channels: alpha
 packageName: windows-machine-config-operator

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

@@ -18,7 +18,7 @@ metadata:
     features.operators.openshift.io/token-auth-aws: "false"
     features.operators.openshift.io/token-auth-azure: "false"
     features.operators.openshift.io/token-auth-gcp: "false"
-    olm.skipRange: '>=10.17.0 <10.18.0'
+    olm.skipRange: '>=10.18.0 <10.19.0'
     operatorframework.io/cluster-monitoring: "true"
     operatorframework.io/suggested-namespace: openshift-windows-machine-config-operator
     operators.openshift.io/valid-subscription: '["Red Hat OpenShift support for Windows
@@ -33,8 +33,8 @@ spec:
   description: |-
     ### Introduction
     The Windows Machine Config Operator configures Windows Machines into nodes, enabling Windows container workloads to
-    be run on OCP clusters. Windows instances can be added either by creating a [MachineSet](https://docs.openshift.com/container-platform/4.18/machine_management/creating_machinesets/creating-machineset-aws.html#machine-api-overview_creating-machineset-aws),
-    or by specifying existing instances through a [ConfigMap](https://docs.openshift.com/container-platform/4.18/windows_containers/byoh-windows-instance.html)
+    be run on OCP clusters. Windows instances can be added either by creating a [MachineSet](https://docs.openshift.com/container-platform/4.19/machine_management/creating_machinesets/creating-machineset-aws.html#machine-api-overview_creating-machineset-aws),
+    or by specifying existing instances through a [ConfigMap](https://docs.openshift.com/container-platform/4.19/windows_containers/byoh-windows-instance.html)
     The operator completes all the necessary steps to configure the Windows instance so that it can join the cluster as a worker node.
 
     Usage of this operator requires an OpenShift Container Platform for Windows Containers subscription. Users looking to
@@ -44,8 +44,8 @@ spec:
 
     ### Pre-requisites
     * A Red Hat OpenShift Container Platform for Windows Containers [subscription](https://access.redhat.com/support/policy/updates/openshift#windows)
-    * OCP 4.18 cluster running on Azure, AWS, GCP or vSphere configured with hybrid OVN Kubernetes networking
-    * [WMCO prerequisites](https://docs.openshift.com/container-platform/4.18/windows_containers/understanding-windows-container-workloads.html#wmco-prerequisites__understanding-windows-container-workloads)
+    * OCP 4.19 cluster running on Azure, AWS, GCP or vSphere configured with hybrid OVN Kubernetes networking
+    * [WMCO prerequisites](https://docs.openshift.com/container-platform/4.19/windows_containers/understanding-windows-container-workloads.html#wmco-prerequisites__understanding-windows-container-workloads)
 
     ### Usage
     Once the `openshift-windows-machine-config-operator` namespace has been created, a secret must be created containing
@@ -55,7 +55,7 @@ spec:
     oc create secret generic cloud-private-key --from-file=private-key.pem=/path/to/key -n openshift-windows-machine-config-operator
     ```
     We strongly recommend not using the same
-    [private key](https://docs.openshift.com/container-platform/4.18/installing/installing_azure/installing-azure-default.html#ssh-agent-using_installing-azure-default)
+    [private key](https://docs.openshift.com/container-platform/4.19/installing/installing_azure/installing-azure-default.html#ssh-agent-using_installing-azure-default)
     used when installing the cluster
 
     Below is an example of a vSphere Windows MachineSet which can create Windows Machines that the WMCO can react upon.
@@ -140,9 +140,9 @@ spec:
                 server: <vCenter Server FQDN/IP>
     ```
     Example MachineSet for other cloud providers:
-    - [AWS](https://docs.openshift.com/container-platform/4.18/windows_containers/creating_windows_machinesets/creating-windows-machineset-aws.html)
-    - [Azure](https://docs.openshift.com/container-platform/4.18/windows_containers/creating_windows_machinesets/creating-windows-machineset-azure.html)
-    - [GCP](https://docs.openshift.com/container-platform/4.18/windows_containers/creating_windows_machinesets/creating-windows-machineset-gcp.html)
+    - [AWS](https://docs.openshift.com/container-platform/4.19/windows_containers/creating_windows_machinesets/creating-windows-machineset-aws.html)
+    - [Azure](https://docs.openshift.com/container-platform/4.19/windows_containers/creating_windows_machinesets/creating-windows-machineset-azure.html)
+    - [GCP](https://docs.openshift.com/container-platform/4.19/windows_containers/creating_windows_machinesets/creating-windows-machineset-gcp.html)
 
     ### Limitations
     #### DeploymentConfigs
@@ -151,7 +151,7 @@ spec:
 
     ### Reporting issues
     Support for this distribution of WMCO requires a Red Hat OpenShfit subscription. Support should be requested through the Red Hat Customer Portal.
-    Please read through the [troubleshooting document](https://docs.openshift.com/container-platform/4.18/support/troubleshooting/troubleshooting-windows-container-workload-issues.html)
+    Please read through the [troubleshooting document](https://docs.openshift.com/container-platform/4.19/support/troubleshooting/troubleshooting-windows-container-workload-issues.html)
     before opening a support case.
   displayName: Windows Machine Config Operator
   icon:

go.mod

@@ -31,9 +31,9 @@ require (
 	github.com/stretchr/testify v1.10.0
 	github.com/vincent-petithory/dataurl v1.0.0
 	go.uber.org/zap v1.27.0
-	golang.org/x/crypto v0.31.0
+	golang.org/x/crypto v0.32.0
 	golang.org/x/mod v0.22.0
-	golang.org/x/sys v0.28.0
+	golang.org/x/sys v0.29.0
 	k8s.io/api v0.31.4
 	k8s.io/apimachinery v0.31.4
 	k8s.io/client-go v0.31.4
@@ -130,10 +130,10 @@ require (
 	go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
-	golang.org/x/net v0.33.0 // indirect
+	golang.org/x/net v0.34.0 // indirect
 	golang.org/x/oauth2 v0.23.0 // indirect
 	golang.org/x/sync v0.10.0 // indirect
-	golang.org/x/term v0.27.0 // indirect
+	golang.org/x/term v0.28.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 	golang.org/x/time v0.7.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect