From 9f620073dbbff0fca03d2b8aafcbaf88e8ada85e Mon Sep 17 00:00:00 2001 From: Abhay Date: Tue, 22 Jul 2025 16:39:22 +0530 Subject: [PATCH 1/2] enabling NutanixMultiSubnet by default --- ...0000_10_config-operator_01_infrastructures-Default.crd.yaml | 2 +- features.md | 1 - features/features.go | 2 +- ...0000_10_config-operator_01_infrastructures-Default.crd.yaml | 2 +- ...000_80_machine-config_01_controllerconfigs-Default.crd.yaml | 2 +- .../featuregates/featureGate-Hypershift-Default.yaml | 3 --- .../featuregates/featureGate-SelfManagedHA-Default.yaml | 3 --- 7 files changed, 4 insertions(+), 11 deletions(-) diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-Default.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-Default.crd.yaml index 6dcc0cfb6aa..99225975797 100644 --- a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-Default.crd.yaml +++ b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-Default.crd.yaml @@ -324,7 +324,7 @@ spec: is Name, and forbidden otherwise rule: 'has(self.type) && self.type == ''Name'' ? has(self.name) : !has(self.name)' - maxItems: 1 + maxItems: 32 minItems: 1 type: array x-kubernetes-list-type: atomic diff --git a/features.md b/features.md index 50a0ec78890..0a5c4bb913b 100644 --- a/features.md +++ b/features.md @@ -52,7 +52,6 @@ | MultiDiskSetup| | | Enabled | Enabled | Enabled | Enabled | | MutatingAdmissionPolicy| | | Enabled | Enabled | Enabled | Enabled | | NodeSwap| | | Enabled | Enabled | Enabled | Enabled | -| NutanixMultiSubnets| | | Enabled | Enabled | Enabled | Enabled | | OVNObservability| | | Enabled | Enabled | Enabled | Enabled | | PreconfiguredUDNAddresses| | | Enabled | Enabled | Enabled | Enabled | | SignatureStores| | | Enabled | Enabled | Enabled | Enabled | diff --git a/features/features.go b/features/features.go index f55e7d9a923..3ddfdb9ddd4 100644 --- a/features/features.go +++ b/features/features.go @@ -682,7 +682,7 @@ var ( contactPerson("yanhli"). productScope(ocpSpecific). enhancementPR("https://github.com/openshift/enhancements/pull/1711"). - enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade). + enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade). mustRegister() FeatureGateKMSEncryptionProvider = newFeatureGate("KMSEncryptionProvider"). diff --git a/payload-manifests/crds/0000_10_config-operator_01_infrastructures-Default.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_infrastructures-Default.crd.yaml index 6dcc0cfb6aa..99225975797 100644 --- a/payload-manifests/crds/0000_10_config-operator_01_infrastructures-Default.crd.yaml +++ b/payload-manifests/crds/0000_10_config-operator_01_infrastructures-Default.crd.yaml @@ -324,7 +324,7 @@ spec: is Name, and forbidden otherwise rule: 'has(self.type) && self.type == ''Name'' ? has(self.name) : !has(self.name)' - maxItems: 1 + maxItems: 32 minItems: 1 type: array x-kubernetes-list-type: atomic diff --git a/payload-manifests/crds/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml b/payload-manifests/crds/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml index c6b83d32542..cab55e12d80 100644 --- a/payload-manifests/crds/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml +++ b/payload-manifests/crds/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml @@ -606,7 +606,7 @@ spec: when type is Name, and forbidden otherwise rule: 'has(self.type) && self.type == ''Name'' ? has(self.name) : !has(self.name)' - maxItems: 1 + maxItems: 32 minItems: 1 type: array x-kubernetes-list-type: atomic diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml index e93fa297da0..cbab5b99763 100644 --- a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml +++ b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml @@ -160,9 +160,6 @@ { "name": "NodeSwap" }, - { - "name": "NutanixMultiSubnets" - }, { "name": "OVNObservability" }, diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml index 3112a6c0134..bc2188e71d9 100644 --- a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml +++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml @@ -160,9 +160,6 @@ { "name": "NodeSwap" }, - { - "name": "NutanixMultiSubnets" - }, { "name": "OVNObservability" }, From c36bb3127a9a71679fae6d1d2aba3119548980c9 Mon Sep 17 00:00:00 2001 From: Abhay Date: Tue, 22 Jul 2025 23:12:17 +0530 Subject: [PATCH 2/2] running update scripts --- ..._10_config-operator_01_infrastructures-Default.crd.yaml | 4 ++++ features.md | 1 + ...80_machine-config_01_controllerconfigs-Default.crd.yaml | 7 ++++++- .../featuregates/featureGate-Hypershift-Default.yaml | 3 +++ .../featuregates/featureGate-SelfManagedHA-Default.yaml | 3 +++ 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-Default.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-Default.crd.yaml index 99225975797..7f38ac8fd83 100644 --- a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-Default.crd.yaml +++ b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-Default.crd.yaml @@ -328,11 +328,15 @@ spec: minItems: 1 type: array x-kubernetes-list-type: atomic + x-kubernetes-validations: + - message: each subnet must be unique + rule: self.all(x, self.exists_one(y, x == y)) required: - cluster - name - subnets type: object + maxItems: 32 type: array x-kubernetes-list-map-keys: - name diff --git a/features.md b/features.md index 0a5c4bb913b..61b579ced67 100644 --- a/features.md +++ b/features.md @@ -86,6 +86,7 @@ | NetworkDiagnosticsConfig| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | NetworkLiveMigration| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | NetworkSegmentation| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | +| NutanixMultiSubnets| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | OnClusterBuild| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | OpenShiftPodSecurityAdmission| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | PinnedImages| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | diff --git a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml b/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml index c6b83d32542..2b7ff1162fb 100644 --- a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml +++ b/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml @@ -606,15 +606,20 @@ spec: when type is Name, and forbidden otherwise rule: 'has(self.type) && self.type == ''Name'' ? has(self.name) : !has(self.name)' - maxItems: 1 + maxItems: 32 minItems: 1 type: array x-kubernetes-list-type: atomic + x-kubernetes-validations: + - message: each subnet must be unique + rule: self.all(x, self.exists_one(y, x == + y)) required: - cluster - name - subnets type: object + maxItems: 32 type: array x-kubernetes-list-map-keys: - name diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml index cbab5b99763..60e48b989fd 100644 --- a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml +++ b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml @@ -273,6 +273,9 @@ { "name": "NetworkSegmentation" }, + { + "name": "NutanixMultiSubnets" + }, { "name": "OnClusterBuild" }, diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml index bc2188e71d9..5ac0115dd6f 100644 --- a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml +++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml @@ -273,6 +273,9 @@ { "name": "NewOLM" }, + { + "name": "NutanixMultiSubnets" + }, { "name": "OnClusterBuild" },