From 65ce274245d59ab6cc6158ef3345326d7ce53193 Mon Sep 17 00:00:00 2001 From: Lalatendu Mohanty Date: Mon, 18 Nov 2024 14:33:28 -0500 Subject: [PATCH 1/2] Reapply "NO-ISSUE: Add OCP variant annotations to manifests" This reverts commit 5d75f601edfb8f55c28d1469c6d2bf1eb1d31bc9. --- manifests/0000_51_olm_00-olm-operator.yml | 5 ++--- manifests/0000_51_olm_01_operator_namespace.yaml | 6 ++++-- manifests/0000_51_olm_02_operator_clusterrole.yaml | 12 +++++++----- manifests/0000_51_olm_03_service_account.yaml | 4 +++- manifests/0000_51_olm_04_metrics_service.yaml | 6 ++++-- .../0000_51_olm_05_operator_clusterrolebinding.yaml | 4 +++- manifests/0000_51_olm_06_deployment.yaml | 4 +++- manifests/0000_51_olm_07_cluster_operator.yaml | 4 +++- 8 files changed, 29 insertions(+), 16 deletions(-) diff --git a/manifests/0000_51_olm_00-olm-operator.yml b/manifests/0000_51_olm_00-olm-operator.yml index bea8fdb5d..342b014c4 100644 --- a/manifests/0000_51_olm_00-olm-operator.yml +++ b/manifests/0000_51_olm_00-olm-operator.yml @@ -3,13 +3,12 @@ kind: OLM metadata: name: cluster annotations: - include.release.openshift.io/hypershift: "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" - release.openshift.io/create-only: "true" - release.openshift.io/feature-set: TechPreviewNoUpgrade capability.openshift.io/name: "OperatorLifecycleManagerV1" + release.openshift.io/feature-set: TechPreviewNoUpgrade + release.openshift.io/create-only: "true" spec: managementState: Managed logLevel: Normal diff --git a/manifests/0000_51_olm_01_operator_namespace.yaml b/manifests/0000_51_olm_01_operator_namespace.yaml index fe527ab4e..86e21fd86 100644 --- a/manifests/0000_51_olm_01_operator_namespace.yaml +++ b/manifests/0000_51_olm_01_operator_namespace.yaml @@ -3,9 +3,11 @@ kind: Namespace metadata: name: openshift-cluster-olm-operator annotations: + include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" - workload.openshift.io/allowed: "management" + include.release.openshift.io/single-node-developer: "true" + capability.openshift.io/name: "OperatorLifecycleManagerV1" release.openshift.io/feature-set: TechPreviewNoUpgrade pod-security.kubernetes.io/enforce: restricted pod-security.kubernetes.io/enforce-version: latest - capability.openshift.io/name: "OperatorLifecycleManagerV1" + workload.openshift.io/allowed: "management" diff --git a/manifests/0000_51_olm_02_operator_clusterrole.yaml b/manifests/0000_51_olm_02_operator_clusterrole.yaml index 45006503a..88e9c8994 100644 --- a/manifests/0000_51_olm_02_operator_clusterrole.yaml +++ b/manifests/0000_51_olm_02_operator_clusterrole.yaml @@ -3,11 +3,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: cluster-olm-operator - annotations: - include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/feature-set: TechPreviewNoUpgrade - capability.openshift.io/name: "OperatorLifecycleManagerV1" + name: cluster-olm-operator + annotations: + 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" + capability.openshift.io/name: "OperatorLifecycleManagerV1" + release.openshift.io/feature-set: TechPreviewNoUpgrade rules: - apiGroups: - config.openshift.io diff --git a/manifests/0000_51_olm_03_service_account.yaml b/manifests/0000_51_olm_03_service_account.yaml index 92bfe2ec2..47ca1f89f 100644 --- a/manifests/0000_51_olm_03_service_account.yaml +++ b/manifests/0000_51_olm_03_service_account.yaml @@ -4,6 +4,8 @@ metadata: namespace: openshift-cluster-olm-operator name: cluster-olm-operator annotations: + include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/feature-set: TechPreviewNoUpgrade + include.release.openshift.io/single-node-developer: "true" capability.openshift.io/name: "OperatorLifecycleManagerV1" + release.openshift.io/feature-set: TechPreviewNoUpgrade diff --git a/manifests/0000_51_olm_04_metrics_service.yaml b/manifests/0000_51_olm_04_metrics_service.yaml index 130a620fd..eb121c7ea 100644 --- a/manifests/0000_51_olm_04_metrics_service.yaml +++ b/manifests/0000_51_olm_04_metrics_service.yaml @@ -5,10 +5,12 @@ metadata: namespace: openshift-cluster-olm-operator name: cluster-olm-operator-metrics annotations: + include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" - service.alpha.openshift.io/serving-cert-secret-name: cluster-olm-operator-serving-cert - release.openshift.io/feature-set: TechPreviewNoUpgrade + include.release.openshift.io/single-node-developer: "true" capability.openshift.io/name: "OperatorLifecycleManagerV1" + release.openshift.io/feature-set: TechPreviewNoUpgrade + service.alpha.openshift.io/serving-cert-secret-name: cluster-olm-operator-serving-cert spec: ports: - name: https diff --git a/manifests/0000_51_olm_05_operator_clusterrolebinding.yaml b/manifests/0000_51_olm_05_operator_clusterrolebinding.yaml index 47a007c7b..1feaa5a04 100644 --- a/manifests/0000_51_olm_05_operator_clusterrolebinding.yaml +++ b/manifests/0000_51_olm_05_operator_clusterrolebinding.yaml @@ -3,9 +3,11 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: cluster-olm-operator-role annotations: + include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/feature-set: TechPreviewNoUpgrade + include.release.openshift.io/single-node-developer: "true" capability.openshift.io/name: "OperatorLifecycleManagerV1" + release.openshift.io/feature-set: TechPreviewNoUpgrade subjects: - kind: ServiceAccount name: cluster-olm-operator diff --git a/manifests/0000_51_olm_06_deployment.yaml b/manifests/0000_51_olm_06_deployment.yaml index b596fd1b9..44b19cf37 100644 --- a/manifests/0000_51_olm_06_deployment.yaml +++ b/manifests/0000_51_olm_06_deployment.yaml @@ -4,9 +4,11 @@ metadata: namespace: openshift-cluster-olm-operator name: cluster-olm-operator annotations: + include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/feature-set: TechPreviewNoUpgrade + include.release.openshift.io/single-node-developer: "true" capability.openshift.io/name: "OperatorLifecycleManagerV1" + release.openshift.io/feature-set: TechPreviewNoUpgrade spec: replicas: 1 selector: diff --git a/manifests/0000_51_olm_07_cluster_operator.yaml b/manifests/0000_51_olm_07_cluster_operator.yaml index a320b5bf8..3e1f88319 100644 --- a/manifests/0000_51_olm_07_cluster_operator.yaml +++ b/manifests/0000_51_olm_07_cluster_operator.yaml @@ -3,9 +3,11 @@ kind: ClusterOperator metadata: name: olm annotations: + include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/feature-set: TechPreviewNoUpgrade + include.release.openshift.io/single-node-developer: "true" capability.openshift.io/name: "OperatorLifecycleManagerV1" + release.openshift.io/feature-set: TechPreviewNoUpgrade spec: {} status: versions: From c431ff58913dfbeee1bba733c3db60428009a592 Mon Sep 17 00:00:00 2001 From: Lalatendu Mohanty Date: Mon, 18 Nov 2024 14:49:58 -0500 Subject: [PATCH 2/2] Removing single-node-developer annotations This PR reverts https://github.com/openshift/cluster-olm-operator/pull/87 and commit. With these changes we do not deploy on top of hypershift, so wont break hypershift tech-preview jobs https://github.com/openshift/cluster-olm-operator/pull/87 was a revert of https://github.com/openshift/cluster-olm-operator/pull/86 Signed-off-by: Lalatendu Mohanty --- manifests/0000_51_olm_00-olm-operator.yml | 2 -- manifests/0000_51_olm_01_operator_namespace.yaml | 2 -- manifests/0000_51_olm_02_operator_clusterrole.yaml | 2 -- manifests/0000_51_olm_03_service_account.yaml | 2 -- manifests/0000_51_olm_04_metrics_service.yaml | 2 -- manifests/0000_51_olm_05_operator_clusterrolebinding.yaml | 2 -- manifests/0000_51_olm_06_deployment.yaml | 2 -- manifests/0000_51_olm_07_cluster_operator.yaml | 2 -- 8 files changed, 16 deletions(-) diff --git a/manifests/0000_51_olm_00-olm-operator.yml b/manifests/0000_51_olm_00-olm-operator.yml index 342b014c4..709a820f7 100644 --- a/manifests/0000_51_olm_00-olm-operator.yml +++ b/manifests/0000_51_olm_00-olm-operator.yml @@ -3,9 +3,7 @@ kind: OLM metadata: name: cluster annotations: - 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" capability.openshift.io/name: "OperatorLifecycleManagerV1" release.openshift.io/feature-set: TechPreviewNoUpgrade release.openshift.io/create-only: "true" diff --git a/manifests/0000_51_olm_01_operator_namespace.yaml b/manifests/0000_51_olm_01_operator_namespace.yaml index 86e21fd86..e1cfa182e 100644 --- a/manifests/0000_51_olm_01_operator_namespace.yaml +++ b/manifests/0000_51_olm_01_operator_namespace.yaml @@ -3,9 +3,7 @@ kind: Namespace metadata: name: openshift-cluster-olm-operator annotations: - 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" capability.openshift.io/name: "OperatorLifecycleManagerV1" release.openshift.io/feature-set: TechPreviewNoUpgrade pod-security.kubernetes.io/enforce: restricted diff --git a/manifests/0000_51_olm_02_operator_clusterrole.yaml b/manifests/0000_51_olm_02_operator_clusterrole.yaml index 88e9c8994..3b4ebe5f1 100644 --- a/manifests/0000_51_olm_02_operator_clusterrole.yaml +++ b/manifests/0000_51_olm_02_operator_clusterrole.yaml @@ -5,9 +5,7 @@ kind: ClusterRole metadata: name: cluster-olm-operator annotations: - 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" capability.openshift.io/name: "OperatorLifecycleManagerV1" release.openshift.io/feature-set: TechPreviewNoUpgrade rules: diff --git a/manifests/0000_51_olm_03_service_account.yaml b/manifests/0000_51_olm_03_service_account.yaml index 47ca1f89f..21e8bc491 100644 --- a/manifests/0000_51_olm_03_service_account.yaml +++ b/manifests/0000_51_olm_03_service_account.yaml @@ -4,8 +4,6 @@ metadata: namespace: openshift-cluster-olm-operator name: cluster-olm-operator annotations: - 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" capability.openshift.io/name: "OperatorLifecycleManagerV1" release.openshift.io/feature-set: TechPreviewNoUpgrade diff --git a/manifests/0000_51_olm_04_metrics_service.yaml b/manifests/0000_51_olm_04_metrics_service.yaml index eb121c7ea..7f437109f 100644 --- a/manifests/0000_51_olm_04_metrics_service.yaml +++ b/manifests/0000_51_olm_04_metrics_service.yaml @@ -5,9 +5,7 @@ metadata: namespace: openshift-cluster-olm-operator name: cluster-olm-operator-metrics annotations: - 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" capability.openshift.io/name: "OperatorLifecycleManagerV1" release.openshift.io/feature-set: TechPreviewNoUpgrade service.alpha.openshift.io/serving-cert-secret-name: cluster-olm-operator-serving-cert diff --git a/manifests/0000_51_olm_05_operator_clusterrolebinding.yaml b/manifests/0000_51_olm_05_operator_clusterrolebinding.yaml index 1feaa5a04..617584aaa 100644 --- a/manifests/0000_51_olm_05_operator_clusterrolebinding.yaml +++ b/manifests/0000_51_olm_05_operator_clusterrolebinding.yaml @@ -3,9 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: cluster-olm-operator-role annotations: - 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" capability.openshift.io/name: "OperatorLifecycleManagerV1" release.openshift.io/feature-set: TechPreviewNoUpgrade subjects: diff --git a/manifests/0000_51_olm_06_deployment.yaml b/manifests/0000_51_olm_06_deployment.yaml index 44b19cf37..1b894fdd1 100644 --- a/manifests/0000_51_olm_06_deployment.yaml +++ b/manifests/0000_51_olm_06_deployment.yaml @@ -4,9 +4,7 @@ metadata: namespace: openshift-cluster-olm-operator name: cluster-olm-operator annotations: - 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" capability.openshift.io/name: "OperatorLifecycleManagerV1" release.openshift.io/feature-set: TechPreviewNoUpgrade spec: diff --git a/manifests/0000_51_olm_07_cluster_operator.yaml b/manifests/0000_51_olm_07_cluster_operator.yaml index 3e1f88319..dd0a00e73 100644 --- a/manifests/0000_51_olm_07_cluster_operator.yaml +++ b/manifests/0000_51_olm_07_cluster_operator.yaml @@ -3,9 +3,7 @@ kind: ClusterOperator metadata: name: olm annotations: - 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" capability.openshift.io/name: "OperatorLifecycleManagerV1" release.openshift.io/feature-set: TechPreviewNoUpgrade spec: {}