diff --git a/hack/manifest-diff.sh b/hack/manifest-diff.sh index 6a1c77b7..ae3bec83 100755 --- a/hack/manifest-diff.sh +++ b/hack/manifest-diff.sh @@ -18,11 +18,11 @@ set -euo pipefail -CVO_FEATURE_SET="DevPreviewNoUpgrade" +CVO_FEATURE_GATE="KarpenterOperator" CVO_ANNOTATIONS_YQ=' .metadata.annotations["exclude.release.openshift.io/internal-openshift-hosted"] = "true" | .metadata.annotations["include.release.openshift.io/self-managed-high-availability"] = "true" | - .metadata.annotations["release.openshift.io/feature-set"] = "'"${CVO_FEATURE_SET}"'" + .metadata.annotations["release.openshift.io/feature-gate"] = "'"${CVO_FEATURE_GATE}"'" ' NAMESPACE="openshift-karpenter" diff --git a/install/00_credentials-request-aws.yaml b/install/00_credentials-request-aws.yaml index d95c4c0e..435904e1 100644 --- a/install/00_credentials-request-aws.yaml +++ b/install/00_credentials-request-aws.yaml @@ -8,7 +8,7 @@ metadata: capability.openshift.io/name: CloudCredential exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/feature-set: DevPreviewNoUpgrade + release.openshift.io/feature-gate: KarpenterOperator spec: serviceAccountNames: - karpenter diff --git a/install/00_namespace.yaml b/install/00_namespace.yaml index c8a20080..512c5fe0 100644 --- a/install/00_namespace.yaml +++ b/install/00_namespace.yaml @@ -8,6 +8,6 @@ metadata: workload.openshift.io/allowed: management exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/feature-set: DevPreviewNoUpgrade + release.openshift.io/feature-gate: KarpenterOperator labels: openshift.io/cluster-monitoring: "true" diff --git a/install/03_aggregate-clusterrole.yaml b/install/03_aggregate-clusterrole.yaml index 37b08197..c37945ba 100644 --- a/install/03_aggregate-clusterrole.yaml +++ b/install/03_aggregate-clusterrole.yaml @@ -7,7 +7,7 @@ metadata: annotations: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/feature-set: DevPreviewNoUpgrade + release.openshift.io/feature-gate: KarpenterOperator rules: - apiGroups: ["karpenter.sh"] resources: ["nodepools", "nodepools/status", "nodeclaims", "nodeclaims/status"] diff --git a/install/04_rbac.yaml b/install/04_rbac.yaml index 61c684b9..58708d94 100644 --- a/install/04_rbac.yaml +++ b/install/04_rbac.yaml @@ -10,7 +10,7 @@ metadata: annotations: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/feature-set: DevPreviewNoUpgrade + release.openshift.io/feature-gate: KarpenterOperator --- apiVersion: rbac.authorization.k8s.io/v1 kind: Role @@ -20,7 +20,7 @@ metadata: annotations: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/feature-set: DevPreviewNoUpgrade + release.openshift.io/feature-gate: KarpenterOperator rules: - apiGroups: ["coordination.k8s.io"] resources: ["leases"] @@ -51,7 +51,7 @@ metadata: annotations: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/feature-set: DevPreviewNoUpgrade + release.openshift.io/feature-gate: KarpenterOperator roleRef: apiGroup: rbac.authorization.k8s.io kind: Role @@ -68,7 +68,7 @@ metadata: annotations: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/feature-set: DevPreviewNoUpgrade + release.openshift.io/feature-gate: KarpenterOperator rules: - apiGroups: ["config.openshift.io"] resources: ["clusteroperators", "clusteroperators/status"] @@ -90,7 +90,7 @@ metadata: annotations: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/feature-set: DevPreviewNoUpgrade + release.openshift.io/feature-gate: KarpenterOperator subjects: - kind: ServiceAccount name: karpenter-operator @@ -109,7 +109,7 @@ metadata: annotations: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/feature-set: DevPreviewNoUpgrade + release.openshift.io/feature-gate: KarpenterOperator rules: - apiGroups: [""] resources: ["services"] @@ -124,7 +124,7 @@ metadata: annotations: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/feature-set: DevPreviewNoUpgrade + release.openshift.io/feature-gate: KarpenterOperator roleRef: apiGroup: rbac.authorization.k8s.io kind: Role @@ -141,7 +141,7 @@ metadata: annotations: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/feature-set: DevPreviewNoUpgrade + release.openshift.io/feature-gate: KarpenterOperator rules: # Read - apiGroups: ["karpenter.sh"] @@ -197,7 +197,7 @@ metadata: annotations: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/feature-set: DevPreviewNoUpgrade + release.openshift.io/feature-gate: KarpenterOperator subjects: - kind: ServiceAccount name: karpenter-operator @@ -215,7 +215,7 @@ metadata: annotations: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/feature-set: DevPreviewNoUpgrade + release.openshift.io/feature-gate: KarpenterOperator rules: # Read - apiGroups: ["coordination.k8s.io"] @@ -241,7 +241,7 @@ metadata: annotations: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/feature-set: DevPreviewNoUpgrade + release.openshift.io/feature-gate: KarpenterOperator subjects: - kind: ServiceAccount name: karpenter-operator diff --git a/install/05_deployment.yaml b/install/05_deployment.yaml index 97bdc605..fd2c5e14 100644 --- a/install/05_deployment.yaml +++ b/install/05_deployment.yaml @@ -9,7 +9,7 @@ metadata: annotations: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/feature-set: DevPreviewNoUpgrade + release.openshift.io/feature-gate: KarpenterOperator spec: replicas: 1 selector: diff --git a/install/06_clusteroperator.yaml b/install/06_clusteroperator.yaml index b9143e76..f9970d31 100644 --- a/install/06_clusteroperator.yaml +++ b/install/06_clusteroperator.yaml @@ -5,7 +5,7 @@ metadata: annotations: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/feature-set: DevPreviewNoUpgrade + release.openshift.io/feature-gate: KarpenterOperator spec: {} status: versions: