Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into feat_observedGene…
Browse files Browse the repository at this point in the history
…ration
  • Loading branch information
Ghostbaby committed Sep 14, 2020
2 parents 4833767 + a760d93 commit 8b0d851
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions charts/oam-kubernetes-runtime/templates/oam-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,15 @@ spec:
secretName: {{ .Values.certificate.secretName | quote }}
{{ end }}
terminationGracePeriodSeconds: 10
{{- with .Values.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 8 }}
{{- end }}
{{- with .Values.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}

0 comments on commit 8b0d851

Please sign in to comment.