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

Merge pull request #12260 from olemarkus/metrics-server-internaladdress 

Use node internal IP for metrics-server
This commit is contained in:
Kubernetes Prow Robot 2021-09-03 05:47:49 -07:00 committed by GitHub
parent c7eb08c76f bf96c42a60
commit 600e9421a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,6 +132,7 @@ spec:
- --secure-port=443 - --secure-port=443
- --kubelet-use-node-status-port - --kubelet-use-node-status-port
- --metric-resolution=15s - --metric-resolution=15s
- --kubelet-preferred-address-types=InternalIP
{{ if not (WithDefaultBool .MetricsServer.Insecure true) }} {{ if not (WithDefaultBool .MetricsServer.Insecure true) }}
- --tls-cert-file=/srv/tls.crt - --tls-cert-file=/srv/tls.crt
- --tls-private-key-file=/srv/tls.key - --tls-private-key-file=/srv/tls.key

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

@ -47,7 +47,7 @@ spec:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
- id: k8s-1.11 - id: k8s-1.11
manifest: metrics-server.addons.k8s.io/k8s-1.11.yaml manifest: metrics-server.addons.k8s.io/k8s-1.11.yaml
manifestHash: ce871ef1bf53baa9443848ba5f32936f8682383c787b1433da2d75734958a953 manifestHash: 4dff6f6241cb58b551453522219441ea26a49878bec473702d2812aae4331c86
name: metrics-server.addons.k8s.io name: metrics-server.addons.k8s.io
selector: selector:
k8s-app: metrics-server k8s-app: metrics-server

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

@ -168,6 +168,7 @@ spec:
- --secure-port=443 - --secure-port=443
- --kubelet-use-node-status-port - --kubelet-use-node-status-port
- --metric-resolution=15s - --metric-resolution=15s
- --kubelet-preferred-address-types=InternalIP
- --cert-dir=/tmp - --cert-dir=/tmp
- --kubelet-insecure-tls - --kubelet-insecure-tls
image: k8s.gcr.io/metrics-server/metrics-server:v0.5.0 image: k8s.gcr.io/metrics-server/metrics-server:v0.5.0

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

@ -41,7 +41,7 @@ spec:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
- id: k8s-1.11 - id: k8s-1.11
manifest: metrics-server.addons.k8s.io/k8s-1.11.yaml manifest: metrics-server.addons.k8s.io/k8s-1.11.yaml
manifestHash: ce871ef1bf53baa9443848ba5f32936f8682383c787b1433da2d75734958a953 manifestHash: 4dff6f6241cb58b551453522219441ea26a49878bec473702d2812aae4331c86
name: metrics-server.addons.k8s.io name: metrics-server.addons.k8s.io
selector: selector:
k8s-app: metrics-server k8s-app: metrics-server

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

@ -168,6 +168,7 @@ spec:
- --secure-port=443 - --secure-port=443
- --kubelet-use-node-status-port - --kubelet-use-node-status-port
- --metric-resolution=15s - --metric-resolution=15s
- --kubelet-preferred-address-types=InternalIP
- --cert-dir=/tmp - --cert-dir=/tmp
- --kubelet-insecure-tls - --kubelet-insecure-tls
image: k8s.gcr.io/metrics-server/metrics-server:v0.5.0 image: k8s.gcr.io/metrics-server/metrics-server:v0.5.0

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

@ -47,7 +47,7 @@ spec:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
- id: k8s-1.11 - id: k8s-1.11
manifest: metrics-server.addons.k8s.io/k8s-1.11.yaml manifest: metrics-server.addons.k8s.io/k8s-1.11.yaml
manifestHash: fb11ac1e25afb1687b3019675ca72e7f4baaceb4faec7424a26b4900d2e0f4bb manifestHash: 9731b5082d21212b47d01fef745c867bb7ae07ba5e67d313ff052c1f2ab41c64
name: metrics-server.addons.k8s.io name: metrics-server.addons.k8s.io
needsPKI: true needsPKI: true
selector: selector:

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

@ -168,6 +168,7 @@ spec:
- --secure-port=443 - --secure-port=443
- --kubelet-use-node-status-port - --kubelet-use-node-status-port
- --metric-resolution=15s - --metric-resolution=15s
- --kubelet-preferred-address-types=InternalIP
- --tls-cert-file=/srv/tls.crt - --tls-cert-file=/srv/tls.crt
- --tls-private-key-file=/srv/tls.key - --tls-private-key-file=/srv/tls.key
- --kubelet-insecure-tls - --kubelet-insecure-tls

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

@ -41,7 +41,7 @@ spec:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
- id: k8s-1.11 - id: k8s-1.11
manifest: metrics-server.addons.k8s.io/k8s-1.11.yaml manifest: metrics-server.addons.k8s.io/k8s-1.11.yaml
manifestHash: 6c433dec3ce69175b4079d75a89726ee0bd4237c94c1297903922561b06cec68 manifestHash: ee0475eb7db9ad2892bb0a41ee55c94c312c528af4205326b93df84180e63034
name: metrics-server.addons.k8s.io name: metrics-server.addons.k8s.io
needsPKI: true needsPKI: true
selector: selector:

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

@ -168,6 +168,7 @@ spec:
- --secure-port=443 - --secure-port=443
- --kubelet-use-node-status-port - --kubelet-use-node-status-port
- --metric-resolution=15s - --metric-resolution=15s
- --kubelet-preferred-address-types=InternalIP
- --tls-cert-file=/srv/tls.crt - --tls-cert-file=/srv/tls.crt
- --tls-private-key-file=/srv/tls.key - --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.5.0