From 1f3f8c8ba53063c4e3c8f2f8a2ebddb45e8939f5 Mon Sep 17 00:00:00 2001 From: Cesar Wong Date: Tue, 12 Nov 2019 16:33:41 +0100 Subject: [PATCH] Add manifest annotations for hosted deployment exclusions --- manifests/0000_25_kube-scheduler-operator_02_service.yaml | 1 + manifests/0000_25_kube-scheduler-operator_06_deployment.yaml | 2 ++ .../0000_25_kube-scheduler-operator_07_clusteroperator.yaml | 2 ++ .../0000_90_kube-scheduler-operator_03_servicemonitor.yaml | 4 ++++ ...0_kube-scheduler-operator_04_servicemonitor-scheduler.yaml | 2 ++ 5 files changed, 11 insertions(+) diff --git a/manifests/0000_25_kube-scheduler-operator_02_service.yaml b/manifests/0000_25_kube-scheduler-operator_02_service.yaml index 99c287f82..e4c42af3d 100644 --- a/manifests/0000_25_kube-scheduler-operator_02_service.yaml +++ b/manifests/0000_25_kube-scheduler-operator_02_service.yaml @@ -3,6 +3,7 @@ kind: Service metadata: annotations: service.alpha.openshift.io/serving-cert-secret-name: kube-scheduler-operator-serving-cert + exclude.release.openshift.io/internal-openshift-hosted: "true" labels: app: openshift-kube-scheduler-operator name: metrics diff --git a/manifests/0000_25_kube-scheduler-operator_06_deployment.yaml b/manifests/0000_25_kube-scheduler-operator_06_deployment.yaml index 5fff4b47c..8a60ee801 100644 --- a/manifests/0000_25_kube-scheduler-operator_06_deployment.yaml +++ b/manifests/0000_25_kube-scheduler-operator_06_deployment.yaml @@ -5,6 +5,8 @@ metadata: name: openshift-kube-scheduler-operator labels: app: openshift-kube-scheduler-operator + annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" spec: replicas: 1 selector: diff --git a/manifests/0000_25_kube-scheduler-operator_07_clusteroperator.yaml b/manifests/0000_25_kube-scheduler-operator_07_clusteroperator.yaml index 6249508aa..9dca29de4 100644 --- a/manifests/0000_25_kube-scheduler-operator_07_clusteroperator.yaml +++ b/manifests/0000_25_kube-scheduler-operator_07_clusteroperator.yaml @@ -2,6 +2,8 @@ apiVersion: config.openshift.io/v1 kind: ClusterOperator metadata: name: kube-scheduler + annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" spec: {} status: versions: diff --git a/manifests/0000_90_kube-scheduler-operator_03_servicemonitor.yaml b/manifests/0000_90_kube-scheduler-operator_03_servicemonitor.yaml index 67a7ebc57..ed053685c 100644 --- a/manifests/0000_90_kube-scheduler-operator_03_servicemonitor.yaml +++ b/manifests/0000_90_kube-scheduler-operator_03_servicemonitor.yaml @@ -3,6 +3,8 @@ kind: ServiceMonitor metadata: name: kube-scheduler-operator namespace: openshift-kube-scheduler-operator + annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" spec: endpoints: - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token @@ -30,6 +32,8 @@ kind: PrometheusRule metadata: name: kube-scheduler-operator namespace: openshift-kube-scheduler-operator + annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" spec: groups: - name: cluster-version diff --git a/manifests/0000_90_kube-scheduler-operator_04_servicemonitor-scheduler.yaml b/manifests/0000_90_kube-scheduler-operator_04_servicemonitor-scheduler.yaml index 3a1ff3564..b0597d025 100644 --- a/manifests/0000_90_kube-scheduler-operator_04_servicemonitor-scheduler.yaml +++ b/manifests/0000_90_kube-scheduler-operator_04_servicemonitor-scheduler.yaml @@ -5,6 +5,8 @@ metadata: k8s-app: kube-scheduler name: kube-scheduler namespace: openshift-kube-scheduler + annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" spec: endpoints: - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token