From 6752a2264748c1905c3cdc8e282a9e898ca53d52 Mon Sep 17 00:00:00 2001 From: zhengtianbao Date: Fri, 12 Nov 2021 14:45:45 +0800 Subject: [PATCH] Fix render template cilium AgentPrometheusPort into a UNICODE char --- .../addons/networking.cilium.io/k8s-1.12-v1.8.yaml.template | 2 +- .../addons/networking.cilium.io/k8s-1.12-v1.9.yaml.template | 2 +- .../addons/networking.cilium.io/k8s-1.16-v1.10.yaml.template | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.8.yaml.template b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.8.yaml.template index 1a9ac51c14..f96d4253fe 100644 --- a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.8.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.8.yaml.template @@ -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 diff --git a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.9.yaml.template b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.9.yaml.template index f56e022921..daffc8e1f5 100644 --- a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.9.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.9.yaml.template @@ -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 diff --git a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.10.yaml.template b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.10.yaml.template index 89b9450e99..6df5beace5 100644 --- a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.10.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.10.yaml.template @@ -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