mirror of https://github.com/kubernetes/kops.git
Merge pull request #9676 from hakman/cpa-worker-nodes
Move cluster-proportional-autoscaler to worker nodes
This commit is contained in:
commit
40b92e7d29
|
|
@ -1320,14 +1320,10 @@ spec:
|
||||||
- --default-params={"linear":{"coresPerReplica":256,"nodesPerReplica":16,"preventSinglePointFailure":true}}
|
- --default-params={"linear":{"coresPerReplica":256,"nodesPerReplica":16,"preventSinglePointFailure":true}}
|
||||||
- --logtostderr=true
|
- --logtostderr=true
|
||||||
- --v=2
|
- --v=2
|
||||||
nodeSelector:
|
|
||||||
kubernetes.io/role: master
|
|
||||||
priorityClassName: system-cluster-critical
|
priorityClassName: system-cluster-critical
|
||||||
tolerations:
|
tolerations:
|
||||||
- key: "CriticalAddonsOnly"
|
- key: "CriticalAddonsOnly"
|
||||||
operator: "Exists"
|
operator: "Exists"
|
||||||
- key: node-role.kubernetes.io/master
|
|
||||||
operator: Exists
|
|
||||||
serviceAccountName: coredns-autoscaler
|
serviceAccountName: coredns-autoscaler
|
||||||
---
|
---
|
||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
|
|
@ -2748,14 +2744,10 @@ spec:
|
||||||
- --default-params={"linear":{"coresPerReplica":256,"nodesPerReplica":16,"preventSinglePointFailure":true}}
|
- --default-params={"linear":{"coresPerReplica":256,"nodesPerReplica":16,"preventSinglePointFailure":true}}
|
||||||
- --logtostderr=true
|
- --logtostderr=true
|
||||||
- --v=2
|
- --v=2
|
||||||
nodeSelector:
|
|
||||||
kubernetes.io/role: master
|
|
||||||
priorityClassName: system-cluster-critical
|
priorityClassName: system-cluster-critical
|
||||||
tolerations:
|
tolerations:
|
||||||
- key: "CriticalAddonsOnly"
|
- key: "CriticalAddonsOnly"
|
||||||
operator: "Exists"
|
operator: "Exists"
|
||||||
- key: node-role.kubernetes.io/master
|
|
||||||
operator: Exists
|
|
||||||
serviceAccountName: kube-dns-autoscaler
|
serviceAccountName: kube-dns-autoscaler
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
@ -3108,13 +3100,9 @@ spec:
|
||||||
- --default-params={"linear":{"coresPerReplica":256,"nodesPerReplica":16,"preventSinglePointFailure":true}}
|
- --default-params={"linear":{"coresPerReplica":256,"nodesPerReplica":16,"preventSinglePointFailure":true}}
|
||||||
- --logtostderr=true
|
- --logtostderr=true
|
||||||
- --v=2
|
- --v=2
|
||||||
nodeSelector:
|
|
||||||
kubernetes.io/role: master
|
|
||||||
tolerations:
|
tolerations:
|
||||||
- key: "CriticalAddonsOnly"
|
- key: "CriticalAddonsOnly"
|
||||||
operator: "Exists"
|
operator: "Exists"
|
||||||
- key: node-role.kubernetes.io/master
|
|
||||||
operator: Exists
|
|
||||||
serviceAccountName: kube-dns-autoscaler
|
serviceAccountName: kube-dns-autoscaler
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
|
||||||
|
|
@ -119,14 +119,10 @@ spec:
|
||||||
- --default-params={"linear":{"coresPerReplica":256,"nodesPerReplica":16,"preventSinglePointFailure":true}}
|
- --default-params={"linear":{"coresPerReplica":256,"nodesPerReplica":16,"preventSinglePointFailure":true}}
|
||||||
- --logtostderr=true
|
- --logtostderr=true
|
||||||
- --v=2
|
- --v=2
|
||||||
nodeSelector:
|
|
||||||
kubernetes.io/role: master
|
|
||||||
priorityClassName: system-cluster-critical
|
priorityClassName: system-cluster-critical
|
||||||
tolerations:
|
tolerations:
|
||||||
- key: "CriticalAddonsOnly"
|
- key: "CriticalAddonsOnly"
|
||||||
operator: "Exists"
|
operator: "Exists"
|
||||||
- key: node-role.kubernetes.io/master
|
|
||||||
operator: Exists
|
|
||||||
serviceAccountName: coredns-autoscaler
|
serviceAccountName: coredns-autoscaler
|
||||||
---
|
---
|
||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
|
|
|
||||||
|
|
@ -69,14 +69,10 @@ spec:
|
||||||
- --default-params={"linear":{"coresPerReplica":256,"nodesPerReplica":16,"preventSinglePointFailure":true}}
|
- --default-params={"linear":{"coresPerReplica":256,"nodesPerReplica":16,"preventSinglePointFailure":true}}
|
||||||
- --logtostderr=true
|
- --logtostderr=true
|
||||||
- --v=2
|
- --v=2
|
||||||
nodeSelector:
|
|
||||||
kubernetes.io/role: master
|
|
||||||
priorityClassName: system-cluster-critical
|
priorityClassName: system-cluster-critical
|
||||||
tolerations:
|
tolerations:
|
||||||
- key: "CriticalAddonsOnly"
|
- key: "CriticalAddonsOnly"
|
||||||
operator: "Exists"
|
operator: "Exists"
|
||||||
- key: node-role.kubernetes.io/master
|
|
||||||
operator: Exists
|
|
||||||
serviceAccountName: kube-dns-autoscaler
|
serviceAccountName: kube-dns-autoscaler
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
|
||||||
|
|
@ -68,13 +68,9 @@ spec:
|
||||||
- --default-params={"linear":{"coresPerReplica":256,"nodesPerReplica":16,"preventSinglePointFailure":true}}
|
- --default-params={"linear":{"coresPerReplica":256,"nodesPerReplica":16,"preventSinglePointFailure":true}}
|
||||||
- --logtostderr=true
|
- --logtostderr=true
|
||||||
- --v=2
|
- --v=2
|
||||||
nodeSelector:
|
|
||||||
kubernetes.io/role: master
|
|
||||||
tolerations:
|
tolerations:
|
||||||
- key: "CriticalAddonsOnly"
|
- key: "CriticalAddonsOnly"
|
||||||
operator: "Exists"
|
operator: "Exists"
|
||||||
- key: node-role.kubernetes.io/master
|
|
||||||
operator: Exists
|
|
||||||
serviceAccountName: kube-dns-autoscaler
|
serviceAccountName: kube-dns-autoscaler
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ spec:
|
||||||
- id: k8s-1.6
|
- id: k8s-1.6
|
||||||
kubernetesVersion: <1.12.0
|
kubernetesVersion: <1.12.0
|
||||||
manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml
|
manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml
|
||||||
manifestHash: 92638799b10064ffc74907b096407658074b0f71
|
manifestHash: 622cc4a17d2d0258d6e364294dcef983730e9f7e
|
||||||
name: kube-dns.addons.k8s.io
|
name: kube-dns.addons.k8s.io
|
||||||
selector:
|
selector:
|
||||||
k8s-addon: kube-dns.addons.k8s.io
|
k8s-addon: kube-dns.addons.k8s.io
|
||||||
|
|
@ -29,7 +29,7 @@ spec:
|
||||||
- id: k8s-1.12
|
- id: k8s-1.12
|
||||||
kubernetesVersion: '>=1.12.0'
|
kubernetesVersion: '>=1.12.0'
|
||||||
manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml
|
manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml
|
||||||
manifestHash: 041cc42d4f2cccc9a9d4ac0ab089b20c1f27a6c4
|
manifestHash: 66f284c5d8a4b3fdbc385b84b21d013a55eec4cd
|
||||||
name: kube-dns.addons.k8s.io
|
name: kube-dns.addons.k8s.io
|
||||||
selector:
|
selector:
|
||||||
k8s-addon: kube-dns.addons.k8s.io
|
k8s-addon: kube-dns.addons.k8s.io
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ spec:
|
||||||
- id: k8s-1.6
|
- id: k8s-1.6
|
||||||
kubernetesVersion: <1.12.0
|
kubernetesVersion: <1.12.0
|
||||||
manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml
|
manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml
|
||||||
manifestHash: 92638799b10064ffc74907b096407658074b0f71
|
manifestHash: 622cc4a17d2d0258d6e364294dcef983730e9f7e
|
||||||
name: kube-dns.addons.k8s.io
|
name: kube-dns.addons.k8s.io
|
||||||
selector:
|
selector:
|
||||||
k8s-addon: kube-dns.addons.k8s.io
|
k8s-addon: kube-dns.addons.k8s.io
|
||||||
|
|
@ -29,7 +29,7 @@ spec:
|
||||||
- id: k8s-1.12
|
- id: k8s-1.12
|
||||||
kubernetesVersion: '>=1.12.0'
|
kubernetesVersion: '>=1.12.0'
|
||||||
manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml
|
manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml
|
||||||
manifestHash: 041cc42d4f2cccc9a9d4ac0ab089b20c1f27a6c4
|
manifestHash: 66f284c5d8a4b3fdbc385b84b21d013a55eec4cd
|
||||||
name: kube-dns.addons.k8s.io
|
name: kube-dns.addons.k8s.io
|
||||||
selector:
|
selector:
|
||||||
k8s-addon: kube-dns.addons.k8s.io
|
k8s-addon: kube-dns.addons.k8s.io
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ spec:
|
||||||
- id: k8s-1.6
|
- id: k8s-1.6
|
||||||
kubernetesVersion: <1.12.0
|
kubernetesVersion: <1.12.0
|
||||||
manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml
|
manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml
|
||||||
manifestHash: 92638799b10064ffc74907b096407658074b0f71
|
manifestHash: 622cc4a17d2d0258d6e364294dcef983730e9f7e
|
||||||
name: kube-dns.addons.k8s.io
|
name: kube-dns.addons.k8s.io
|
||||||
selector:
|
selector:
|
||||||
k8s-addon: kube-dns.addons.k8s.io
|
k8s-addon: kube-dns.addons.k8s.io
|
||||||
|
|
@ -29,7 +29,7 @@ spec:
|
||||||
- id: k8s-1.12
|
- id: k8s-1.12
|
||||||
kubernetesVersion: '>=1.12.0'
|
kubernetesVersion: '>=1.12.0'
|
||||||
manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml
|
manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml
|
||||||
manifestHash: 041cc42d4f2cccc9a9d4ac0ab089b20c1f27a6c4
|
manifestHash: 66f284c5d8a4b3fdbc385b84b21d013a55eec4cd
|
||||||
name: kube-dns.addons.k8s.io
|
name: kube-dns.addons.k8s.io
|
||||||
selector:
|
selector:
|
||||||
k8s-addon: kube-dns.addons.k8s.io
|
k8s-addon: kube-dns.addons.k8s.io
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ spec:
|
||||||
- id: k8s-1.6
|
- id: k8s-1.6
|
||||||
kubernetesVersion: <1.12.0
|
kubernetesVersion: <1.12.0
|
||||||
manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml
|
manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml
|
||||||
manifestHash: 92638799b10064ffc74907b096407658074b0f71
|
manifestHash: 622cc4a17d2d0258d6e364294dcef983730e9f7e
|
||||||
name: kube-dns.addons.k8s.io
|
name: kube-dns.addons.k8s.io
|
||||||
selector:
|
selector:
|
||||||
k8s-addon: kube-dns.addons.k8s.io
|
k8s-addon: kube-dns.addons.k8s.io
|
||||||
|
|
@ -29,7 +29,7 @@ spec:
|
||||||
- id: k8s-1.12
|
- id: k8s-1.12
|
||||||
kubernetesVersion: '>=1.12.0'
|
kubernetesVersion: '>=1.12.0'
|
||||||
manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml
|
manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml
|
||||||
manifestHash: 041cc42d4f2cccc9a9d4ac0ab089b20c1f27a6c4
|
manifestHash: 66f284c5d8a4b3fdbc385b84b21d013a55eec4cd
|
||||||
name: kube-dns.addons.k8s.io
|
name: kube-dns.addons.k8s.io
|
||||||
selector:
|
selector:
|
||||||
k8s-addon: kube-dns.addons.k8s.io
|
k8s-addon: kube-dns.addons.k8s.io
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue