diff --git a/config/v1alpha1/tests/clusterimagepolicies.config.openshift.io/ImagePolicy.yaml b/config/v1alpha1/tests/clusterimagepolicies.config.openshift.io/SigstoreImageVerification.yaml similarity index 99% rename from config/v1alpha1/tests/clusterimagepolicies.config.openshift.io/ImagePolicy.yaml rename to config/v1alpha1/tests/clusterimagepolicies.config.openshift.io/SigstoreImageVerification.yaml index 86d4c60ad92..78e094fb25f 100644 --- a/config/v1alpha1/tests/clusterimagepolicies.config.openshift.io/ImagePolicy.yaml +++ b/config/v1alpha1/tests/clusterimagepolicies.config.openshift.io/SigstoreImageVerification.yaml @@ -1,7 +1,7 @@ apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this name: "ClusterImagePolicy" crdName: clusterimagepolicies.config.openshift.io -featureGate: ImagePolicy +featureGate: SigstoreImageVerification tests: onCreate: - name: Should be able to create a minimal ImagePolicy with policyType PublicKey diff --git a/config/v1alpha1/tests/imagepolicies.config.openshift.io/ImagePolicy.yaml b/config/v1alpha1/tests/imagepolicies.config.openshift.io/SigstoreImageVerification.yaml similarity index 99% rename from config/v1alpha1/tests/imagepolicies.config.openshift.io/ImagePolicy.yaml rename to config/v1alpha1/tests/imagepolicies.config.openshift.io/SigstoreImageVerification.yaml index b8d62adf86a..9531873aade 100644 --- a/config/v1alpha1/tests/imagepolicies.config.openshift.io/ImagePolicy.yaml +++ b/config/v1alpha1/tests/imagepolicies.config.openshift.io/SigstoreImageVerification.yaml @@ -1,7 +1,7 @@ apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this name: "ImagePolicy" crdName: imagepolicies.config.openshift.io -featureGate: ImagePolicy +featureGate: SigstoreImageVerification tests: onCreate: - name: Should be able to create a minimal ImagePolicy with policyType PublicKey diff --git a/config/v1alpha1/types_cluster_image_policy.go b/config/v1alpha1/types_cluster_image_policy.go index 676065d5f8b..e3670f03e89 100644 --- a/config/v1alpha1/types_cluster_image_policy.go +++ b/config/v1alpha1/types_cluster_image_policy.go @@ -14,7 +14,7 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" // +kubebuilder:subresource:status // +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/1457 // +openshift:file-pattern=cvoRunLevel=0000_10,operatorName=config-operator,operatorOrdering=01 -// +openshift:enable:FeatureGate=ImagePolicy +// +openshift:enable:FeatureGate=SigstoreImageVerification // +openshift:compatibility-gen:level=4 type ClusterImagePolicy struct { metav1.TypeMeta `json:",inline"` diff --git a/config/v1alpha1/types_image_policy.go b/config/v1alpha1/types_image_policy.go index 241837dbd9e..7031110ff1e 100644 --- a/config/v1alpha1/types_image_policy.go +++ b/config/v1alpha1/types_image_policy.go @@ -13,7 +13,7 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" // +kubebuilder:subresource:status // +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/1457 // +openshift:file-pattern=cvoRunLevel=0000_10,operatorName=config-operator,operatorOrdering=01 -// +openshift:enable:FeatureGate=ImagePolicy +// +openshift:enable:FeatureGate=SigstoreImageVerification // +openshift:compatibility-gen:level=4 type ImagePolicy struct { metav1.TypeMeta `json:",inline"` diff --git a/config/v1alpha1/zz_generated.featuregated-crd-manifests.yaml b/config/v1alpha1/zz_generated.featuregated-crd-manifests.yaml index 9b5744d4a0e..393365b41c3 100644 --- a/config/v1alpha1/zz_generated.featuregated-crd-manifests.yaml +++ b/config/v1alpha1/zz_generated.featuregated-crd-manifests.yaml @@ -28,7 +28,7 @@ clusterimagepolicies.config.openshift.io: Capability: "" Category: "" FeatureGates: - - ImagePolicy + - SigstoreImageVerification FilenameOperatorName: config-operator FilenameOperatorOrdering: "01" FilenameRunLevel: "0000_10" @@ -41,7 +41,7 @@ clusterimagepolicies.config.openshift.io: Scope: Cluster ShortNames: null TopLevelFeatureGates: - - ImagePolicy + - SigstoreImageVerification Version: v1alpha1 imagepolicies.config.openshift.io: @@ -51,7 +51,7 @@ imagepolicies.config.openshift.io: Capability: "" Category: "" FeatureGates: - - ImagePolicy + - SigstoreImageVerification FilenameOperatorName: config-operator FilenameOperatorOrdering: "01" FilenameRunLevel: "0000_10" @@ -64,7 +64,7 @@ imagepolicies.config.openshift.io: Scope: Namespaced ShortNames: null TopLevelFeatureGates: - - ImagePolicy + - SigstoreImageVerification Version: v1alpha1 insightsdatagathers.config.openshift.io: diff --git a/config/v1alpha1/zz_generated.featuregated-crd-manifests/clusterimagepolicies.config.openshift.io/ImagePolicy.yaml b/config/v1alpha1/zz_generated.featuregated-crd-manifests/clusterimagepolicies.config.openshift.io/SigstoreImageVerification.yaml similarity index 99% rename from config/v1alpha1/zz_generated.featuregated-crd-manifests/clusterimagepolicies.config.openshift.io/ImagePolicy.yaml rename to config/v1alpha1/zz_generated.featuregated-crd-manifests/clusterimagepolicies.config.openshift.io/SigstoreImageVerification.yaml index e0bdb58f93e..10f5cb9fed7 100644 --- a/config/v1alpha1/zz_generated.featuregated-crd-manifests/clusterimagepolicies.config.openshift.io/ImagePolicy.yaml +++ b/config/v1alpha1/zz_generated.featuregated-crd-manifests/clusterimagepolicies.config.openshift.io/SigstoreImageVerification.yaml @@ -6,7 +6,7 @@ metadata: api.openshift.io/filename-cvo-runlevel: "0000_10" api.openshift.io/filename-operator: config-operator api.openshift.io/filename-ordering: "01" - feature-gate.release.openshift.io/ImagePolicy: "true" + feature-gate.release.openshift.io/SigstoreImageVerification: "true" name: clusterimagepolicies.config.openshift.io spec: group: config.openshift.io diff --git a/config/v1alpha1/zz_generated.featuregated-crd-manifests/imagepolicies.config.openshift.io/ImagePolicy.yaml b/config/v1alpha1/zz_generated.featuregated-crd-manifests/imagepolicies.config.openshift.io/SigstoreImageVerification.yaml similarity index 99% rename from config/v1alpha1/zz_generated.featuregated-crd-manifests/imagepolicies.config.openshift.io/ImagePolicy.yaml rename to config/v1alpha1/zz_generated.featuregated-crd-manifests/imagepolicies.config.openshift.io/SigstoreImageVerification.yaml index 02e9243de47..457bb4ba356 100644 --- a/config/v1alpha1/zz_generated.featuregated-crd-manifests/imagepolicies.config.openshift.io/ImagePolicy.yaml +++ b/config/v1alpha1/zz_generated.featuregated-crd-manifests/imagepolicies.config.openshift.io/SigstoreImageVerification.yaml @@ -6,7 +6,7 @@ metadata: api.openshift.io/filename-cvo-runlevel: "0000_10" api.openshift.io/filename-operator: config-operator api.openshift.io/filename-ordering: "01" - feature-gate.release.openshift.io/ImagePolicy: "true" + feature-gate.release.openshift.io/SigstoreImageVerification: "true" name: imagepolicies.config.openshift.io spec: group: config.openshift.io diff --git a/features.md b/features.md index a25a73f2ab5..b2fffeba83e 100644 --- a/features.md +++ b/features.md @@ -23,7 +23,6 @@ | ExternalRouteCertificate| | | Enabled | Enabled | Enabled | Enabled | | GCPClusterHostedDNS| | | Enabled | Enabled | Enabled | Enabled | | GCPLabelsTags| | | Enabled | Enabled | Enabled | Enabled | -| ImagePolicy| | | Enabled | Enabled | Enabled | Enabled | | IngressControllerLBSubnetsAWS| | | Enabled | Enabled | Enabled | Enabled | | InsightsConfig| | | Enabled | Enabled | Enabled | Enabled | | InsightsConfigAPI| | | Enabled | Enabled | Enabled | Enabled | diff --git a/features/features.go b/features/features.go index 025802f22f4..47761e8b0a2 100644 --- a/features/features.go +++ b/features/features.go @@ -447,13 +447,6 @@ var ( enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade). mustRegister() - FeatureGateImagePolicy = newFeatureGate("ImagePolicy"). - reportProblemsToJiraComponent("node"). - contactPerson("rphillips"). - productScope(ocpSpecific). - enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade). - mustRegister() - FeatureGateNodeDisruptionPolicy = newFeatureGate("NodeDisruptionPolicy"). reportProblemsToJiraComponent("MachineConfigOperator"). contactPerson("jerzhang"). @@ -575,9 +568,9 @@ var ( mustRegister() FeatureGateIngressControllerLBSubnetsAWS = newFeatureGate("IngressControllerLBSubnetsAWS"). - reportProblemsToJiraComponent("Routing"). - contactPerson("miciah"). - productScope(ocpSpecific). - enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade). - mustRegister() + reportProblemsToJiraComponent("Routing"). + contactPerson("miciah"). + productScope(ocpSpecific). + enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade). + mustRegister() ) diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml index adfc8085c3d..2fb44722831 100644 --- a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml +++ b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml @@ -67,9 +67,6 @@ { "name": "GatewayAPI" }, - { - "name": "ImagePolicy" - }, { "name": "IngressControllerLBSubnetsAWS" }, diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml index a1caf7ef99d..a91f60f8393 100644 --- a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml @@ -137,9 +137,6 @@ { "name": "HardwareSpeed" }, - { - "name": "ImagePolicy" - }, { "name": "IngressControllerLBSubnetsAWS" }, diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml index aeb2c7a3a95..2cab9da5ace 100644 --- a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml @@ -137,9 +137,6 @@ { "name": "HardwareSpeed" }, - { - "name": "ImagePolicy" - }, { "name": "IngressControllerLBSubnetsAWS" }, diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml index 414801ebcbf..5a2a42853f3 100644 --- a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml +++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml @@ -70,9 +70,6 @@ { "name": "GatewayAPI" }, - { - "name": "ImagePolicy" - }, { "name": "IngressControllerLBSubnetsAWS" }, diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml index 47eadebe5e6..8d601a314ee 100644 --- a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml @@ -137,9 +137,6 @@ { "name": "HardwareSpeed" }, - { - "name": "ImagePolicy" - }, { "name": "IngressControllerLBSubnetsAWS" }, diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml index 03ae0f4a922..edf421a911b 100644 --- a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml @@ -137,9 +137,6 @@ { "name": "HardwareSpeed" }, - { - "name": "ImagePolicy" - }, { "name": "IngressControllerLBSubnetsAWS" },