Add TechPreviewNoUpgrade gate to SignatureStores

openshift · Nov 29, 2023 · 36d9723 · 36d9723
1 parent 45f44a7
commit 36d9723
Show file tree

Hide file tree

Showing 7 changed files with 956 additions and 57 deletions.
diff --git a/...rsion-operator_01_clusterversion.crd.yaml → ...erator_01_clusterversion-Default.crd.yaml b/...rsion-operator_01_clusterversion.crd.yaml → ...erator_01_clusterversion-Default.crd.yaml
@@ -5,6 +5,7 @@ metadata:
     api-approved.openshift.io: https://github.com/openshift/api/pull/495
     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:
   group: config.openshift.io

diff --git a/config/v1/0000_00_cluster-version-operator_01_clusterversion-TechPreviewNoUpgrade.crd.yaml b/config/v1/0000_00_cluster-version-operator_01_clusterversion-TechPreviewNoUpgrade.crd.yaml
diff --git a/config/v1/feature_gates.go b/config/v1/feature_gates.go
@@ -341,4 +341,14 @@ var (
 		ResponsiblePerson:   "padillon",
 		OwningProduct:       ocpSpecific,
 	}
+
+	FeatureGateSignatureStores = FeatureGateName("SignatureStores")
+	signatureStores            = FeatureGateDescription{
+		FeatureGateAttributes: FeatureGateAttributes{
+			Name: FeatureGateSignatureStores,
+		},
+		OwningJiraComponent: "over-the-air-updates",
+		ResponsiblePerson:   "lmohanty",
+		OwningProduct:       ocpSpecific,
+	}
 )
diff --git a/config/v1/stable.clusterversion.testsuite.yaml b/config/v1/stable.clusterversion.testsuite.yaml
@@ -1,6 +1,6 @@
 apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
 name: "[Stable] ClusterVersion"
-crd: 0000_00_cluster-version-operator_01_clusterversion.crd.yaml
+crd: 0000_00_cluster-version-operator_01_clusterversion-Default.crd.yaml
 tests:
   onCreate:
   - name: Should be able to create a minimal ClusterVersion
@@ -162,60 +162,6 @@ tests:
           additionalEnabledCapabilities:
           - marketplace
     expectedError: the `marketplace` capability requires the `OperatorLifecycleManager` capability, which is neither explicitly or implicitly enabled in this cluster, please enable the `OperatorLifecycleManager` capability
-  - name: Should be able to set a custom signature store
-    initial: |
-      apiVersion: config.openshift.io/v1
-      kind: ClusterVersion
-      spec:
-        clusterID: foo
-        signatureStores: 
-          - "https://osus.ocp.com"
-    expected: |
-      apiVersion: config.openshift.io/v1
-      kind: ClusterVersion
-      spec:
-        clusterID: foo
-        signatureStores: 
-          - "https://osus.ocp.com"
-  - name: Should be able to set multiple custom signature store
-    initial: |
-      apiVersion: config.openshift.io/v1
-      kind: ClusterVersion
-      spec:
-        clusterID: foo
-        signatureStores: 
-          - "https://osus1.ocp.com"
-          - "https://osus2.ocp.com"
-    expected: |
-      apiVersion: config.openshift.io/v1
-      kind: ClusterVersion
-      spec:
-        clusterID: foo
-        signatureStores: 
-          - "https://osus1.ocp.com"
-          - "https://osus2.ocp.com"
-  - name: Invalid custom signature store should throw error
-    initial: |
-      apiVersion: config.openshift.io/v1
-      kind: ClusterVersion
-      spec:
-        clusterID: foo
-        signatureStores: 
-          - "osus1.ocp.com"
-    expectedError: "signatureStores must contain only valid absolute URLs per the Go net/url standard"
-  - name: Should be able to unset the signature stores
-    initial: |
-      apiVersion: config.openshift.io/v1
-      kind: ClusterVersion
-      spec:
-        clusterID: foo
-        signatureStores: []
-    expected: |
-      apiVersion: config.openshift.io/v1
-      kind: ClusterVersion
-      spec:
-        clusterID: foo
-        signatureStores: []
   onUpdate:
   - name: Should not allow image to be set if architecture set
     initial: |