From 40d9d439d9ad8f73a75321ef6cda5f6b4afb4bb5 Mon Sep 17 00:00:00 2001 From: ravisantoshgudimetla Date: Thu, 25 Apr 2019 21:20:51 -0400 Subject: [PATCH] Add node-selector annotation to namespace --- deploy/chart/templates/0000_50_olm_00-namespace.yaml | 4 ++++ deploy/ocp/manifests/0.7.1/0000_30_00-namespace.yaml | 2 ++ deploy/ocp/manifests/0.7.2/0000_30_00-namespace.yaml | 2 ++ deploy/ocp/manifests/0.7.4/0000_30_00-namespace.yaml | 2 ++ deploy/ocp/manifests/0.8.1/0000_50_olm_00-namespace.yaml | 4 ++++ deploy/ocp/manifests/0.9.0/0000_50_olm_00-namespace.yaml | 6 ++++-- deploy/okd/manifests/0.7.2/0000_30_00-namespace.yaml | 2 ++ deploy/okd/manifests/0.8.0/0000_30_00-namespace.yaml | 4 ++++ deploy/okd/manifests/0.9.0/0000_50_olm_00-namespace.yaml | 4 ++++ manifests/0000_50_olm_00-namespace.yaml | 6 ++++-- 10 files changed, 32 insertions(+), 4 deletions(-) diff --git a/deploy/chart/templates/0000_50_olm_00-namespace.yaml b/deploy/chart/templates/0000_50_olm_00-namespace.yaml index b175adfc32..ffc1485849 100644 --- a/deploy/chart/templates/0000_50_olm_00-namespace.yaml +++ b/deploy/chart/templates/0000_50_olm_00-namespace.yaml @@ -3,6 +3,8 @@ kind: Namespace metadata: name: {{ .Values.namespace }} {{ if and .Values.installType (eq .Values.installType "ocp") }} + annotations: + openshift.io/node-selector: "" labels: openshift.io/run-level: "1" openshift.io/cluster-monitoring: "true" @@ -13,6 +15,8 @@ kind: Namespace metadata: name: {{ .Values.operator_namespace }} {{ if and .Values.installType (eq .Values.installType "ocp") }} + annotations: + openshift.io/node-selector: "" labels: openshift.io/run-level: "1" {{ end }} diff --git a/deploy/ocp/manifests/0.7.1/0000_30_00-namespace.yaml b/deploy/ocp/manifests/0.7.1/0000_30_00-namespace.yaml index eb6c559aa9..ecb4795218 100644 --- a/deploy/ocp/manifests/0.7.1/0000_30_00-namespace.yaml +++ b/deploy/ocp/manifests/0.7.1/0000_30_00-namespace.yaml @@ -6,3 +6,5 @@ metadata: name: openshift-operator-lifecycle-manager labels: openshift.io/run-level: "1" + annotations: + openshift.io/node-selector: "" diff --git a/deploy/ocp/manifests/0.7.2/0000_30_00-namespace.yaml b/deploy/ocp/manifests/0.7.2/0000_30_00-namespace.yaml index eb6c559aa9..ecb4795218 100644 --- a/deploy/ocp/manifests/0.7.2/0000_30_00-namespace.yaml +++ b/deploy/ocp/manifests/0.7.2/0000_30_00-namespace.yaml @@ -6,3 +6,5 @@ metadata: name: openshift-operator-lifecycle-manager labels: openshift.io/run-level: "1" + annotations: + openshift.io/node-selector: "" diff --git a/deploy/ocp/manifests/0.7.4/0000_30_00-namespace.yaml b/deploy/ocp/manifests/0.7.4/0000_30_00-namespace.yaml index eb6c559aa9..ecb4795218 100644 --- a/deploy/ocp/manifests/0.7.4/0000_30_00-namespace.yaml +++ b/deploy/ocp/manifests/0.7.4/0000_30_00-namespace.yaml @@ -6,3 +6,5 @@ metadata: name: openshift-operator-lifecycle-manager labels: openshift.io/run-level: "1" + annotations: + openshift.io/node-selector: "" diff --git a/deploy/ocp/manifests/0.8.1/0000_50_olm_00-namespace.yaml b/deploy/ocp/manifests/0.8.1/0000_50_olm_00-namespace.yaml index dee7dad37d..99b60fb47a 100644 --- a/deploy/ocp/manifests/0.8.1/0000_50_olm_00-namespace.yaml +++ b/deploy/ocp/manifests/0.8.1/0000_50_olm_00-namespace.yaml @@ -6,6 +6,8 @@ metadata: name: openshift-operator-lifecycle-manager labels: openshift.io/run-level: "1" + annotations: + openshift.io/node-selector: "" --- apiVersion: v1 kind: Namespace @@ -13,3 +15,5 @@ metadata: name: openshift-operators labels: openshift.io/run-level: "1" + annotations: + openshift.io/node-selector: "" diff --git a/deploy/ocp/manifests/0.9.0/0000_50_olm_00-namespace.yaml b/deploy/ocp/manifests/0.9.0/0000_50_olm_00-namespace.yaml index cefe443fa1..ce94f9c763 100644 --- a/deploy/ocp/manifests/0.9.0/0000_50_olm_00-namespace.yaml +++ b/deploy/ocp/manifests/0.9.0/0000_50_olm_00-namespace.yaml @@ -4,7 +4,8 @@ apiVersion: v1 kind: Namespace metadata: name: openshift-operator-lifecycle-manager - + annotations: + openshift.io/node-selector: "" labels: openshift.io/run-level: "1" openshift.io/cluster-monitoring: "true" @@ -14,7 +15,8 @@ apiVersion: v1 kind: Namespace metadata: name: openshift-operators - + annotations: + openshift.io/node-selector: "" labels: openshift.io/run-level: "1" diff --git a/deploy/okd/manifests/0.7.2/0000_30_00-namespace.yaml b/deploy/okd/manifests/0.7.2/0000_30_00-namespace.yaml index eb6c559aa9..ecb4795218 100644 --- a/deploy/okd/manifests/0.7.2/0000_30_00-namespace.yaml +++ b/deploy/okd/manifests/0.7.2/0000_30_00-namespace.yaml @@ -6,3 +6,5 @@ metadata: name: openshift-operator-lifecycle-manager labels: openshift.io/run-level: "1" + annotations: + openshift.io/node-selector: "" diff --git a/deploy/okd/manifests/0.8.0/0000_30_00-namespace.yaml b/deploy/okd/manifests/0.8.0/0000_30_00-namespace.yaml index e09ac2c0a3..8ed0684835 100644 --- a/deploy/okd/manifests/0.8.0/0000_30_00-namespace.yaml +++ b/deploy/okd/manifests/0.8.0/0000_30_00-namespace.yaml @@ -6,6 +6,8 @@ metadata: name: openshift-operator-lifecycle-manager labels: openshift.io/run-level: "1" + annotations: + openshift.io/node-selector: "" --- apiVersion: v1 kind: Namespace @@ -13,3 +15,5 @@ metadata: name: openshift-operators labels: openshift.io/run-level: "1" + annotations: + openshift.io/node-selector: "" diff --git a/deploy/okd/manifests/0.9.0/0000_50_olm_00-namespace.yaml b/deploy/okd/manifests/0.9.0/0000_50_olm_00-namespace.yaml index 4b5864fe02..704c2cd2a3 100644 --- a/deploy/okd/manifests/0.9.0/0000_50_olm_00-namespace.yaml +++ b/deploy/okd/manifests/0.9.0/0000_50_olm_00-namespace.yaml @@ -4,10 +4,14 @@ apiVersion: v1 kind: Namespace metadata: name: openshift-operator-lifecycle-manager + annotations: + openshift.io/node-selector: "" --- apiVersion: v1 kind: Namespace metadata: name: openshift-operators + annotations: + openshift.io/node-selector: "" diff --git a/manifests/0000_50_olm_00-namespace.yaml b/manifests/0000_50_olm_00-namespace.yaml index 18ef97c069..932a75cc27 100644 --- a/manifests/0000_50_olm_00-namespace.yaml +++ b/manifests/0000_50_olm_00-namespace.yaml @@ -2,7 +2,8 @@ apiVersion: v1 kind: Namespace metadata: name: openshift-operator-lifecycle-manager - + annotations: + openshift.io/node-selector: "" labels: openshift.io/run-level: "1" openshift.io/cluster-monitoring: "true" @@ -12,7 +13,8 @@ apiVersion: v1 kind: Namespace metadata: name: openshift-operators - + annotations: + openshift.io/node-selector: "" labels: openshift.io/run-level: "1"