mirror of https://github.com/kubernetes/kops.git
fix pod annotations in addon yamls
This commit is contained in:
parent
24aa6ea6b4
commit
f56dbad934
|
|
@ -27,6 +27,8 @@ spec:
|
|||
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.21.2
|
||||
maxNodeProvisionTime: 15m0s
|
||||
newPodScaleUpDelay: 0s
|
||||
podAnnotations:
|
||||
testAnnotation: testAnnotation
|
||||
scaleDownDelayAfterAdd: 10m0s
|
||||
scaleDownUtilizationThreshold: "0.5"
|
||||
skipNodesWithLocalStorage: true
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ spec:
|
|||
version: 9.99.0
|
||||
- id: k8s-1.15
|
||||
manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
|
||||
manifestHash: 7add7ef0ac062db6de829ad8b6c57d4a1a7e51d43848aa9eecdc9c5bdbb013f4
|
||||
manifestHash: 7af7d35d7847cd9888e12f1c4fdbaac7137eb92b68bbc7e80fd7ca16d2def521
|
||||
name: cluster-autoscaler.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: cluster-autoscaler.addons.k8s.io
|
||||
|
|
|
|||
|
|
@ -301,6 +301,7 @@ spec:
|
|||
annotations:
|
||||
prometheus.io/port: "8085"
|
||||
prometheus.io/scrape: "true"
|
||||
testAnnotation: testAnnotation
|
||||
creationTimestamp: null
|
||||
labels:
|
||||
app: cluster-autoscaler
|
||||
|
|
|
|||
|
|
@ -10,6 +10,8 @@ spec:
|
|||
enabled: true
|
||||
clusterAutoscaler:
|
||||
enabled: true
|
||||
podAnnotations:
|
||||
testAnnotation: testAnnotation
|
||||
kubernetesApiAccess:
|
||||
- 0.0.0.0/0
|
||||
channel: stable
|
||||
|
|
|
|||
|
|
@ -274,8 +274,8 @@ spec:
|
|||
annotations:
|
||||
prometheus.io/port: "8085"
|
||||
prometheus.io/scrape: "true"
|
||||
{{- with .PodAnnotations }}
|
||||
{{- . | nindent 8 }}
|
||||
{{- range $key, $value := .PodAnnotations }}
|
||||
{{ $key }}: "{{ $value }}"
|
||||
{{- end }}
|
||||
labels:
|
||||
app: cluster-autoscaler
|
||||
|
|
|
|||
|
|
@ -128,9 +128,9 @@ spec:
|
|||
annotations:
|
||||
prometheus.io/port: "9253"
|
||||
prometheus.io/scrape: "true"
|
||||
{{- with KubeDNS.NodeLocalDNS.PodAnnotations }}
|
||||
{{- . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- range $key, $value := KubeDNS.NodeLocalDNS.PodAnnotations }}
|
||||
{{ $key }}: "{{ $value }}"
|
||||
{{- end }}
|
||||
spec:
|
||||
priorityClassName: system-node-critical
|
||||
serviceAccountName: node-local-dns
|
||||
|
|
|
|||
Loading…
Reference in New Issue