diff --git a/Makefile b/Makefile index 4c6d99c681..de95c71ffe 100644 --- a/Makefile +++ b/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 ?= 6.0.0 +WMCO_VERSION ?= 7.0.0 # CHANNELS define the bundle channels used in the bundle. # Add a new line here if you would like to change its default config. (E.g CHANNELS = "preview,fast,stable") diff --git a/bundle.Dockerfile b/bundle.Dockerfile index c2c50d8398..735a25d7e0 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -15,7 +15,7 @@ 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.11" +LABEL com.redhat.openshift.versions="=v4.12" # 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 diff --git a/bundle/manifests/windows-machine-config-operator.clusterserviceversion.yaml b/bundle/manifests/windows-machine-config-operator.clusterserviceversion.yaml index 9a331b809c..5c1bc8199d 100644 --- a/bundle/manifests/windows-machine-config-operator.clusterserviceversion.yaml +++ b/bundle/manifests/windows-machine-config-operator.clusterserviceversion.yaml @@ -8,7 +8,7 @@ metadata: certified: "false" createdAt: REPLACE_DATE description: An operator that enables Windows container workloads on OCP - olm.skipRange: '>=5.0.0 <6.0.0' + olm.skipRange: '>=6.0.0 <7.0.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 @@ -17,7 +17,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.v6.0.0 + name: windows-machine-config-operator.v7.0.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -25,8 +25,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.11/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.11/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.12/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.12/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 @@ -36,8 +36,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.11 cluster running on Azure, AWS or vSphere configured with hybrid OVN Kubernetes networking - * [WMCO prerequisites](https://docs.openshift.com/container-platform/4.11/windows_containers/understanding-windows-container-workloads.html#wmco-prerequisites__understanding-windows-container-workloads) + * OCP 4.12 cluster running on Azure, AWS or vSphere configured with hybrid OVN Kubernetes networking + * [WMCO prerequisites](https://docs.openshift.com/container-platform/4.12/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 @@ -47,7 +47,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.11/installing/installing_azure/installing-azure-default.html#ssh-agent-using_installing-azure-default) + [private key](https://docs.openshift.com/container-platform/4.12/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,7 +142,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.11/support/troubleshooting/troubleshooting-windows-container-workload-issues.html) + Please read through the [troubleshooting document](https://docs.openshift.com/container-platform/4.12/support/troubleshooting/troubleshooting-windows-container-workload-issues.html) before opening a support case. displayName: Windows Machine Config Operator icon: @@ -440,4 +440,4 @@ spec: minKubeVersion: 1.24.0 provider: name: Red Hat - version: 6.0.0 + version: 7.0.0 diff --git a/bundle/windows-machine-config-operator.package.yaml b/bundle/windows-machine-config-operator.package.yaml index 487140b353..56047217fd 100644 --- a/bundle/windows-machine-config-operator.package.yaml +++ b/bundle/windows-machine-config-operator.package.yaml @@ -1,4 +1,4 @@ channels: - - currentCSV: windows-machine-config-operator.v6.0.0 + - currentCSV: windows-machine-config-operator.v7.0.0 channels: alpha packageName: windows-machine-config-operator diff --git a/config/manifests/bases/windows-machine-config-operator.clusterserviceversion.yaml b/config/manifests/bases/windows-machine-config-operator.clusterserviceversion.yaml index 366bac83f2..ad49ba4349 100644 --- a/config/manifests/bases/windows-machine-config-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/windows-machine-config-operator.clusterserviceversion.yaml @@ -8,7 +8,7 @@ metadata: certified: "false" createdAt: REPLACE_DATE description: An operator that enables Windows container workloads on OCP - olm.skipRange: '>=5.0.0 <6.0.0' + olm.skipRange: '>=6.0.0 <7.0.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 @@ -23,8 +23,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.11/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.11/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.12/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.12/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 @@ -34,8 +34,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.11 cluster running on Azure, AWS or vSphere configured with hybrid OVN Kubernetes networking - * [WMCO prerequisites](https://docs.openshift.com/container-platform/4.11/windows_containers/understanding-windows-container-workloads.html#wmco-prerequisites__understanding-windows-container-workloads) + * OCP 4.12 cluster running on Azure, AWS or vSphere configured with hybrid OVN Kubernetes networking + * [WMCO prerequisites](https://docs.openshift.com/container-platform/4.12/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 @@ -45,7 +45,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.11/installing/installing_azure/installing-azure-default.html#ssh-agent-using_installing-azure-default) + [private key](https://docs.openshift.com/container-platform/4.12/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,7 +140,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.11/support/troubleshooting/troubleshooting-windows-container-workload-issues.html) + Please read through the [troubleshooting document](https://docs.openshift.com/container-platform/4.12/support/troubleshooting/troubleshooting-windows-container-workload-issues.html) before opening a support case. displayName: Windows Machine Config Operator icon: