Skip to content
This repository has been archived by the owner on Jul 11, 2023. It is now read-only.

fix(install): Add nodeSelectors for install and demo #3611

Merged
merged 1 commit into from
Jun 17, 2021
Merged

fix(install): Add nodeSelectors for install and demo #3611

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
3 changes: 3 additions & 0 deletions charts/osm/templates/grafana-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ spec:
{{- include "restricted.securityContext" . | nindent 6 }}
{{- end }}
serviceAccountName: osm-grafana
nodeSelector:
kubernetes.io/arch: amd64
kubernetes.io/os: linux
containers:
- name: grafana
image: "grafana/grafana:7.0.1"
Expand Down
3 changes: 3 additions & 0 deletions charts/osm/templates/jaeger-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ spec:
{{- include "restricted.securityContext" . | nindent 6 }}
{{- end }}
serviceAccountName: jaeger
nodeSelector:
kubernetes.io/arch: amd64
kubernetes.io/os: linux
containers:
- name: jaeger
image: jaegertracing/all-in-one
Expand Down
3 changes: 3 additions & 0 deletions charts/osm/templates/osm-gateway-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ spec:
app: osm-gateway
name: osm-gateway
spec:
nodeSelector:
kubernetes.io/arch: amd64
kubernetes.io/os: linux
initContainers:
- name: osm-gateway-init
image: curlimages/curl
Expand Down
3 changes: 3 additions & 0 deletions charts/osm/templates/prometheus-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ spec:
{{- if not (.Capabilities.APIVersions.Has "security.openshift.io/v1") }}
{{- include "restricted.securityContext" . | nindent 6 }}
{{- end }}
nodeSelector:
kubernetes.io/arch: amd64
kubernetes.io/os: linux
containers:
- name: prometheus
ports:
Expand Down
3 changes: 3 additions & 0 deletions cmd/cli/testdata/test-chart/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ spec:
testing: test
spec:
{{- with .Values.OpenServiceMesh.imagePullSecrets }}
nodeSelector:
kubernetes.io/arch: amd64
kubernetes.io/os: linux
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end}}
Expand Down
4 changes: 3 additions & 1 deletion demo/deploy-bookbuyer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ spec:
version: v1
spec:
serviceAccountName: bookbuyer

nodeSelector:
kubernetes.io/arch: amd64
kubernetes.io/os: linux
containers:
# Main container with APP
- name: bookbuyer
Expand Down
3 changes: 3 additions & 0 deletions demo/deploy-bookstore-with-same-sa.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ spec:
version: $VERSION
spec:
serviceAccountName: bookstore
nodeSelector:
kubernetes.io/arch: amd64
kubernetes.io/os: linux
containers:
- image: "${CTR_REGISTRY}/bookstore:${CTR_TAG}"
imagePullPolicy: Always
Expand Down
3 changes: 3 additions & 0 deletions demo/deploy-bookstore.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ spec:
version: $VERSION
spec:
serviceAccountName: "$SVC"
nodeSelector:
kubernetes.io/arch: amd64
kubernetes.io/os: linux
containers:
- image: "${CTR_REGISTRY}/bookstore:${CTR_TAG}"
imagePullPolicy: Always
Expand Down
4 changes: 3 additions & 1 deletion demo/deploy-bookthief.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ spec:
version: v1
spec:
serviceAccountName: bookthief

nodeSelector:
kubernetes.io/arch: amd64
kubernetes.io/os: linux
containers:
# Main container with APP
- name: bookthief
Expand Down
4 changes: 3 additions & 1 deletion demo/deploy-bookwarehouse.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@ spec:
version: v1
spec:
serviceAccountName: bookwarehouse

nodeSelector:
kubernetes.io/arch: amd64
kubernetes.io/os: linux
containers:
# Main container with APP
- name: bookwarehouse
Expand Down
3 changes: 3 additions & 0 deletions demo/deploy-tcp-client.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ spec:
version: v1
spec:
serviceAccountName: tcp-client
nodeSelector:
kubernetes.io/arch: amd64
kubernetes.io/os: linux
containers:
- name: tcp-client
image: "${CTR_REGISTRY}/tcp-client:${CTR_TAG}"
Expand Down
3 changes: 3 additions & 0 deletions demo/deploy-tcp-echo-service.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ spec:
version: v1
spec:
serviceAccountName: tcp-echo
nodeSelector:
kubernetes.io/arch: amd64
kubernetes.io/os: linux
containers:
- name: tcp-echo-server
image: "${CTR_REGISTRY}/tcp-echo-server:${CTR_TAG}"
Expand Down
3 changes: 3 additions & 0 deletions demo/deploy-vault.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ spec:
labels:
app: vault
spec:
nodeSelector:
kubernetes.io/arch: amd64
kubernetes.io/os: linux
terminationGracePeriodSeconds: 10
containers:
- name: vault
Expand Down
3 changes: 3 additions & 0 deletions docs/example/manifests/apps/bookbuyer.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ spec:
version: v1
spec:
serviceAccountName: bookbuyer
nodeSelector:
kubernetes.io/arch: amd64
kubernetes.io/os: linux
containers:
- name: bookbuyer
image: openservicemesh/bookbuyer:v0.9.0
Expand Down
3 changes: 3 additions & 0 deletions docs/example/manifests/apps/bookstore-v2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ spec:
app: bookstore-v2
spec:
serviceAccountName: bookstore-v2
nodeSelector:
kubernetes.io/arch: amd64
kubernetes.io/os: linux
containers:
- name: bookstore
image: openservicemesh/bookstore:v0.9.0
Expand Down
3 changes: 3 additions & 0 deletions docs/example/manifests/apps/bookstore.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ spec:
app: bookstore
spec:
serviceAccountName: bookstore
nodeSelector:
kubernetes.io/arch: amd64
kubernetes.io/os: linux
containers:
- name: bookstore
image: openservicemesh/bookstore:v0.9.0
Expand Down
3 changes: 3 additions & 0 deletions docs/example/manifests/apps/bookthief.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ spec:
version: v1
spec:
serviceAccountName: bookthief
nodeSelector:
kubernetes.io/arch: amd64
kubernetes.io/os: linux
containers:
- name: bookthief
image: openservicemesh/bookthief:v0.9.0
Expand Down
3 changes: 3 additions & 0 deletions docs/example/manifests/apps/bookwarehouse.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ spec:
version: v1
spec:
serviceAccountName: bookwarehouse
nodeSelector:
kubernetes.io/arch: amd64
kubernetes.io/os: linux
containers:
- name: bookwarehouse
image: openservicemesh/bookwarehouse:v0.9.0
Expand Down
3 changes: 3 additions & 0 deletions docs/example/manifests/opa/deploy-opa-envoy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ spec:
labels:
app: opa
spec:
nodeSelector:
kubernetes.io/arch: amd64
kubernetes.io/os: linux
containers:
- name: opa-envoy
image: openpolicyagent/opa:0.28.0-envoy
Expand Down
3 changes: 3 additions & 0 deletions docs/example/manifests/samples/curl/curl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ spec:
app: curl
spec:
serviceAccountName: curl
nodeSelector:
kubernetes.io/arch: amd64
kubernetes.io/os: linux
containers:
- image: curlimages/curl
imagePullPolicy: IfNotPresent
Expand Down
3 changes: 3 additions & 0 deletions docs/example/manifests/samples/httpbin/httpbin.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ spec:
app: httpbin
spec:
serviceAccountName: httpbin
nodeSelector:
kubernetes.io/arch: amd64
kubernetes.io/os: linux
containers:
- image: kennethreitz/httpbin
imagePullPolicy: IfNotPresent
Expand Down