kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump metrics-server to 0.6.0 and enable HA mode

This commit is contained in:
Ole Markus With 2022-01-21 08:56:13 +01:00
parent 06c3b97eb5
commit 59dc424eae
6 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/model/components/apiserver.go
View File

@ -169,6 +169,14 @@ func (b *KubeAPIServerOptionsBuilder) BuildOptions(o interface{}) error {
c.InsecurePort = fi.Int32(0)
}
// If metrics-server is enabled, we want aggregator routing enabled so that requests are load balanced.
metricsServer := clusterSpec.MetricsServer
if metricsServer != nil && fi.BoolValue(metricsServer.Enabled) {
if c.EnableAggregatorRouting == nil {
c.EnableAggregatorRouting = fi.Bool(true)
}
}
return nil
}

8
upup/models/cloudup/resources/addons/metrics-server.addons.k8s.io/k8s-1.11.yaml.template
View File

@ -40,7 +40,7 @@ rules:
resources:
- pods
- nodes
- nodes/stats
- nodes/metrics
- namespaces
- configmaps
verbs:
@ -129,7 +129,7 @@ spec:
spec:
containers:
- args:
- --secure-port=443
- --secure-port=4443
- --kubelet-use-node-status-port
- --metric-resolution=15s
- --kubelet-preferred-address-types={{ if IsIPv6Only }}InternalIP{{ else }}Hostname{{ end }}
@ -142,7 +142,7 @@ spec:
{{ if or (not UseKopsControllerForNodeBootstrap) (WithDefaultBool .MetricsServer.Insecure true) }}
- --kubelet-insecure-tls
{{ end }}
image: {{ or .MetricsServer.Image "k8s.gcr.io/metrics-server/metrics-server:v0.5.0" }}
image: {{ or .MetricsServer.Image "k8s.gcr.io/metrics-server/metrics-server:v0.6.0" }}
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
@ -153,7 +153,7 @@ spec:
periodSeconds: 10
name: metrics-server
ports:
- containerPort: 443
- containerPort: 4443
name: https
protocol: TCP
readinessProbe:

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml
View File

@ -47,7 +47,7 @@ spec:
version: 9.99.0
- id: k8s-1.11
manifest: metrics-server.addons.k8s.io/k8s-1.11.yaml
manifestHash: 17909ec3ec7a451e80ab934d58b01d9d63f74f2a59e7f25627fe452872ceb2f4
manifestHash: af721298e26e1d1311a8ccd7e047f70e9c9f695ed7bffa7ce94e19a1e82fe691
name: metrics-server.addons.k8s.io
selector:
k8s-app: metrics-server

8
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/metrics-server.addons.k8s.io-k8s-1.11.yaml
View File

@ -51,7 +51,7 @@ rules:
resources:
- pods
- nodes
- nodes/stats
- nodes/metrics
- namespaces
- configmaps
verbs:
@ -165,13 +165,13 @@ spec:
spec:
containers:
- args:
- --secure-port=443
- --secure-port=4443
- --kubelet-use-node-status-port
- --metric-resolution=15s
- --kubelet-preferred-address-types=Hostname
- --cert-dir=/tmp
- --kubelet-insecure-tls
image: k8s.gcr.io/metrics-server/metrics-server:v0.5.0
image: k8s.gcr.io/metrics-server/metrics-server:v0.6.0
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
@ -182,7 +182,7 @@ spec:
periodSeconds: 10
name: metrics-server
ports:
- containerPort: 443
- containerPort: 4443
name: https
protocol: TCP
readinessProbe:

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml
View File

@ -47,7 +47,7 @@ spec:
version: 9.99.0
- id: k8s-1.11
manifest: metrics-server.addons.k8s.io/k8s-1.11.yaml
manifestHash: ed07ce88fa4e68289ddeabe8dffbc1a5a959810fcd03c10ab7b5f4b0a487d629
manifestHash: 93c0127182da9877f996b5328d2ed6d8a835f2867fd1d0972333cc66bbc4423f
name: metrics-server.addons.k8s.io
needsPKI: true
selector:

8
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/metrics-server.addons.k8s.io-k8s-1.11.yaml
View File

@ -51,7 +51,7 @@ rules:
resources:
- pods
- nodes
- nodes/stats
- nodes/metrics
- namespaces
- configmaps
verbs:
@ -165,13 +165,13 @@ spec:
spec:
containers:
- args:
- --secure-port=443
- --secure-port=4443
- --kubelet-use-node-status-port
- --metric-resolution=15s
- --kubelet-preferred-address-types=Hostname
- --tls-cert-file=/srv/tls.crt
- --tls-private-key-file=/srv/tls.key
image: k8s.gcr.io/metrics-server/metrics-server:v0.5.0
image: k8s.gcr.io/metrics-server/metrics-server:v0.6.0
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
@ -182,7 +182,7 @@ spec:
periodSeconds: 10
name: metrics-server
ports:
- containerPort: 443
- containerPort: 4443
name: https
protocol: TCP
readinessProbe: