Merge pull request openshift#1827 from deads2k/by-gate-29-single-node

NO-JIRA: remove single-node-developer clusterProfile
nitin-dhevar · Mar 27, 2024 · 4b072d8 · 4b072d8
2 parents ff84c2c + 99851ab
commit 4b072d8
Show file tree

Hide file tree

Showing 211 changed files with 61 additions and 3,199 deletions.
diff --git a/README.md b/README.md
@@ -81,7 +81,6 @@ When copying, it matters which `// +foo` markers are two comments blocks up and
 // +kubebuilder:printcolumn:name=Column Name,JSONPath=.status.something,type=string,description=how users should interpret this.
 // +kubebuilder:metadata:annotations=key=value
 // +kubebuilder:metadata:labels=key=value
-// +kubebuilder:metadata:annotations=include.release.openshift.io/single-node-developer=true
 // +kubebuilder:validation:XValidation:rule=
 type MyAPI struct {
 	metav1.TypeMeta `json:",inline"`

diff --git a/apiserver/v1/types_apirequestcount.go b/apiserver/v1/types_apirequestcount.go
@@ -24,7 +24,6 @@ const (
 // +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/897
 // +openshift:file-pattern=operatorName=kube-apiserver
 // +kubebuilder:metadata:annotations=include.release.openshift.io/self-managed-high-availability=true
-// +kubebuilder:metadata:annotations=include.release.openshift.io/single-node-developer=true
 // +kubebuilder:printcolumn:name=RemovedInRelease,JSONPath=.status.removedInRelease,type=string,description=Release in which an API will be removed.
 // +kubebuilder:printcolumn:name=RequestsInCurrentHour,JSONPath=.status.currentHour.requestCount,type=integer,description=Number of requests in the current hour.
 // +kubebuilder:printcolumn:name=RequestsInLast24h,JSONPath=.status.requestCount,type=integer,description=Number of requests in the last 24h.

diff --git a/apiserver/v1/zz_generated.crd-manifests/kube-apiserver_apirequestcounts.crd.yaml b/apiserver/v1/zz_generated.crd-manifests/kube-apiserver_apirequestcounts.crd.yaml
@@ -5,7 +5,6 @@ metadata:
     api-approved.openshift.io: https://github.com/openshift/api/pull/897
     api.openshift.io/merged-by-featuregates: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
   name: apirequestcounts.apiserver.openshift.io
 spec:
   group: apiserver.openshift.io

diff --git a/apiserver/v1/zz_generated.featuregated-crd-manifests.yaml b/apiserver/v1/zz_generated.featuregated-crd-manifests.yaml
@@ -1,7 +1,6 @@
 apirequestcounts.apiserver.openshift.io:
   Annotations:
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
   ApprovedPRNumber: https://github.com/openshift/api/pull/897
   CRDName: apirequestcounts.apiserver.openshift.io
   Capability: ""

diff --git a/...rated.featuregated-crd-manifests/apirequestcounts.apiserver.openshift.io/AAA_ungated.yaml b/...rated.featuregated-crd-manifests/apirequestcounts.apiserver.openshift.io/AAA_ungated.yaml
@@ -6,7 +6,6 @@ metadata:
     api.openshift.io/filename-operator: kube-apiserver
     feature-gate.release.openshift.io/: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
   name: apirequestcounts.apiserver.openshift.io
 spec:
   group: apiserver.openshift.io

diff --git a/...v1/zz_generated.crd-manifests/0000_03_config-operator_01_rolebindingrestrictions.crd.yaml b/...v1/zz_generated.crd-manifests/0000_03_config-operator_01_rolebindingrestrictions.crd.yaml
@@ -6,7 +6,6 @@ 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"
-    include.release.openshift.io/single-node-developer: "true"
   name: rolebindingrestrictions.authorization.openshift.io
 spec:
   group: authorization.openshift.io

diff --git a/cloudnetwork/v1/zz_generated.crd-manifests/001_cloudprivateipconfigs.crd.yaml b/cloudnetwork/v1/zz_generated.crd-manifests/001_cloudprivateipconfigs.crd.yaml
@@ -6,7 +6,6 @@ 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"
-    include.release.openshift.io/single-node-developer: "true"
   name: cloudprivateipconfigs.cloud.network.openshift.io
 spec:
   group: cloud.network.openshift.io

diff --git a/config/v1/feature_gates.go b/config/v1/feature_gates.go
@@ -22,8 +22,7 @@ type ClusterProfileName string
 var (
 	Hypershift         = ClusterProfileName("include.release.openshift.io/ibm-cloud-managed")
 	SelfManaged        = ClusterProfileName("include.release.openshift.io/self-managed-high-availability")
-	SingleNode         = ClusterProfileName("include.release.openshift.io/single-node-developer")
-	AllClusterProfiles = []ClusterProfileName{Hypershift, SelfManaged, SingleNode}
+	AllClusterProfiles = []ClusterProfileName{Hypershift, SelfManaged}
 )
 
 type OwningProduct string

diff --git a/config/v1/types_cluster_operator.go b/config/v1/types_cluster_operator.go
@@ -26,7 +26,6 @@ import (
 // +kubebuilder:printcolumn:name=Degraded,JSONPath=.status.conditions[?(@.type=="Degraded")].status,type=string,description=Whether the operator is degraded.
 // +kubebuilder:printcolumn:name=Since,JSONPath=.status.conditions[?(@.type=="Available")].lastTransitionTime,type=date,description=The time the operator's Available status last changed.
 // +kubebuilder:metadata:annotations=include.release.openshift.io/self-managed-high-availability=true
-// +kubebuilder:metadata:annotations=include.release.openshift.io/single-node-developer=true
 type ClusterOperator struct {
 	metav1.TypeMeta `json:",inline"`
 

diff --git a/config/v1/types_cluster_version.go b/config/v1/types_cluster_version.go
@@ -26,7 +26,6 @@ import (
 // +kubebuilder:printcolumn:name=Since,JSONPath=.status.conditions[?(@.type=="Progressing")].lastTransitionTime,type=date
 // +kubebuilder:printcolumn:name=Status,JSONPath=.status.conditions[?(@.type=="Progressing")].message,type=string
 // +kubebuilder:metadata:annotations=include.release.openshift.io/self-managed-high-availability=true
-// +kubebuilder:metadata:annotations=include.release.openshift.io/single-node-developer=true
 type ClusterVersion struct {
 	metav1.TypeMeta `json:",inline"`
 

diff --git a/.../zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusteroperators.crd.yaml b/.../zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusteroperators.crd.yaml
@@ -5,7 +5,6 @@ metadata:
     api-approved.openshift.io: https://github.com/openshift/api/pull/497
     api.openshift.io/merged-by-featuregates: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
   name: clusteroperators.config.openshift.io
 spec:
   group: config.openshift.io

diff --git a/...rd-manifests/0000_00_cluster-version-operator_01_clusterversions-CustomNoUpgrade.crd.yaml b/...rd-manifests/0000_00_cluster-version-operator_01_clusterversions-CustomNoUpgrade.crd.yaml
@@ -5,7 +5,6 @@ metadata:
     api-approved.openshift.io: https://github.com/openshift/api/pull/495
     api.openshift.io/merged-by-featuregates: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
     release.openshift.io/feature-set: CustomNoUpgrade
   name: clusterversions.config.openshift.io
 spec:

diff --git a/...erated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-Default.crd.yaml b/...erated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-Default.crd.yaml
@@ -5,7 +5,6 @@ metadata:
     api-approved.openshift.io: https://github.com/openshift/api/pull/495
     api.openshift.io/merged-by-featuregates: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
     release.openshift.io/feature-set: Default
   name: clusterversions.config.openshift.io
 spec:

diff --git a/...nifests/0000_00_cluster-version-operator_01_clusterversions-TechPreviewNoUpgrade.crd.yaml b/...nifests/0000_00_cluster-version-operator_01_clusterversions-TechPreviewNoUpgrade.crd.yaml
@@ -5,7 +5,6 @@ metadata:
     api-approved.openshift.io: https://github.com/openshift/api/pull/495
     api.openshift.io/merged-by-featuregates: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
     release.openshift.io/feature-set: TechPreviewNoUpgrade
   name: clusterversions.config.openshift.io
 spec:

diff --git a/config/v1/zz_generated.crd-manifests/0000_03_config-operator_01_proxies.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_03_config-operator_01_proxies.crd.yaml
@@ -6,7 +6,6 @@ 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"
-    include.release.openshift.io/single-node-developer: "true"
   name: proxies.config.openshift.io
 spec:
   group: config.openshift.io

diff --git a/config/v1/zz_generated.crd-manifests/0000_03_marketplace_01_operatorhubs.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_03_marketplace_01_operatorhubs.crd.yaml
@@ -7,7 +7,6 @@ metadata:
     capability.openshift.io/name: marketplace
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
   name: operatorhubs.config.openshift.io
 spec:
   group: config.openshift.io

diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_apiservers.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_apiservers.crd.yaml
@@ -6,7 +6,6 @@ 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"
-    include.release.openshift.io/single-node-developer: "true"
   name: apiservers.config.openshift.io
 spec:
   group: config.openshift.io