diff --git a/manifests/0000_90_openshift-controller-manager-operator_00_prometheusrole.yaml b/manifests/0000_90_openshift-controller-manager-operator_00_prometheusrole.yaml index f56f02181..777d38325 100644 --- a/manifests/0000_90_openshift-controller-manager-operator_00_prometheusrole.yaml +++ b/manifests/0000_90_openshift-controller-manager-operator_00_prometheusrole.yaml @@ -4,6 +4,8 @@ metadata: # TODO this should be a clusterrole name: prometheus-k8s namespace: openshift-controller-manager-operator + annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" rules: - apiGroups: - "" diff --git a/manifests/0000_90_openshift-controller-manager-operator_01_prometheusrolebinding.yaml b/manifests/0000_90_openshift-controller-manager-operator_01_prometheusrolebinding.yaml index c15f07b70..f9b059368 100644 --- a/manifests/0000_90_openshift-controller-manager-operator_01_prometheusrolebinding.yaml +++ b/manifests/0000_90_openshift-controller-manager-operator_01_prometheusrolebinding.yaml @@ -3,6 +3,8 @@ kind: RoleBinding metadata: name: prometheus-k8s namespace: openshift-controller-manager-operator + annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" roleRef: apiGroup: rbac.authorization.k8s.io kind: Role diff --git a/manifests/0000_90_openshift-controller-manager-operator_03_operand-servicemonitor.yaml b/manifests/0000_90_openshift-controller-manager-operator_03_operand-servicemonitor.yaml index 26c0a4bcd..9f9d59ecb 100644 --- a/manifests/0000_90_openshift-controller-manager-operator_03_operand-servicemonitor.yaml +++ b/manifests/0000_90_openshift-controller-manager-operator_03_operand-servicemonitor.yaml @@ -3,6 +3,8 @@ kind: Role metadata: name: prometheus-k8s namespace: openshift-controller-manager + annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" rules: - apiGroups: - "" @@ -20,6 +22,8 @@ kind: RoleBinding metadata: name: prometheus-k8s namespace: openshift-controller-manager + annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" roleRef: apiGroup: rbac.authorization.k8s.io kind: Role diff --git a/manifests/00_namespace.yaml b/manifests/00_namespace.yaml index 6ffdb13d7..63d2af88f 100644 --- a/manifests/00_namespace.yaml +++ b/manifests/00_namespace.yaml @@ -3,6 +3,7 @@ kind: Namespace metadata: annotations: openshift.io/node-selector: "" + exclude.release.openshift.io/internal-openshift-hosted: "true" labels: openshift.io/run-level: "0" openshift.io/cluster-monitoring: "true" diff --git a/manifests/01_operand-namespace.yaml b/manifests/01_operand-namespace.yaml index 70342e9a0..98c7ad03d 100644 --- a/manifests/01_operand-namespace.yaml +++ b/manifests/01_operand-namespace.yaml @@ -4,6 +4,7 @@ metadata: name: openshift-controller-manager annotations: openshift.io/node-selector: "" + exclude.release.openshift.io/internal-openshift-hosted: "true" labels: openshift.io/run-level: "1" openshift.io/cluster-monitoring: "true" diff --git a/manifests/03_config.cr.yaml b/manifests/03_config.cr.yaml index e4a66de0b..4c7890b8b 100644 --- a/manifests/03_config.cr.yaml +++ b/manifests/03_config.cr.yaml @@ -4,5 +4,6 @@ metadata: name: cluster annotations: release.openshift.io/create-only: "true" + exclude.release.openshift.io/internal-openshift-hosted: "true" spec: managementState: Managed diff --git a/manifests/03_configmap.yaml b/manifests/03_configmap.yaml index ca64ee6bb..a38bde110 100644 --- a/manifests/03_configmap.yaml +++ b/manifests/03_configmap.yaml @@ -3,6 +3,8 @@ kind: ConfigMap metadata: namespace: openshift-controller-manager-operator name: openshift-controller-manager-operator-config + annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" data: config.yaml: | apiVersion: operator.openshift.io/v1 diff --git a/manifests/05_builder-deployer-config.yaml b/manifests/05_builder-deployer-config.yaml index f63571e71..b628234d1 100644 --- a/manifests/05_builder-deployer-config.yaml +++ b/manifests/05_builder-deployer-config.yaml @@ -3,6 +3,8 @@ kind: ConfigMap metadata: namespace: openshift-controller-manager-operator name: openshift-controller-manager-images + annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" data: builderImage: quay.io/openshift/origin-docker-builder:v4.0 deployerImage: quay.io/openshift/origin-deployer:v4.0 diff --git a/manifests/06_roles.yaml b/manifests/06_roles.yaml index fa39b078f..af8d39de7 100644 --- a/manifests/06_roles.yaml +++ b/manifests/06_roles.yaml @@ -2,6 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: system:openshift:operator:openshift-controller-manager-operator + annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" roleRef: kind: ClusterRole name: cluster-admin diff --git a/manifests/07_serviceaccount.yaml b/manifests/07_serviceaccount.yaml index fb7e7a3b2..b435d1ed8 100644 --- a/manifests/07_serviceaccount.yaml +++ b/manifests/07_serviceaccount.yaml @@ -5,3 +5,5 @@ metadata: name: openshift-controller-manager-operator labels: app: openshift-controller-manager-operator + annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true"