Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add node-selector annotation to namespace #824

Merged
merged 1 commit into from
Apr 26, 2019
Merged

Add node-selector annotation to namespace #824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions deploy/chart/templates/0000_50_olm_00-namespace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 }}
2 changes: 2 additions & 0 deletions deploy/ocp/manifests/0.7.1/0000_30_00-namespace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ metadata:
name: openshift-operator-lifecycle-manager
labels:
openshift.io/run-level: "1"
annotations:
openshift.io/node-selector: ""
2 changes: 2 additions & 0 deletions deploy/ocp/manifests/0.7.2/0000_30_00-namespace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ metadata:
name: openshift-operator-lifecycle-manager
labels:
openshift.io/run-level: "1"
annotations:
openshift.io/node-selector: ""
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ecordell do we need to update every namespace.yaml for all releases?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should just need latest

2 changes: 2 additions & 0 deletions deploy/ocp/manifests/0.7.4/0000_30_00-namespace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ metadata:
name: openshift-operator-lifecycle-manager
labels:
openshift.io/run-level: "1"
annotations:
openshift.io/node-selector: ""
4 changes: 4 additions & 0 deletions deploy/ocp/manifests/0.8.1/0000_50_olm_00-namespace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@ metadata:
name: openshift-operator-lifecycle-manager
labels:
openshift.io/run-level: "1"
annotations:
openshift.io/node-selector: ""
---
apiVersion: v1
kind: Namespace
metadata:
name: openshift-operators
labels:
openshift.io/run-level: "1"
annotations:
openshift.io/node-selector: ""
6 changes: 4 additions & 2 deletions deploy/ocp/manifests/0.9.0/0000_50_olm_00-namespace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -14,7 +15,8 @@ apiVersion: v1
kind: Namespace
metadata:
name: openshift-operators

annotations:
openshift.io/node-selector: ""
labels:
openshift.io/run-level: "1"

2 changes: 2 additions & 0 deletions deploy/okd/manifests/0.7.2/0000_30_00-namespace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ metadata:
name: openshift-operator-lifecycle-manager
labels:
openshift.io/run-level: "1"
annotations:
openshift.io/node-selector: ""
4 changes: 4 additions & 0 deletions deploy/okd/manifests/0.8.0/0000_30_00-namespace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@ metadata:
name: openshift-operator-lifecycle-manager
labels:
openshift.io/run-level: "1"
annotations:
openshift.io/node-selector: ""
---
apiVersion: v1
kind: Namespace
metadata:
name: openshift-operators
labels:
openshift.io/run-level: "1"
annotations:
openshift.io/node-selector: ""
4 changes: 4 additions & 0 deletions deploy/okd/manifests/0.9.0/0000_50_olm_00-namespace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""

6 changes: 4 additions & 2 deletions manifests/0000_50_olm_00-namespace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -12,7 +13,8 @@ apiVersion: v1
kind: Namespace
metadata:
name: openshift-operators

annotations:
openshift.io/node-selector: ""
labels:
openshift.io/run-level: "1"