Commit 35649121 by Prachi Damle Committed by Alena Prokharchyk

Changes done to upstream chart.

- Adding checksum over secrets to ensure change in secrets upgrades deployment - Using rancher image for ensuring airgap case works too - Adding nodeSelector to ensure the workloads never schedule to the Windows node - Adding resource limits - Add private image registry for airgap case
parent f627b92c
...@@ -43,4 +43,13 @@ role_arn = {{ .Values.aws.roleArn }} ...@@ -43,4 +43,13 @@ role_arn = {{ .Values.aws.roleArn }}
{{- end }} {{- end }}
region = {{ .Values.aws.region }} region = {{ .Values.aws.region }}
source_profile = default source_profile = default
{{ end }} {{ end }}
\ No newline at end of file
{{- define "system_default_registry" -}}
{{- if .Values.global.systemDefaultRegistry -}}
{{- printf "%s/" .Values.global.systemDefaultRegistry -}}
{{- else -}}
{{- "" -}}
{{- end -}}
{{- end -}}
\ No newline at end of file
...@@ -7,8 +7,9 @@ metadata: ...@@ -7,8 +7,9 @@ metadata:
spec: spec:
template: template:
metadata: metadata:
{{- if .Values.podAnnotations }}
annotations: annotations:
checksum/config: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
{{- if .Values.podAnnotations }}
{{ toYaml .Values.podAnnotations | indent 8}} {{ toYaml .Values.podAnnotations | indent 8}}
{{- end }} {{- end }}
labels: {{ include "external-dns.labels" . | indent 8 }} labels: {{ include "external-dns.labels" . | indent 8 }}
...@@ -24,7 +25,7 @@ spec: ...@@ -24,7 +25,7 @@ spec:
{{- end }} {{- end }}
containers: containers:
- name: {{ template "external-dns.name" . }} - name: {{ template "external-dns.name" . }}
image: "{{.Values.image.name}}:{{ .Values.image.tag }}" image: {{ template "system_default_registry" . }}{{ .Values.image.name}}:{{ .Values.image.tag }}
imagePullPolicy: "{{ .Values.image.pullPolicy }}" imagePullPolicy: "{{ .Values.image.pullPolicy }}"
args: args:
{{- if .Values.logLevel }} {{- if .Values.logLevel }}
...@@ -221,8 +222,9 @@ spec: ...@@ -221,8 +222,9 @@ spec:
- key: {{ .Values.designate.customCA.filename }} - key: {{ .Values.designate.customCA.filename }}
path: {{ .Values.designate.customCA.filename }} path: {{ .Values.designate.customCA.filename }}
{{- end }} {{- end }}
{{- if .Values.nodeSelector }}
nodeSelector: nodeSelector:
beta.kubernetes.io/os: linux
{{- if .Values.nodeSelector }}
{{ toYaml .Values.nodeSelector | indent 8 }} {{ toYaml .Values.nodeSelector | indent 8 }}
{{- end }} {{- end }}
{{- if .Values.tolerations }} {{- if .Values.tolerations }}
......
## Details about the image to be pulled. ## Details about the image to be pulled.
image: image:
name: registry.opensource.zalan.do/teapot/external-dns name: rancher/kubernetes-external-dns
tag: v0.5.9 tag: v0.5.10
pullSecrets: [] pullSecrets: []
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
...@@ -124,12 +124,13 @@ extraArgs: {} ...@@ -124,12 +124,13 @@ extraArgs: {}
extraEnv: [] extraEnv: []
## CPU and Memory limit and request for external-dns ## CPU and Memory limit and request for external-dns
resources: {} resources:
# limits: limits:
# memory: 50Mi memory: 100Mi
# requests: cpu: 200m
# memory: 50Mi requests:
# cpu: 10m memory: 50Mi
cpu: 100m
rbac: rbac:
## If true, create & use RBAC resources ## If true, create & use RBAC resources
...@@ -164,3 +165,6 @@ service: ...@@ -164,3 +165,6 @@ service:
type: ClusterIP type: ClusterIP
priorityClassName: "" priorityClassName: ""
global:
systemDefaultRegistry: ""
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment