From c2aa6e223355782daa2dd42eaea908d2e2c53ab3 Mon Sep 17 00:00:00 2001 From: Cesar Wong Date: Tue, 12 Nov 2019 16:47:20 +0100 Subject: [PATCH] Add manifest annotations for hosted deployment exclusions --- ...00_30_machine-api-operator_00_credentials-request.yaml | 8 ++++++++ install/0000_30_machine-api-operator_10_service.yaml | 1 + install/0000_30_machine-api-operator_11_deployment.yaml | 2 ++ .../0000_30_machine-api-operator_12_clusteroperator.yaml | 2 ++ .../0000_90_machine-api-operator_03_servicemonitor.yaml | 2 ++ install/0000_90_machine-api-operator_04_alertrules.yaml | 2 ++ 6 files changed, 17 insertions(+) diff --git a/install/0000_30_machine-api-operator_00_credentials-request.yaml b/install/0000_30_machine-api-operator_00_credentials-request.yaml index 139efcf25..98efe9daa 100644 --- a/install/0000_30_machine-api-operator_00_credentials-request.yaml +++ b/install/0000_30_machine-api-operator_00_credentials-request.yaml @@ -5,6 +5,8 @@ metadata: controller-tools.k8s.io: "1.0" name: openshift-machine-api-aws namespace: openshift-cloud-credential-operator + annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" spec: secretRef: name: aws-cloud-credentials @@ -38,6 +40,8 @@ metadata: controller-tools.k8s.io: "1.0" name: openshift-machine-api-azure namespace: openshift-cloud-credential-operator + annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" spec: secretRef: name: azure-cloud-credentials @@ -55,6 +59,8 @@ metadata: controller-tools.k8s.io: "1.0" name: openshift-machine-api-openstack namespace: openshift-cloud-credential-operator + annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" spec: secretRef: name: openstack-cloud-credentials @@ -70,6 +76,8 @@ metadata: controller-tools.k8s.io: "1.0" name: openshift-machine-api-gcp namespace: openshift-cloud-credential-operator + annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" spec: secretRef: name: gcp-cloud-credentials diff --git a/install/0000_30_machine-api-operator_10_service.yaml b/install/0000_30_machine-api-operator_10_service.yaml index 4e29ceb88..41a7b63c7 100644 --- a/install/0000_30_machine-api-operator_10_service.yaml +++ b/install/0000_30_machine-api-operator_10_service.yaml @@ -6,6 +6,7 @@ metadata: namespace: openshift-machine-api annotations: service.alpha.openshift.io/serving-cert-secret-name: machine-api-operator-tls + exclude.release.openshift.io/internal-openshift-hosted: "true" labels: k8s-app: machine-api-operator spec: diff --git a/install/0000_30_machine-api-operator_11_deployment.yaml b/install/0000_30_machine-api-operator_11_deployment.yaml index 7875781b4..e1b360392 100644 --- a/install/0000_30_machine-api-operator_11_deployment.yaml +++ b/install/0000_30_machine-api-operator_11_deployment.yaml @@ -5,6 +5,8 @@ metadata: namespace: openshift-machine-api labels: k8s-app: machine-api-operator + annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" spec: replicas: 1 selector: diff --git a/install/0000_30_machine-api-operator_12_clusteroperator.yaml b/install/0000_30_machine-api-operator_12_clusteroperator.yaml index 61f184bd5..b7602f42f 100644 --- a/install/0000_30_machine-api-operator_12_clusteroperator.yaml +++ b/install/0000_30_machine-api-operator_12_clusteroperator.yaml @@ -2,6 +2,8 @@ apiVersion: config.openshift.io/v1 kind: ClusterOperator metadata: name: machine-api + annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" spec: {} status: versions: diff --git a/install/0000_90_machine-api-operator_03_servicemonitor.yaml b/install/0000_90_machine-api-operator_03_servicemonitor.yaml index 8377309ce..43c795c3d 100644 --- a/install/0000_90_machine-api-operator_03_servicemonitor.yaml +++ b/install/0000_90_machine-api-operator_03_servicemonitor.yaml @@ -5,6 +5,8 @@ metadata: k8s-app: machine-api-operator name: machine-api-operator namespace: openshift-machine-api + annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" spec: endpoints: - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token diff --git a/install/0000_90_machine-api-operator_04_alertrules.yaml b/install/0000_90_machine-api-operator_04_alertrules.yaml index 5b291c270..7b3d4efbe 100644 --- a/install/0000_90_machine-api-operator_04_alertrules.yaml +++ b/install/0000_90_machine-api-operator_04_alertrules.yaml @@ -6,6 +6,8 @@ metadata: role: alert-rules name: machine-api-operator-prometheus-rules namespace: openshift-machine-api + annotations: + exclude.release.openshift.io/internal-openshift-hosted: "true" spec: groups: - name: machine-without-valid-node-ref