From 20ef983c13d8049d99eea41b42384cfd29d5572f Mon Sep 17 00:00:00 2001 From: timflannagan Date: Thu, 8 Sep 2022 09:30:57 -0400 Subject: [PATCH] config,manifests: Update the annotations used in the CVO manifests Signed-off-by: timflannagan --- .../aggregated_clusteroperator.yaml | 7 ++----- config/default/kustomization.yaml | 3 ++- ...luster-platform-operator-manager_00-namespace.yaml | 1 + ...rator-manager_00-rukpak-bundledeployments.crd.yaml | 1 + ...atform-operator-manager_00-rukpak-bundles.crd.yaml | 1 + ...uster-platform-operator-manager_01-core-ca.cm.yaml | 1 + ...form-operator-manager_01-rukpak-core-admin.sa.yaml | 1 + ...-operator-manager_01-rukpak-webhooks-admin.sa.yaml | 1 + ...r-platform-operator-manager_01-serviceaccount.yaml | 1 + ...er-platform-operator-manager_01-webhook-ca.cm.yaml | 1 + ...r-platform-operator-manager_02-metricsservice.yaml | 1 + ...tform-operator-manager_02-rukpak-core.service.yaml | 1 + ...rm-operator-manager_02-rukpak-webhook.service.yaml | 1 + ..._50_cluster-platform-operator-manager_03_rbac.yaml | 11 +++++++++++ ...rm-operator-manager_04-rukpak-core.deployment.yaml | 2 ++ ...perator-manager_04-rukpak-webhooks.deployment.yaml | 2 ++ ...er_05-rukpak.validating-webhook-configuration.yaml | 1 + ...uster-platform-operator-manager_06-deployment.yaml | 2 ++ ...perator-manager_07-aggregated-clusteroperator.yaml | 2 +- 19 files changed, 34 insertions(+), 7 deletions(-) diff --git a/config/aggregatedclusteroperator/aggregated_clusteroperator.yaml b/config/aggregatedclusteroperator/aggregated_clusteroperator.yaml index 4958db38..6d893acf 100644 --- a/config/aggregatedclusteroperator/aggregated_clusteroperator.yaml +++ b/config/aggregatedclusteroperator/aggregated_clusteroperator.yaml @@ -2,11 +2,8 @@ apiVersion: config.openshift.io/v1 kind: ClusterOperator metadata: name: aggregated - annotations: - include.release.openshift.io/ibm-cloud-managed: "true" - include.release.openshift.io/self-managed-high-availability: "true" spec: {} status: versions: - - name: operator - version: "0.0.1-snapshot" + - name: operator + version: "0.0.1-snapshot" diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 37c92fa0..ca2a6ca9 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -14,8 +14,9 @@ namePrefix: platform-operators- # Annotations to add to all resources. commonAnnotations: - release.openshift.io/feature-set: TechPreviewNoUpgrade + release.openshift.io/feature-set: "TechPreviewNoUpgrade" include.release.openshift.io/self-managed-high-availability: "true" + exclude.release.openshift.io/internal-openshift-hosted: "true" images: - name: quay.io/brancz/kube-rbac-proxy diff --git a/manifests/0000_50_cluster-platform-operator-manager_00-namespace.yaml b/manifests/0000_50_cluster-platform-operator-manager_00-namespace.yaml index c54f6b46..67506cd3 100644 --- a/manifests/0000_50_cluster-platform-operator-manager_00-namespace.yaml +++ b/manifests/0000_50_cluster-platform-operator-manager_00-namespace.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/feature-set: TechPreviewNoUpgrade labels: diff --git a/manifests/0000_50_cluster-platform-operator-manager_00-rukpak-bundledeployments.crd.yaml b/manifests/0000_50_cluster-platform-operator-manager_00-rukpak-bundledeployments.crd.yaml index 6eb462d8..86e1f4f3 100644 --- a/manifests/0000_50_cluster-platform-operator-manager_00-rukpak-bundledeployments.crd.yaml +++ b/manifests/0000_50_cluster-platform-operator-manager_00-rukpak-bundledeployments.crd.yaml @@ -3,6 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.9.0 + exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/feature-set: TechPreviewNoUpgrade creationTimestamp: null diff --git a/manifests/0000_50_cluster-platform-operator-manager_00-rukpak-bundles.crd.yaml b/manifests/0000_50_cluster-platform-operator-manager_00-rukpak-bundles.crd.yaml index 1537af68..501cd5a6 100644 --- a/manifests/0000_50_cluster-platform-operator-manager_00-rukpak-bundles.crd.yaml +++ b/manifests/0000_50_cluster-platform-operator-manager_00-rukpak-bundles.crd.yaml @@ -3,6 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.9.0 + exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/feature-set: TechPreviewNoUpgrade creationTimestamp: null diff --git a/manifests/0000_50_cluster-platform-operator-manager_01-core-ca.cm.yaml b/manifests/0000_50_cluster-platform-operator-manager_01-core-ca.cm.yaml index ecd484fd..f9985f29 100644 --- a/manifests/0000_50_cluster-platform-operator-manager_01-core-ca.cm.yaml +++ b/manifests/0000_50_cluster-platform-operator-manager_01-core-ca.cm.yaml @@ -3,6 +3,7 @@ data: {} kind: ConfigMap metadata: annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/feature-set: TechPreviewNoUpgrade service.beta.openshift.io/inject-cabundle: "true" diff --git a/manifests/0000_50_cluster-platform-operator-manager_01-rukpak-core-admin.sa.yaml b/manifests/0000_50_cluster-platform-operator-manager_01-rukpak-core-admin.sa.yaml index a90fee35..b1bd425b 100644 --- a/manifests/0000_50_cluster-platform-operator-manager_01-rukpak-core-admin.sa.yaml +++ b/manifests/0000_50_cluster-platform-operator-manager_01-rukpak-core-admin.sa.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: ServiceAccount metadata: annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/feature-set: TechPreviewNoUpgrade name: platform-operators-rukpak-core-admin diff --git a/manifests/0000_50_cluster-platform-operator-manager_01-rukpak-webhooks-admin.sa.yaml b/manifests/0000_50_cluster-platform-operator-manager_01-rukpak-webhooks-admin.sa.yaml index 0ba2fb50..ac46c5a5 100644 --- a/manifests/0000_50_cluster-platform-operator-manager_01-rukpak-webhooks-admin.sa.yaml +++ b/manifests/0000_50_cluster-platform-operator-manager_01-rukpak-webhooks-admin.sa.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: ServiceAccount metadata: annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/feature-set: TechPreviewNoUpgrade name: platform-operators-rukpak-webhooks-admin diff --git a/manifests/0000_50_cluster-platform-operator-manager_01-serviceaccount.yaml b/manifests/0000_50_cluster-platform-operator-manager_01-serviceaccount.yaml index c943de46..bea6a960 100644 --- a/manifests/0000_50_cluster-platform-operator-manager_01-serviceaccount.yaml +++ b/manifests/0000_50_cluster-platform-operator-manager_01-serviceaccount.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: ServiceAccount metadata: annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/feature-set: TechPreviewNoUpgrade name: platform-operators-controller-manager diff --git a/manifests/0000_50_cluster-platform-operator-manager_01-webhook-ca.cm.yaml b/manifests/0000_50_cluster-platform-operator-manager_01-webhook-ca.cm.yaml index 97ff1d94..44bf6f22 100644 --- a/manifests/0000_50_cluster-platform-operator-manager_01-webhook-ca.cm.yaml +++ b/manifests/0000_50_cluster-platform-operator-manager_01-webhook-ca.cm.yaml @@ -3,6 +3,7 @@ data: {} kind: ConfigMap metadata: annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/feature-set: TechPreviewNoUpgrade service.beta.openshift.io/inject-cabundle: "true" diff --git a/manifests/0000_50_cluster-platform-operator-manager_02-metricsservice.yaml b/manifests/0000_50_cluster-platform-operator-manager_02-metricsservice.yaml index 55908ec1..98cd43f8 100644 --- a/manifests/0000_50_cluster-platform-operator-manager_02-metricsservice.yaml +++ b/manifests/0000_50_cluster-platform-operator-manager_02-metricsservice.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Service metadata: annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/feature-set: TechPreviewNoUpgrade labels: diff --git a/manifests/0000_50_cluster-platform-operator-manager_02-rukpak-core.service.yaml b/manifests/0000_50_cluster-platform-operator-manager_02-rukpak-core.service.yaml index da1754a5..52328aa0 100644 --- a/manifests/0000_50_cluster-platform-operator-manager_02-rukpak-core.service.yaml +++ b/manifests/0000_50_cluster-platform-operator-manager_02-rukpak-core.service.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Service metadata: annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/feature-set: TechPreviewNoUpgrade service.beta.openshift.io/serving-cert-secret-name: platform-operators-rukpak-core-tls diff --git a/manifests/0000_50_cluster-platform-operator-manager_02-rukpak-webhook.service.yaml b/manifests/0000_50_cluster-platform-operator-manager_02-rukpak-webhook.service.yaml index 309fa238..8e1a0659 100644 --- a/manifests/0000_50_cluster-platform-operator-manager_02-rukpak-webhook.service.yaml +++ b/manifests/0000_50_cluster-platform-operator-manager_02-rukpak-webhook.service.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Service metadata: annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/feature-set: TechPreviewNoUpgrade service.beta.openshift.io/serving-cert-secret-name: platform-operators-rukpak-webhook-tls diff --git a/manifests/0000_50_cluster-platform-operator-manager_03_rbac.yaml b/manifests/0000_50_cluster-platform-operator-manager_03_rbac.yaml index 356855f5..8c4a8aca 100644 --- a/manifests/0000_50_cluster-platform-operator-manager_03_rbac.yaml +++ b/manifests/0000_50_cluster-platform-operator-manager_03_rbac.yaml @@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/feature-set: TechPreviewNoUpgrade creationTimestamp: null @@ -85,6 +86,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/feature-set: TechPreviewNoUpgrade name: platform-operators-metrics-reader @@ -98,6 +100,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/feature-set: TechPreviewNoUpgrade name: platform-operators-proxy-role @@ -119,6 +122,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/feature-set: TechPreviewNoUpgrade name: platform-operators-manager-rolebinding @@ -135,6 +139,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/feature-set: TechPreviewNoUpgrade name: platform-operators-proxy-rolebinding @@ -151,6 +156,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/feature-set: TechPreviewNoUpgrade name: platform-operators-leader-election-role @@ -192,6 +198,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/feature-set: TechPreviewNoUpgrade name: platform-operators-leader-election-rolebinding @@ -209,6 +216,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/feature-set: TechPreviewNoUpgrade name: platform-operators-rukpak-bundle-reader @@ -222,6 +230,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/feature-set: TechPreviewNoUpgrade name: platform-operators-rukpak-bundle-uploader @@ -235,6 +244,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/feature-set: TechPreviewNoUpgrade creationTimestamp: null @@ -328,6 +338,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/feature-set: TechPreviewNoUpgrade name: platform-operators-rukpak-core-admin diff --git a/manifests/0000_50_cluster-platform-operator-manager_04-rukpak-core.deployment.yaml b/manifests/0000_50_cluster-platform-operator-manager_04-rukpak-core.deployment.yaml index 7371021f..9c766bf6 100644 --- a/manifests/0000_50_cluster-platform-operator-manager_04-rukpak-core.deployment.yaml +++ b/manifests/0000_50_cluster-platform-operator-manager_04-rukpak-core.deployment.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/feature-set: TechPreviewNoUpgrade labels: @@ -16,6 +17,7 @@ spec: template: metadata: annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" kubectl.kubernetes.io/default-container: manager release.openshift.io/feature-set: TechPreviewNoUpgrade diff --git a/manifests/0000_50_cluster-platform-operator-manager_04-rukpak-webhooks.deployment.yaml b/manifests/0000_50_cluster-platform-operator-manager_04-rukpak-webhooks.deployment.yaml index ee381abc..717aaa35 100644 --- a/manifests/0000_50_cluster-platform-operator-manager_04-rukpak-webhooks.deployment.yaml +++ b/manifests/0000_50_cluster-platform-operator-manager_04-rukpak-webhooks.deployment.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/feature-set: TechPreviewNoUpgrade labels: @@ -19,6 +20,7 @@ spec: template: metadata: annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/feature-set: TechPreviewNoUpgrade labels: diff --git a/manifests/0000_50_cluster-platform-operator-manager_05-rukpak.validating-webhook-configuration.yaml b/manifests/0000_50_cluster-platform-operator-manager_05-rukpak.validating-webhook-configuration.yaml index 76d19458..4e362582 100644 --- a/manifests/0000_50_cluster-platform-operator-manager_05-rukpak.validating-webhook-configuration.yaml +++ b/manifests/0000_50_cluster-platform-operator-manager_05-rukpak.validating-webhook-configuration.yaml @@ -2,6 +2,7 @@ apiVersion: admissionregistration.k8s.io/v1 kind: ValidatingWebhookConfiguration metadata: annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/feature-set: TechPreviewNoUpgrade service.beta.openshift.io/inject-cabundle: "true" diff --git a/manifests/0000_50_cluster-platform-operator-manager_06-deployment.yaml b/manifests/0000_50_cluster-platform-operator-manager_06-deployment.yaml index c97a5641..74260a49 100644 --- a/manifests/0000_50_cluster-platform-operator-manager_06-deployment.yaml +++ b/manifests/0000_50_cluster-platform-operator-manager_06-deployment.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/feature-set: TechPreviewNoUpgrade labels: @@ -16,6 +17,7 @@ spec: template: metadata: annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" kubectl.kubernetes.io/default-container: manager release.openshift.io/feature-set: TechPreviewNoUpgrade diff --git a/manifests/0000_50_cluster-platform-operator-manager_07-aggregated-clusteroperator.yaml b/manifests/0000_50_cluster-platform-operator-manager_07-aggregated-clusteroperator.yaml index c4602792..a65b6495 100644 --- a/manifests/0000_50_cluster-platform-operator-manager_07-aggregated-clusteroperator.yaml +++ b/manifests/0000_50_cluster-platform-operator-manager_07-aggregated-clusteroperator.yaml @@ -2,7 +2,7 @@ apiVersion: config.openshift.io/v1 kind: ClusterOperator metadata: annotations: - include.release.openshift.io/ibm-cloud-managed: "true" + exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/feature-set: TechPreviewNoUpgrade name: platform-operators-aggregated