From b1aa4a631a331141bd3f711c8135c974cc34ec89 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Tue, 8 Feb 2022 20:17:10 -0800 Subject: [PATCH 1/2] manifests: Drop unused single-node-developer profile There's an enhancement proposal for this profile [1], and the Code Ready Containers folks took a run at using it in [2] before backing off in [3]. I don't have any problems with having a specific CRC profile, but if we end up going that way, we'll need a lot more (e.g. we'll need CVO manifests, and I dropped this profile there in [4]). Generated with: $ sed -i '/single-node-developer/d' manifests/*.yaml [1]: https://github.com/openshift/enhancements/blob/2911c46bf7d2f22eb1ab81739b4f9c2603fd0c07/enhancements/single-node/developer-cluster-profile.md [2]: https://github.com/code-ready/snc/pull/338 [3]: https://github.com/code-ready/snc/pull/373#issue-835807822 [4]: https://github.com/openshift/cluster-version-operator/pull/685 --- manifests/01-namespace.yaml | 1 - manifests/010-prometheus-rules.yaml | 1 - manifests/02-sa.yaml | 1 - manifests/03-rbac-imageconfig-role-binding.yaml | 1 - manifests/03-rbac-imageconfig-role.yaml | 1 - manifests/03-rbac-proxies-role-binding.yaml | 1 - manifests/03-rbac-proxies-role.yaml | 1 - manifests/03-rbac.yaml | 5 ----- manifests/04-openshift-rbac.yaml | 1 - manifests/05-kube-system-rbac.yaml | 2 -- manifests/06-metricsservice.yaml | 1 - manifests/06-operator.yaml | 1 - manifests/06-servicemonitor.yaml | 1 - manifests/07-clusteroperator.yaml | 1 - manifests/08-openshift-imagestreams.yaml | 9 --------- manifests/09-servicemonitor-rbac.yaml | 2 -- 16 files changed, 30 deletions(-) diff --git a/manifests/01-namespace.yaml b/manifests/01-namespace.yaml index 946162601..358eeee59 100644 --- a/manifests/01-namespace.yaml +++ b/manifests/01-namespace.yaml @@ -4,7 +4,6 @@ metadata: 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" openshift.io/node-selector: "" workload.openshift.io/allowed: "management" labels: diff --git a/manifests/010-prometheus-rules.yaml b/manifests/010-prometheus-rules.yaml index 11a0cb1af..c6dcb74b3 100644 --- a/manifests/010-prometheus-rules.yaml +++ b/manifests/010-prometheus-rules.yaml @@ -8,7 +8,6 @@ metadata: 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" spec: groups: - name: SamplesOperator diff --git a/manifests/02-sa.yaml b/manifests/02-sa.yaml index 2ed5de467..f9c16c195 100644 --- a/manifests/02-sa.yaml +++ b/manifests/02-sa.yaml @@ -7,4 +7,3 @@ metadata: 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" diff --git a/manifests/03-rbac-imageconfig-role-binding.yaml b/manifests/03-rbac-imageconfig-role-binding.yaml index 00ccb1613..f2b3c613b 100644 --- a/manifests/03-rbac-imageconfig-role-binding.yaml +++ b/manifests/03-rbac-imageconfig-role-binding.yaml @@ -5,7 +5,6 @@ metadata: 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" subjects: - kind: ServiceAccount name: cluster-samples-operator diff --git a/manifests/03-rbac-imageconfig-role.yaml b/manifests/03-rbac-imageconfig-role.yaml index cd1d43488..150bcd187 100644 --- a/manifests/03-rbac-imageconfig-role.yaml +++ b/manifests/03-rbac-imageconfig-role.yaml @@ -5,7 +5,6 @@ metadata: 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" rules: - apiGroups: - config.openshift.io diff --git a/manifests/03-rbac-proxies-role-binding.yaml b/manifests/03-rbac-proxies-role-binding.yaml index a67850971..1b9fcc8ae 100644 --- a/manifests/03-rbac-proxies-role-binding.yaml +++ b/manifests/03-rbac-proxies-role-binding.yaml @@ -5,7 +5,6 @@ metadata: 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" subjects: - kind: ServiceAccount name: cluster-samples-operator diff --git a/manifests/03-rbac-proxies-role.yaml b/manifests/03-rbac-proxies-role.yaml index 365471fac..b18ea62d1 100644 --- a/manifests/03-rbac-proxies-role.yaml +++ b/manifests/03-rbac-proxies-role.yaml @@ -5,7 +5,6 @@ metadata: 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" rules: - apiGroups: - config.openshift.io diff --git a/manifests/03-rbac.yaml b/manifests/03-rbac.yaml index 4e7c303a5..d742f6784 100644 --- a/manifests/03-rbac.yaml +++ b/manifests/03-rbac.yaml @@ -6,7 +6,6 @@ metadata: 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" rules: - apiGroups: - "" @@ -39,7 +38,6 @@ metadata: 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" rules: - apiGroups: - samples.operator.openshift.io @@ -67,7 +65,6 @@ metadata: 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" rules: - apiGroups: - samples.operator.openshift.io @@ -89,7 +86,6 @@ metadata: 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" subjects: - kind: ServiceAccount name: cluster-samples-operator @@ -107,7 +103,6 @@ metadata: 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" subjects: - kind: ServiceAccount name: cluster-samples-operator diff --git a/manifests/04-openshift-rbac.yaml b/manifests/04-openshift-rbac.yaml index 27538c469..32cdab5bc 100644 --- a/manifests/04-openshift-rbac.yaml +++ b/manifests/04-openshift-rbac.yaml @@ -6,7 +6,6 @@ metadata: 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" subjects: - kind: ServiceAccount name: cluster-samples-operator diff --git a/manifests/05-kube-system-rbac.yaml b/manifests/05-kube-system-rbac.yaml index 37e68264a..05d984453 100644 --- a/manifests/05-kube-system-rbac.yaml +++ b/manifests/05-kube-system-rbac.yaml @@ -6,7 +6,6 @@ metadata: 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" rules: - apiGroups: - "" @@ -27,7 +26,6 @@ metadata: 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" subjects: - kind: ServiceAccount name: cluster-samples-operator diff --git a/manifests/06-metricsservice.yaml b/manifests/06-metricsservice.yaml index e7015ce9c..6ff172fe8 100644 --- a/manifests/06-metricsservice.yaml +++ b/manifests/06-metricsservice.yaml @@ -5,7 +5,6 @@ metadata: 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" service.beta.openshift.io/serving-cert-secret-name: samples-operator-tls labels: name: cluster-samples-operator diff --git a/manifests/06-operator.yaml b/manifests/06-operator.yaml index 4666c1e05..f07d777db 100644 --- a/manifests/06-operator.yaml +++ b/manifests/06-operator.yaml @@ -5,7 +5,6 @@ metadata: namespace: openshift-cluster-samples-operator annotations: include.release.openshift.io/self-managed-high-availability: "true" - include.release.openshift.io/single-node-developer: "true" spec: replicas: 1 selector: diff --git a/manifests/06-servicemonitor.yaml b/manifests/06-servicemonitor.yaml index 15c4fb659..3cf257ffa 100644 --- a/manifests/06-servicemonitor.yaml +++ b/manifests/06-servicemonitor.yaml @@ -7,7 +7,6 @@ metadata: 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" spec: endpoints: - targetPort: 60000 diff --git a/manifests/07-clusteroperator.yaml b/manifests/07-clusteroperator.yaml index 1b597d770..4d2d0e944 100644 --- a/manifests/07-clusteroperator.yaml +++ b/manifests/07-clusteroperator.yaml @@ -5,7 +5,6 @@ metadata: 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" spec: {} status: relatedObjects: diff --git a/manifests/08-openshift-imagestreams.yaml b/manifests/08-openshift-imagestreams.yaml index 16e27c284..0ef6f2f6e 100644 --- a/manifests/08-openshift-imagestreams.yaml +++ b/manifests/08-openshift-imagestreams.yaml @@ -9,7 +9,6 @@ metadata: 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" spec: tags: - name: latest @@ -27,7 +26,6 @@ metadata: 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" spec: tags: - name: latest @@ -45,7 +43,6 @@ metadata: 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" spec: tags: - name: latest @@ -63,7 +60,6 @@ metadata: 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" spec: tags: - name: latest @@ -81,7 +77,6 @@ metadata: 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" spec: tags: - name: latest @@ -99,7 +94,6 @@ metadata: 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" spec: tags: - name: latest @@ -117,7 +111,6 @@ metadata: 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" spec: tags: - name: latest @@ -135,7 +128,6 @@ metadata: 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" spec: tags: - name: v4.4 @@ -156,7 +148,6 @@ metadata: release.openshift.io/delete: "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" spec: lookupPolicy: local: true diff --git a/manifests/09-servicemonitor-rbac.yaml b/manifests/09-servicemonitor-rbac.yaml index 2a6515f25..f29ecdd9d 100644 --- a/manifests/09-servicemonitor-rbac.yaml +++ b/manifests/09-servicemonitor-rbac.yaml @@ -7,7 +7,6 @@ metadata: 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" rules: - apiGroups: - "" @@ -28,7 +27,6 @@ metadata: 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" roleRef: apiGroup: rbac.authorization.k8s.io kind: Role From 024493c9fd9c3ef2881ea6a6b73692b84b5e1d5c Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Tue, 8 Feb 2022 20:25:02 -0800 Subject: [PATCH 2/2] manifests: Add capability.openshift.io/name As described in [1]. The 'openshift-samples' value matches our ClusterOperator name, and was registered with the API in [2]. I've annotated these types: $ for X in manifests/*.yaml; do yaml2json < "${X}" | jq -r '.[] | select(.metadata.annotations["capability.openshift.io/name"] == "openshift-samples").kind'; done | sort | uniq -c 1 ClusterOperator 4 ClusterRole 3 ClusterRoleBinding 2 Deployment 1 Namespace 1 PrometheusRule 3 Role 4 RoleBinding 1 Service 1 ServiceAccount 1 ServiceMonitor which seemed like the moving parts that folks who say "no samples, thanks" wouldn't want. I've left the annotation off the ImageStreams: $ for X in manifests/*.yaml; do yaml2json < "${X}" | jq -r '.[] | select(.metadata.annotations["capability.openshift.io/name"] != "openshift-samples").kind'; done | sort | uniq -c 9 ImageStream since those ImageStreams are consumed by tests, the console downloads deployment, etc. I'm also adjusting the JSON Patch file to remove [3] the self-managed-high-availability annotation and add [4] the ibm-cloud-managed annotation, instead of clobbering the whole annotation set, to preserve additional annotations like the capability name. '~1` is the JSON Pointer escape for '/' [5]. [1]: https://github.com/openshift/enhancements/blame/27846285be01a2aebf8d3a04ebb8ed7f877e4959/enhancements/installer/component-selection.md#L106 [2]: https://github.com/openshift/api/blob/7e3ffb09accd36fb0536fa0e69bed5d70cccd6e5/config/v1/types_cluster_version.go#L232-L237 [3]: https://datatracker.ietf.org/doc/html/rfc6902#section-4.2 [4]: https://datatracker.ietf.org/doc/html/rfc6902#section-4.1 [5]: https://datatracker.ietf.org/doc/html/rfc6901#section-3 --- manifests/01-namespace.yaml | 1 + manifests/010-prometheus-rules.yaml | 3 ++- manifests/02-sa.yaml | 1 + manifests/03-rbac-imageconfig-role-binding.yaml | 1 + manifests/03-rbac-imageconfig-role.yaml | 1 + manifests/03-rbac-proxies-role-binding.yaml | 1 + manifests/03-rbac-proxies-role.yaml | 1 + manifests/03-rbac.yaml | 5 +++++ manifests/04-openshift-rbac.yaml | 1 + manifests/05-kube-system-rbac.yaml | 2 ++ manifests/06-metricsservice.yaml | 1 + manifests/06-operator-ibm-cloud-managed.yaml | 1 + manifests/06-operator.yaml | 1 + manifests/06-servicemonitor.yaml | 1 + manifests/07-clusteroperator.yaml | 1 + manifests/09-servicemonitor-rbac.yaml | 2 ++ profile-patches/ibm-cloud-managed/06-operator.yaml-patch | 9 +++++---- 17 files changed, 28 insertions(+), 5 deletions(-) diff --git a/manifests/01-namespace.yaml b/manifests/01-namespace.yaml index 358eeee59..a0f4056e7 100644 --- a/manifests/01-namespace.yaml +++ b/manifests/01-namespace.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: + capability.openshift.io/name: openshift-samples include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" openshift.io/node-selector: "" diff --git a/manifests/010-prometheus-rules.yaml b/manifests/010-prometheus-rules.yaml index c6dcb74b3..85a763444 100644 --- a/manifests/010-prometheus-rules.yaml +++ b/manifests/010-prometheus-rules.yaml @@ -6,6 +6,7 @@ metadata: name: samples-operator-alerts namespace: openshift-cluster-samples-operator annotations: + capability.openshift.io/name: openshift-samples include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" spec: @@ -94,4 +95,4 @@ spec: provided in the 'imagestreamtag-to-image' config map in the 'openshift-cluster-samples-operator' namespace to assist the mirroring process. Or, the use of allowed registries or blocked registries with global imagestream configuration will not allow - samples operator to create imagestreams using the default image registry 'registry.redhat.io'. \ No newline at end of file + samples operator to create imagestreams using the default image registry 'registry.redhat.io'. diff --git a/manifests/02-sa.yaml b/manifests/02-sa.yaml index f9c16c195..b21011ef3 100644 --- a/manifests/02-sa.yaml +++ b/manifests/02-sa.yaml @@ -5,5 +5,6 @@ metadata: name: cluster-samples-operator namespace: openshift-cluster-samples-operator annotations: + capability.openshift.io/name: openshift-samples include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" diff --git a/manifests/03-rbac-imageconfig-role-binding.yaml b/manifests/03-rbac-imageconfig-role-binding.yaml index f2b3c613b..3629c9868 100644 --- a/manifests/03-rbac-imageconfig-role-binding.yaml +++ b/manifests/03-rbac-imageconfig-role-binding.yaml @@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: cluster-samples-operator-imageconfig-reader annotations: + capability.openshift.io/name: openshift-samples include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" subjects: diff --git a/manifests/03-rbac-imageconfig-role.yaml b/manifests/03-rbac-imageconfig-role.yaml index 150bcd187..1ba527f78 100644 --- a/manifests/03-rbac-imageconfig-role.yaml +++ b/manifests/03-rbac-imageconfig-role.yaml @@ -3,6 +3,7 @@ kind: ClusterRole metadata: name: cluster-samples-operator-imageconfig-reader annotations: + capability.openshift.io/name: openshift-samples include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" rules: diff --git a/manifests/03-rbac-proxies-role-binding.yaml b/manifests/03-rbac-proxies-role-binding.yaml index 1b9fcc8ae..b85acf8a8 100644 --- a/manifests/03-rbac-proxies-role-binding.yaml +++ b/manifests/03-rbac-proxies-role-binding.yaml @@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: cluster-samples-operator-proxy-reader annotations: + capability.openshift.io/name: openshift-samples include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" subjects: diff --git a/manifests/03-rbac-proxies-role.yaml b/manifests/03-rbac-proxies-role.yaml index b18ea62d1..c2c58731f 100644 --- a/manifests/03-rbac-proxies-role.yaml +++ b/manifests/03-rbac-proxies-role.yaml @@ -3,6 +3,7 @@ kind: ClusterRole metadata: name: cluster-samples-operator-proxy-reader annotations: + capability.openshift.io/name: openshift-samples include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" rules: diff --git a/manifests/03-rbac.yaml b/manifests/03-rbac.yaml index d742f6784..b1ec1112d 100644 --- a/manifests/03-rbac.yaml +++ b/manifests/03-rbac.yaml @@ -4,6 +4,7 @@ metadata: name: cluster-samples-operator namespace: openshift-cluster-samples-operator annotations: + capability.openshift.io/name: openshift-samples include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" rules: @@ -36,6 +37,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: cluster-samples-operator annotations: + capability.openshift.io/name: openshift-samples include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" rules: @@ -63,6 +65,7 @@ metadata: rbac.authorization.k8s.io/aggregate-to-cluster-reader: "true" name: system:openshift:cluster-samples-operator:cluster-reader annotations: + capability.openshift.io/name: openshift-samples include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" rules: @@ -84,6 +87,7 @@ metadata: name: cluster-samples-operator namespace: openshift-cluster-samples-operator annotations: + capability.openshift.io/name: openshift-samples include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" subjects: @@ -101,6 +105,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: cluster-samples-operator annotations: + capability.openshift.io/name: openshift-samples include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" subjects: diff --git a/manifests/04-openshift-rbac.yaml b/manifests/04-openshift-rbac.yaml index 32cdab5bc..3d80bb19f 100644 --- a/manifests/04-openshift-rbac.yaml +++ b/manifests/04-openshift-rbac.yaml @@ -4,6 +4,7 @@ metadata: name: cluster-samples-operator-openshift-edit namespace: openshift annotations: + capability.openshift.io/name: openshift-samples include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" subjects: diff --git a/manifests/05-kube-system-rbac.yaml b/manifests/05-kube-system-rbac.yaml index 05d984453..fc0cd8205 100644 --- a/manifests/05-kube-system-rbac.yaml +++ b/manifests/05-kube-system-rbac.yaml @@ -4,6 +4,7 @@ metadata: name: coreos-pull-secret-reader namespace: openshift-config annotations: + capability.openshift.io/name: openshift-samples include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" rules: @@ -24,6 +25,7 @@ metadata: name: cluster-samples-operator-openshift-config-secret-reader namespace: openshift-config annotations: + capability.openshift.io/name: openshift-samples include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" subjects: diff --git a/manifests/06-metricsservice.yaml b/manifests/06-metricsservice.yaml index 6ff172fe8..f44223f08 100644 --- a/manifests/06-metricsservice.yaml +++ b/manifests/06-metricsservice.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: Service metadata: annotations: + capability.openshift.io/name: openshift-samples include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" service.beta.openshift.io/serving-cert-secret-name: samples-operator-tls diff --git a/manifests/06-operator-ibm-cloud-managed.yaml b/manifests/06-operator-ibm-cloud-managed.yaml index 8195d8a13..3f7bd773f 100644 --- a/manifests/06-operator-ibm-cloud-managed.yaml +++ b/manifests/06-operator-ibm-cloud-managed.yaml @@ -3,6 +3,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: + capability.openshift.io/name: openshift-samples include.release.openshift.io/ibm-cloud-managed: "true" name: cluster-samples-operator namespace: openshift-cluster-samples-operator diff --git a/manifests/06-operator.yaml b/manifests/06-operator.yaml index f07d777db..40f1f3dc4 100644 --- a/manifests/06-operator.yaml +++ b/manifests/06-operator.yaml @@ -4,6 +4,7 @@ metadata: name: cluster-samples-operator namespace: openshift-cluster-samples-operator annotations: + capability.openshift.io/name: openshift-samples include.release.openshift.io/self-managed-high-availability: "true" spec: replicas: 1 diff --git a/manifests/06-servicemonitor.yaml b/manifests/06-servicemonitor.yaml index 3cf257ffa..7abe50917 100644 --- a/manifests/06-servicemonitor.yaml +++ b/manifests/06-servicemonitor.yaml @@ -5,6 +5,7 @@ metadata: name: cluster-samples-operator namespace: openshift-cluster-samples-operator annotations: + capability.openshift.io/name: openshift-samples include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" spec: diff --git a/manifests/07-clusteroperator.yaml b/manifests/07-clusteroperator.yaml index 4d2d0e944..fcba03f2e 100644 --- a/manifests/07-clusteroperator.yaml +++ b/manifests/07-clusteroperator.yaml @@ -3,6 +3,7 @@ kind: ClusterOperator metadata: name: openshift-samples annotations: + capability.openshift.io/name: openshift-samples include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" spec: {} diff --git a/manifests/09-servicemonitor-rbac.yaml b/manifests/09-servicemonitor-rbac.yaml index f29ecdd9d..046902c57 100644 --- a/manifests/09-servicemonitor-rbac.yaml +++ b/manifests/09-servicemonitor-rbac.yaml @@ -5,6 +5,7 @@ metadata: name: prometheus-k8s namespace: openshift-cluster-samples-operator annotations: + capability.openshift.io/name: openshift-samples include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" rules: @@ -25,6 +26,7 @@ metadata: name: prometheus-k8s namespace: openshift-cluster-samples-operator annotations: + capability.openshift.io/name: openshift-samples include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" roleRef: diff --git a/profile-patches/ibm-cloud-managed/06-operator.yaml-patch b/profile-patches/ibm-cloud-managed/06-operator.yaml-patch index bc380cb1f..f5724d484 100644 --- a/profile-patches/ibm-cloud-managed/06-operator.yaml-patch +++ b/profile-patches/ibm-cloud-managed/06-operator.yaml-patch @@ -1,6 +1,7 @@ -- op: replace - path: /metadata/annotations - value: - include.release.openshift.io/ibm-cloud-managed: "true" +- op: remove + path: /metadata/annotations/include.release.openshift.io~1self-managed-high-availability +- op: add + path: /metadata/annotations/include.release.openshift.io~1ibm-cloud-managed + value: "true" - op: remove path: /spec/template/spec/nodeSelector