Skip to content

MCO-2114: allow OSStream in OKD #2749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cheesesashimi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

MCO-2114: allow OSStream in OKD #2749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 features.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
| NewOLMOwnSingleNamespace| | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> |
| NewOLMWebhookProviderOpenshiftServiceCA| | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> |
| NutanixMultiSubnets| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
| OSStreams| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
| OVNObservability| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
| OnPremDNSRecords| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
| SELinuxMount| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
Expand All @@ -89,6 +88,7 @@
| VSphereHostVMGroupZonal| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
| VSphereMixedNodeEnv| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
| VolumeGroupSnapshot| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
| OSStreams| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
| AzureWorkloadIdentity| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
| BuildCSIVolumes| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
| ConsolePluginContentSecurityPolicy| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
Expand Down
2 changes: 1 addition & 1 deletion features/features.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -983,7 +983,7 @@ var (
contactPerson("pabrodri").
productScope(ocpSpecific).
enhancementPR("https://github.com/openshift/enhancements/pull/1874").
enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade(), inOKD()).
mustRegister()

FeatureGateCRDCompatibilityRequirementOperator = newFeatureGate("CRDCompatibilityRequirementOperator").
Expand Down
53 changes: 53 additions & 0 deletions ...n/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigpools-OKD.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,36 @@ spec:
type: object
type: object
x-kubernetes-map-type: atomic
osImageStream:
description: |-
osImageStream specifies an OS stream to be used for the pool.

This field can be optionally set to a known OSImageStream name to change the
OS and Extension images with a well-known, tested, release-provided set of images.
This enables a streamlined way of switching the pool's node OS to a different version
than the cluster default, such as transitioning to a major RHEL version.

When set, the referenced stream overrides the cluster-wide OS
images for the pool with the OS and Extensions associated to stream.
When omitted, the pool uses the cluster-wide default OS images.
properties:
name:
description: |-
name is a required reference to an OSImageStream to be used for the pool.

It must be a valid RFC 1123 subdomain between 1 and 253 characters in length,
consisting of lowercase alphanumeric characters, hyphens ('-'), and periods ('.').
maxLength: 253
minLength: 1
type: string
x-kubernetes-validations:
- message: a RFC 1123 subdomain must consist of lower case alphanumeric
characters, '-' or '.', and must start and end with an alphanumeric
character.
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
required:
- name
type: object
paused:
description: |-
paused specifies whether or not changes to this machine config pool should be stopped.
Expand Down Expand Up @@ -514,6 +544,29 @@ spec:
by the controller.
format: int64
type: integer
osImageStream:
description: |-
osImageStream specifies the last updated OSImageStream for the pool.

When omitted, the pool is using the cluster-wide default OS images.
properties:
name:
description: |-
name is a required reference to an OSImageStream to be used for the pool.

It must be a valid RFC 1123 subdomain between 1 and 253 characters in length,
consisting of lowercase alphanumeric characters, hyphens ('-'), and periods ('.').
maxLength: 253
minLength: 1
type: string
x-kubernetes-validations:
- message: a RFC 1123 subdomain must consist of lower case alphanumeric
characters, '-' or '.', and must start and end with an alphanumeric
character.
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
required:
- name
type: object
poolSynchronizersStatus:
description: poolSynchronizersStatus is the status of the machines
managed by the pool synchronizers.
Expand Down
2 changes: 1 addition & 1 deletion ...ion/v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_osimagestreams.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
api.openshift.io/merged-by-featuregates: "true"
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-set: CustomNoUpgrade,DevPreviewNoUpgrade,TechPreviewNoUpgrade
release.openshift.io/feature-set: CustomNoUpgrade,DevPreviewNoUpgrade,OKD,TechPreviewNoUpgrade
labels:
openshift.io/operator-managed: ""
name: osimagestreams.machineconfiguration.openshift.io
Expand Down
53 changes: 53 additions & 0 deletions payload-manifests/crds/0000_80_machine-config_01_machineconfigpools-OKD.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,36 @@ spec:
type: object
type: object
x-kubernetes-map-type: atomic
osImageStream:
description: |-
osImageStream specifies an OS stream to be used for the pool.

This field can be optionally set to a known OSImageStream name to change the
OS and Extension images with a well-known, tested, release-provided set of images.
This enables a streamlined way of switching the pool's node OS to a different version
than the cluster default, such as transitioning to a major RHEL version.

When set, the referenced stream overrides the cluster-wide OS
images for the pool with the OS and Extensions associated to stream.
When omitted, the pool uses the cluster-wide default OS images.
properties:
name:
description: |-
name is a required reference to an OSImageStream to be used for the pool.

It must be a valid RFC 1123 subdomain between 1 and 253 characters in length,
consisting of lowercase alphanumeric characters, hyphens ('-'), and periods ('.').
maxLength: 253
minLength: 1
type: string
x-kubernetes-validations:
- message: a RFC 1123 subdomain must consist of lower case alphanumeric
characters, '-' or '.', and must start and end with an alphanumeric
character.
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
required:
- name
type: object
paused:
description: |-
paused specifies whether or not changes to this machine config pool should be stopped.
Expand Down Expand Up @@ -514,6 +544,29 @@ spec:
by the controller.
format: int64
type: integer
osImageStream:
description: |-
osImageStream specifies the last updated OSImageStream for the pool.

When omitted, the pool is using the cluster-wide default OS images.
properties:
name:
description: |-
name is a required reference to an OSImageStream to be used for the pool.

It must be a valid RFC 1123 subdomain between 1 and 253 characters in length,
consisting of lowercase alphanumeric characters, hyphens ('-'), and periods ('.').
maxLength: 253
minLength: 1
type: string
x-kubernetes-validations:
- message: a RFC 1123 subdomain must consist of lower case alphanumeric
characters, '-' or '.', and must start and end with an alphanumeric
character.
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
required:
- name
type: object
poolSynchronizersStatus:
description: poolSynchronizersStatus is the status of the machines
managed by the pool synchronizers.
Expand Down
2 changes: 1 addition & 1 deletion payload-manifests/crds/0000_80_machine-config_01_osimagestreams.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
api.openshift.io/merged-by-featuregates: "true"
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-set: CustomNoUpgrade,DevPreviewNoUpgrade,TechPreviewNoUpgrade
release.openshift.io/feature-set: CustomNoUpgrade,DevPreviewNoUpgrade,OKD,TechPreviewNoUpgrade
labels:
openshift.io/operator-managed: ""
name: osimagestreams.machineconfiguration.openshift.io
Expand Down
6 changes: 3 additions & 3 deletions payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,9 +247,6 @@
{
"name": "NutanixMultiSubnets"
},
{
"name": "OSStreams"
},
{
"name": "OVNObservability"
},
Expand Down Expand Up @@ -351,6 +348,9 @@
{
"name": "MutableCSINodeAllocatableCount"
},
{
"name": "OSStreams"
},
{
"name": "OpenShiftPodSecurityAdmission"
},
Expand Down
6 changes: 3 additions & 3 deletions payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,6 @@
{
"name": "NutanixMultiSubnets"
},
{
"name": "OSStreams"
},
{
"name": "OVNObservability"
},
Expand Down Expand Up @@ -351,6 +348,9 @@
{
"name": "NewOLMWebhookProviderOpenshiftServiceCA"
},
{
"name": "OSStreams"
},
{
"name": "OpenShiftPodSecurityAdmission"
},
Expand Down