Skip to content
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

metrics-server: Set preferred address type to InternalIP when non AWS #14709

Merged
merged 2 commits into from
Dec 3, 2022
Merged

metrics-server: Set preferred address type to InternalIP when non AWS #14709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8920b15
metrics-server: Set preferred address type to `InternalIP` when non AWS
hakman Dec 2, 2022
2b176ae
Run hack/update-expected.sh
hakman Dec 3, 2022
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
2 changes: 1 addition & 1 deletion ...e_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ spec:
version: 9.99.0
- id: k8s-1.11
manifest: metrics-server.addons.k8s.io/k8s-1.11.yaml
manifestHash: 2c50298a62f772220623daac250303f2757a9393c63a441acd89f077f1b4c2f7
manifestHash: 1b89be4bcb1ed917bbd82781eebceec127f2d30eb13f6e5477e3e42f0cafc1b6
name: metrics-server.addons.k8s.io
needsPKI: true
selector:
Expand Down
2 changes: 1 addition & 1 deletion ...ta/aws_s3_object_minimal.example.com-addons-metrics-server.addons.k8s.io-k8s-1.11_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ spec:
- --secure-port=4443
- --kubelet-use-node-status-port
- --metric-resolution=15s
- --kubelet-preferred-address-types=Hostname
- --kubelet-preferred-address-types=InternalIP
- --cert-dir=/tmp
- --kubelet-insecure-tls
image: registry.k8s.io/metrics-server/metrics-server:v0.6.1
Expand Down
2 changes: 1 addition & 1 deletion upup/models/cloudup/resources/addons/metrics-server.addons.k8s.io/k8s-1.11.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ spec:
- --secure-port=4443
- --kubelet-use-node-status-port
- --metric-resolution=15s
- --kubelet-preferred-address-types={{ if or IsIPv6Only (eq GetCloudProvider "hetzner")}}InternalIP{{ else }}Hostname{{ end }}
- --kubelet-preferred-address-types={{ if or IsIPv6Only (not (eq GetCloudProvider "aws"))}}InternalIP{{ else }}Hostname{{ end }}
{{ if not (WithDefaultBool .MetricsServer.Insecure true) }}
- --tls-cert-file=/srv/tls.crt
- --tls-private-key-file=/srv/tls.key
Expand Down