Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ?= 8.0.0
WMCO_VERSION ?= 9.0.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
Expand Down
2 changes: 1 addition & 1 deletion bundle.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.13"
LABEL com.redhat.openshift.versions="=v4.14"

# 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
certified: "false"
createdAt: REPLACE_DATE
description: An operator that enables Windows container workloads on OCP
olm.skipRange: '>=7.0.0 <8.0.0'
olm.skipRange: '>=8.0.0 <9.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
Expand All @@ -17,16 +17,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.v8.0.0
name: windows-machine-config-operator.v9.0.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.13/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.13/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.14/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.14/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
Expand All @@ -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.13 cluster running on Azure, AWS, GCP or vSphere configured with hybrid OVN Kubernetes networking
* [WMCO prerequisites](https://docs.openshift.com/container-platform/4.13/windows_containers/understanding-windows-container-workloads.html#wmco-prerequisites__understanding-windows-container-workloads)
* OCP 4.14 cluster running on Azure, AWS, GCP or vSphere configured with hybrid OVN Kubernetes networking
* [WMCO prerequisites](https://docs.openshift.com/container-platform/4.14/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
Expand All @@ -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.13/installing/installing_azure/installing-azure-default.html#ssh-agent-using_installing-azure-default)
[private key](https://docs.openshift.com/container-platform/4.14/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.
Expand Down Expand Up @@ -132,9 +132,9 @@ spec:
server: <vCenter Server FQDN/IP>
```
Example MachineSet for other cloud providers:
- [AWS](https://docs.openshift.com/container-platform/4.13/windows_containers/creating_windows_machinesets/creating-windows-machineset-aws.html)
- [Azure](https://docs.openshift.com/container-platform/4.13/windows_containers/creating_windows_machinesets/creating-windows-machineset-azure.html)
- [GCP](https://docs.openshift.com/container-platform/4.13/windows_containers/creating_windows_machinesets/creating-windows-machineset-gcp.html)
- [AWS](https://docs.openshift.com/container-platform/4.14/windows_containers/creating_windows_machinesets/creating-windows-machineset-aws.html)
- [Azure](https://docs.openshift.com/container-platform/4.14/windows_containers/creating_windows_machinesets/creating-windows-machineset-azure.html)
- [GCP](https://docs.openshift.com/container-platform/4.14/windows_containers/creating_windows_machinesets/creating-windows-machineset-gcp.html)

### Limitations
#### DeploymentConfigs
Expand All @@ -143,7 +143,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.13/support/troubleshooting/troubleshooting-windows-container-workload-issues.html)
Please read through the [troubleshooting document](https://docs.openshift.com/container-platform/4.14/support/troubleshooting/troubleshooting-windows-container-workload-issues.html)
before opening a support case.
displayName: Windows Machine Config Operator
icon:
Expand Down Expand Up @@ -470,4 +470,4 @@ spec:
minKubeVersion: 1.26.0
provider:
name: Red Hat
version: 8.0.0
version: 9.0.0
2 changes: 1 addition & 1 deletion bundle/windows-machine-config-operator.package.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
channels:
- currentCSV: windows-machine-config-operator.v8.0.0
- currentCSV: windows-machine-config-operator.v9.0.0
channels: alpha
packageName: windows-machine-config-operator
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
certified: "false"
createdAt: REPLACE_DATE
description: An operator that enables Windows container workloads on OCP
olm.skipRange: '>=7.0.0 <8.0.0'
olm.skipRange: '>=8.0.0 <9.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
Expand All @@ -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.13/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.13/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.14/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.14/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
Expand All @@ -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.13 cluster running on Azure, AWS, GCP or vSphere configured with hybrid OVN Kubernetes networking
* [WMCO prerequisites](https://docs.openshift.com/container-platform/4.13/windows_containers/understanding-windows-container-workloads.html#wmco-prerequisites__understanding-windows-container-workloads)
* OCP 4.14 cluster running on Azure, AWS, GCP or vSphere configured with hybrid OVN Kubernetes networking
* [WMCO prerequisites](https://docs.openshift.com/container-platform/4.14/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
Expand All @@ -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.13/installing/installing_azure/installing-azure-default.html#ssh-agent-using_installing-azure-default)
[private key](https://docs.openshift.com/container-platform/4.14/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.
Expand Down Expand Up @@ -130,9 +130,9 @@ spec:
server: <vCenter Server FQDN/IP>
```
Example MachineSet for other cloud providers:
- [AWS](https://docs.openshift.com/container-platform/4.13/windows_containers/creating_windows_machinesets/creating-windows-machineset-aws.html)
- [Azure](https://docs.openshift.com/container-platform/4.13/windows_containers/creating_windows_machinesets/creating-windows-machineset-azure.html)
- [GCP](https://docs.openshift.com/container-platform/4.13/windows_containers/creating_windows_machinesets/creating-windows-machineset-gcp.html)
- [AWS](https://docs.openshift.com/container-platform/4.14/windows_containers/creating_windows_machinesets/creating-windows-machineset-aws.html)
- [Azure](https://docs.openshift.com/container-platform/4.14/windows_containers/creating_windows_machinesets/creating-windows-machineset-azure.html)
- [GCP](https://docs.openshift.com/container-platform/4.14/windows_containers/creating_windows_machinesets/creating-windows-machineset-gcp.html)

### Limitations
#### DeploymentConfigs
Expand All @@ -141,7 +141,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.13/support/troubleshooting/troubleshooting-windows-container-workload-issues.html)
Please read through the [troubleshooting document](https://docs.openshift.com/container-platform/4.14/support/troubleshooting/troubleshooting-windows-container-workload-issues.html)
before opening a support case.
displayName: Windows Machine Config Operator
icon:
Expand Down