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

Merge pull request #12747 from hakman/automated-cherry-pick-of-#12721-upstream-release-1.22 

Automated cherry pick of #12721: Fix render template cilium AgentPrometheusPort into a UNICODE
This commit is contained in:
Kubernetes Prow Robot 2021-11-15 04:30:48 -08:00 committed by GitHub
parent 825b375e92 6752a22647
commit 902ae8610b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.8.yaml.template
View File

@ -421,7 +421,7 @@ spec:
# Annotation required for prometheus auto-discovery scraping
# https://docs.cilium.io/en/v1.9/operations/metrics/#installation
prometheus.io/scrape: "true"
prometheus.io/port: {{ printf "%q" .Networking.Cilium.AgentPrometheusPort }}
prometheus.io/port: "{{ .Networking.Cilium.AgentPrometheusPort }}"
{{ end }}
labels:
k8s-app: cilium

2
upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.9.yaml.template
View File

@ -549,7 +549,7 @@ spec:
# Annotation required for prometheus auto-discovery scraping
# https://docs.cilium.io/en/v1.9/operations/metrics/#installation
prometheus.io/scrape: "true"
prometheus.io/port: {{ printf "%q" .AgentPrometheusPort }}
prometheus.io/port: "{{ .AgentPrometheusPort }}"
{{ end }}
labels:
k8s-app: cilium

2
upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.10.yaml.template
View File

@ -578,7 +578,7 @@ spec:
# Annotation required for prometheus auto-discovery scraping
# https://docs.cilium.io/en/v1.9/operations/metrics/#installation
prometheus.io/scrape: "true"
prometheus.io/port: {{ printf "%q" .AgentPrometheusPort }}
prometheus.io/port: "{{ .AgentPrometheusPort }}"
{{ end }}
labels:
k8s-app: cilium