Skip to content

fix: wrong template #17717

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

Closed
wants to merge 1 commit into from
+20 −20
Closed

fix: wrong template #17717

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
40 changes: 20 additions & 20 deletions upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,16 @@ metadata:
addonmanager.kubernetes.io/mode: EnsureExists
data:
Corefile: |
{{- if KubeDNS.ExternalCoreFile }}
{{ KubeDNS.ExternalCoreFile | indent 4 }}
{{- if kubeDNS.ExternalCoreFile }}
{{ kubeDNS.ExternalCoreFile | indent 4 }}
{{- else }}
.:53 {
errors
health {
lameduck 10s
}
ready
kubernetes {{ KubeDNS.Domain }}. in-addr.arpa ip6.arpa {
kubernetes {{ kubeDNS.Domain }}. in-addr.arpa ip6.arpa {
pods insecure
fallthrough in-addr.arpa ip6.arpa
ttl 30
Expand All @@ -83,7 +83,7 @@ data:
}
{{- end }}
prometheus :9153
forward . {{ or (join " " KubeDNS.UpstreamNameservers) "/etc/resolv.conf" }} {
forward . {{ or (join " " kubeDNS.UpstreamNameservers) "/etc/resolv.conf" }} {
max_concurrent 1000
}
cache 30
Expand Down Expand Up @@ -122,18 +122,18 @@ spec:
metadata:
labels:
k8s-app: kube-dns
{{- if KubeDNS.PodAnnotations }}
{{- if kubeDNS.PodAnnotations }}
annotations:
{{- range $key, $value := KubeDNS.PodAnnotations }}
{{- range $key, $value := kubeDNS.PodAnnotations }}
{{ $key }}: "{{ $value }}"
{{- end }}
{{- end }}
spec:
priorityClassName: system-cluster-critical
serviceAccountName: coredns
tolerations:
{{- if KubeDNS.Tolerations }}
{{ ToYAML .KubeDNS.Tolerations | indent 8 }}
{{- if kubeDNS.Tolerations }}
{{ ToYAML .kubeDNS.Tolerations | indent 8 }}
{{- else }}
- key: "CriticalAddonsOnly"
operator: "Exists"
Expand All @@ -146,9 +146,9 @@ spec:
{{- end }}
nodeSelector:
kubernetes.io/os: linux
{{- if .KubeDNS.Affinity }}
{{- if .kubeDNS.Affinity }}
affinity:
{{ ToYAML .KubeDNS.Affinity | indent 8 }}
{{ ToYAML .kubeDNS.Affinity | indent 8 }}
{{- end }}
topologySpreadConstraints:
{{- if ne GetCloudProvider "metal" }}
Expand All @@ -168,14 +168,14 @@ spec:
k8s-app: kube-dns
containers:
- name: coredns
image: {{ if KubeDNS.CoreDNSImage }}{{ KubeDNS.CoreDNSImage }}{{ else }}registry.k8s.io/coredns/coredns:v1.12.4{{ end }}
image: {{ if kubeDNS.CoreDNSImage }}{{ kubeDNS.CoreDNSImage }}{{ else }}registry.k8s.io/coredns/coredns:v1.12.4{{ end }}
imagePullPolicy: IfNotPresent
resources:
limits:
memory: {{ KubeDNS.MemoryLimit }}
memory: {{ kubeDNS.MemoryLimit }}
requests:
cpu: {{ KubeDNS.CPURequest }}
memory: {{ KubeDNS.MemoryRequest }}
cpu: {{ kubeDNS.CPURequest }}
memory: {{ kubeDNS.MemoryRequest }}
args: [ "-conf", "/etc/coredns/Corefile" ]
volumeMounts:
- name: config-volume
Expand Down Expand Up @@ -257,7 +257,7 @@ metadata:
spec:
selector:
k8s-app: kube-dns
clusterIP: {{ KubeDNS.ServerIP }}
clusterIP: {{ kubeDNS.ServerIP }}
ports:
- name: dns
port: 53
Expand Down Expand Up @@ -349,7 +349,7 @@ spec:
spec:
containers:
- name: autoscaler
image: {{ if KubeDNS.CPAImage }}{{ KubeDNS.CPAImage }}{{ else }}registry.k8s.io/cpa/cluster-proportional-autoscaler:v1.9.0{{ end }}
image: {{ if kubeDNS.CPAImage }}{{ kubeDNS.CPAImage }}{{ else }}registry.k8s.io/cpa/cluster-proportional-autoscaler:v1.9.0{{ end }}
resources:
requests:
cpu: "20m"
Expand All @@ -368,17 +368,17 @@ spec:
priorityClassName: system-cluster-critical
{{- end }}
tolerations:
{{- if KubeDNS.Tolerations }}
{{ ToYAML .KubeDNS.Tolerations | indent 8 }}
{{- if kubeDNS.Tolerations }}
{{ ToYAML .kubeDNS.Tolerations | indent 8 }}
{{- else }}
- key: "CriticalAddonsOnly"
operator: "Exists"
{{- end }}
serviceAccountName: coredns-autoscaler
nodeSelector:
kubernetes.io/os: linux
{{- if .KubeDNS.Affinity }}
{{- if .kubeDNS.Affinity }}
affinity:
{{ ToYAML .KubeDNS.Affinity | indent 8 }}
{{ ToYAML .kubeDNS.Affinity | indent 8 }}
{{- end }}
---
Loading