MAISTRA-693: Protect maistra-version labels with quotes (#635)

So that they are not interpreted as floats. (For instance, if version is set to `2.0`). Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
maistra · Dec 2, 2020 · e6382ad · e6382ad
1 parent 5ba6389
commit e6382ad
Show file tree

Hide file tree

Showing 125 changed files with 202 additions and 202 deletions.
diff --git a/build/patch-charts.sh b/build/patch-charts.sh
@@ -34,7 +34,7 @@ function patchTemplates() {
   for file in $(find ${HELM_DIR} -name "*.yaml" -o -name "*.yaml.tpl"); do
     if grep -l 'release: ' $file; then
       sed_wrap -i -e '/^metadata:/,/^[^ {]/ { s/^\(.*\)labels:/\1labels:\
-\1  maistra-version: '${MAISTRA_VERSION}'/ }' $file
+\1  maistra-version: "'${MAISTRA_VERSION}'"/ }' $file
     fi
     if grep -l '\.Values\.global\.istioNamespace' $file; then
       sed_wrap -i -e 's/\.Values\.global\.istioNamespace/.Release.Namespace/' $file

diff --git a/resources/helm/v2.0/gateways/istio-egress/templates/autoscale.yaml b/resources/helm/v2.0/gateways/istio-egress/templates/autoscale.yaml
@@ -6,7 +6,7 @@ metadata:
   name: {{ $gateway.name | default "istio-egressgateway" }}
   namespace: {{ $gateway.namespace | default .Release.Namespace }}
   labels:
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
 {{ $gateway.labels | toYaml | indent 4 }}
     release: {{ .Release.Name }}
 spec:

diff --git a/resources/helm/v2.0/gateways/istio-egress/templates/deployment.yaml b/resources/helm/v2.0/gateways/istio-egress/templates/deployment.yaml
@@ -6,7 +6,7 @@ metadata:
   namespace: {{ $gateway.namespace | default .Release.Namespace }}
   labels:
     maistra.io/gateway: {{ $gateway.name | default "istio-egressgateway" }}.{{ $gateway.namespace | default .Release.Namespace }}
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
 {{ $gateway.labels | toYaml | indent 4 }}
     release: {{ .Release.Name }}
 spec:

diff --git a/resources/helm/v2.0/gateways/istio-egress/templates/poddisruptionbudget.yaml b/resources/helm/v2.0/gateways/istio-egress/templates/poddisruptionbudget.yaml
@@ -6,7 +6,7 @@ metadata:
   name: {{ $gateway.name | default "istio-egressgateway" }}
   namespace: {{ $gateway.namespace | default .Release.Namespace }}
   labels:
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
 {{ $gateway.labels | toYaml | indent 4 }}
     release: {{ .Release.Name }}
 spec:

diff --git a/resources/helm/v2.0/gateways/istio-egress/templates/preconfigured.yaml b/resources/helm/v2.0/gateways/istio-egress/templates/preconfigured.yaml
@@ -6,7 +6,7 @@ metadata:
   name: istio-multicluster-egressgateway
   namespace: {{ $gateway.namespace | default .Release.Namespace }}
   labels:
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
 {{ $gateway.labels | toYaml | indent 4 }}
     release: {{ .Release.Name }}
 spec:
@@ -27,7 +27,7 @@ metadata:
   name: istio-multicluster-egressgateway
   namespace: {{ $gateway.namespace | default .Release.Namespace }}
   labels:
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
 {{ $gateway.labels | toYaml | indent 4 }}
     release: {{ .Release.Name }}
 spec:
@@ -53,7 +53,7 @@ metadata:
   name: istio-multicluster-egressgateway
   namespace: {{ $gateway.namespace | default .Release.Namespace }}
   labels:
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
 {{ $gateway.labels | toYaml | indent 4 }}
     release: {{ .Release.Name }}
 spec:
@@ -74,7 +74,7 @@ metadata:
   name: istio-multicluster-egressgateway
   namespace: {{ $gateway.namespace | default .Release.Namespace }}
   labels:
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
 {{ $gateway.labels | toYaml | indent 4 }}
     release: {{ .Release.Name }}
 spec:

diff --git a/resources/helm/v2.0/gateways/istio-egress/templates/service.yaml b/resources/helm/v2.0/gateways/istio-egress/templates/service.yaml
@@ -9,7 +9,7 @@ metadata:
     {{ $key }}: {{ $val | quote }}
     {{- end }}
   labels:
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
 {{ $gateway.labels | toYaml | indent 4 }}
     release: {{ .Release.Name }}
 spec:

diff --git a/resources/helm/v2.0/gateways/istio-egress/templates/serviceaccount.yaml b/resources/helm/v2.0/gateways/istio-egress/templates/serviceaccount.yaml
@@ -11,6 +11,6 @@ metadata:
   name: {{ $gateway.name | default "istio-egressgateway" }}-service-account
   namespace: {{ $gateway.namespace | default .Release.Namespace }}
   labels:
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
 {{ $gateway.labels | toYaml | indent 4 }}
     release: {{ .Release.Name }}
diff --git a/resources/helm/v2.0/gateways/istio-ingress/templates/autoscale.yaml b/resources/helm/v2.0/gateways/istio-ingress/templates/autoscale.yaml
@@ -6,7 +6,7 @@ metadata:
   name: {{ $gateway.name | default "istio-ingressgateway" }}
   namespace: {{ $gateway.namespace | default .Release.Namespace }}
   labels:
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
 {{ $gateway.labels | toYaml | indent 4 }}
     release: {{ .Release.Name }}
 spec:

diff --git a/resources/helm/v2.0/gateways/istio-ingress/templates/deployment.yaml b/resources/helm/v2.0/gateways/istio-ingress/templates/deployment.yaml
@@ -6,7 +6,7 @@ metadata:
   namespace: {{ $gateway.namespace | default .Release.Namespace }}
   labels:
     maistra.io/gateway: {{ $gateway.name | default "istio-ingressgateway" }}.{{ $gateway.namespace | default .Release.Namespace }}
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
 {{ $gateway.labels | toYaml | indent 4 }}
     release: {{ .Release.Name }}
 spec:

diff --git a/resources/helm/v2.0/gateways/istio-ingress/templates/gateways.yaml b/resources/helm/v2.0/gateways/istio-ingress/templates/gateways.yaml
@@ -6,7 +6,7 @@ metadata:
   name: istio-autogenerated-k8s-ingress
   namespace: {{ $gateway.namespace | default .Release.Namespace }}
   labels:
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
     app: {{ $gateway.name }}
     release: {{ .Release.Name }}
 spec:

diff --git a/resources/helm/v2.0/gateways/istio-ingress/templates/istio-ingressgateway-route.yaml b/resources/helm/v2.0/gateways/istio-ingress/templates/istio-ingressgateway-route.yaml
@@ -10,7 +10,7 @@ metadata:
   namespace: {{ $gateway.namespace | default .Release.Namespace }}
 {{- end }}
   labels:
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
     release: {{ .Release.Name }}
     {{- range $key, $val := $gateway.labels }}
     {{ $key }}: {{ $val }}

diff --git a/resources/helm/v2.0/gateways/istio-ingress/templates/meshexpansion.yaml b/resources/helm/v2.0/gateways/istio-ingress/templates/meshexpansion.yaml
@@ -6,7 +6,7 @@ metadata:
   name: meshexpansion-gateway
   namespace: {{ .Release.Namespace }}
   labels:
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
     release: {{ .Release.Name }}
 spec:
   selector:
@@ -32,7 +32,7 @@ metadata:
   name: meshexpansion-vs-istiod
   namespace: {{ .Release.Namespace }}
   labels:
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
     release: {{ .Release.Name }}
 spec:
   hosts:
@@ -62,7 +62,7 @@ metadata:
   name: meshexpansion-dr-istiod
   namespace: {{ .Release.Namespace }}
   labels:
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
     release: {{ .Release.Name }}
 spec:
   host: istiod.{{ .Release.Namespace }}.svc.{{ .Values.global.proxy.clusterDomain }}

diff --git a/resources/helm/v2.0/gateways/istio-ingress/templates/networkpolicy.yaml b/resources/helm/v2.0/gateways/istio-ingress/templates/networkpolicy.yaml
@@ -9,7 +9,7 @@ metadata:
   namespace: {{ $gateway.namespace | default .Release.Namespace }}
 {{- end }}
   labels:
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
     app: {{ index .Values "gateways" "istio-ingressgateway" "labels" "istio" }}
     release: {{ .Release.Name }}
   annotations:

diff --git a/resources/helm/v2.0/gateways/istio-ingress/templates/poddisruptionbudget.yaml b/resources/helm/v2.0/gateways/istio-ingress/templates/poddisruptionbudget.yaml
@@ -6,7 +6,7 @@ metadata:
   name: {{ $gateway.name | default "istio-ingressgateway" }}
   namespace: {{ $gateway.namespace | default .Release.Namespace }}
   labels:
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
 {{ $gateway.labels | toYaml | trim | indent 4 }}
     release: {{ .Release.Name }}
 spec:

diff --git a/resources/helm/v2.0/gateways/istio-ingress/templates/preconfigured.yaml b/resources/helm/v2.0/gateways/istio-ingress/templates/preconfigured.yaml
@@ -6,7 +6,7 @@ metadata:
   name: istio-multicluster-ingressgateway
   namespace: {{ $gateway.namespace | default .Release.Namespace }}
   labels:
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
 {{ $gateway.labels | toYaml | indent 4 }}
     release: {{ .Release.Name }}
 spec:
@@ -29,7 +29,7 @@ metadata:
   name: istio-multicluster-ingressgateway
   namespace: {{ $gateway.namespace | default .Release.Namespace }}
   labels:
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
 {{ $gateway.labels | toYaml | indent 4 }}
     release: {{ .Release.Name }}
 spec:
@@ -61,7 +61,7 @@ metadata:
   name: istio-multicluster-ingressgateway
   namespace: {{ $gateway.namespace | default .Release.Namespace }}
   labels:
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
 {{ $gateway.labels | toYaml | indent 4 }}
     release: {{ .Release.Name }}
 spec:

diff --git a/resources/helm/v2.0/gateways/istio-ingress/templates/role.yaml b/resources/helm/v2.0/gateways/istio-ingress/templates/role.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ $gateway.name | default "istio-ingressgateway" }}-sds
   namespace: {{ $gateway.namespace | default .Release.Namespace }}
   labels:
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
     release: {{ .Release.Name }}
 rules:
 - apiGroups: [""]

diff --git a/resources/helm/v2.0/gateways/istio-ingress/templates/rolebindings.yaml b/resources/helm/v2.0/gateways/istio-ingress/templates/rolebindings.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ $gateway.name | default "istio-ingressgateway" }}-sds
   namespace: {{ $gateway.namespace | default .Release.Namespace }}
   labels:
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
     release: {{ .Release.Name }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io

diff --git a/resources/helm/v2.0/gateways/istio-ingress/templates/service.yaml b/resources/helm/v2.0/gateways/istio-ingress/templates/service.yaml
@@ -10,7 +10,7 @@ metadata:
     {{ $key }}: {{ $val | quote }}
     {{- end }}
   labels:
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
 {{ $gateway.labels | toYaml | indent 4 }}
     release: {{ .Release.Name }}
 spec:

diff --git a/resources/helm/v2.0/gateways/istio-ingress/templates/serviceaccount.yaml b/resources/helm/v2.0/gateways/istio-ingress/templates/serviceaccount.yaml
@@ -11,6 +11,6 @@ metadata:
   name: {{ $gateway.name | default "istio-ingressgateway" }}-service-account
   namespace: {{ $gateway.namespace | default .Release.Namespace }}
   labels:
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
 {{ $gateway.labels | toYaml | trim | indent 4 }}
     release: {{ .Release.Name }}
diff --git a/resources/helm/v2.0/istio-control/istio-discovery/files/gen-istio.yaml b/resources/helm/v2.0/istio-control/istio-discovery/files/gen-istio.yaml
@@ -6,7 +6,7 @@ metadata:
   name: istiod
   namespace: istio-system
   labels:
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
     app: istiod
     istio.io/rev: default
     release: istio
@@ -25,7 +25,7 @@ metadata:
   name: istio
   namespace: istio-system
   labels:
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
     istio.io/rev: default
     release: istio
 data:
@@ -87,7 +87,7 @@ metadata:
   name: istio-sidecar-injector
   namespace: istio-system
   labels:
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
     istio.io/rev: default
     release: istio
 data:
@@ -768,7 +768,7 @@ metadata:
   name: istiod
   namespace: istio-system
   labels:
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
     istio.io/rev: default
     app: istiod
     istio: pilot
@@ -801,7 +801,7 @@ metadata:
   name: istiod
   namespace: istio-system
   labels:
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
     app: istiod
     istio.io/rev: default
     istio: pilot
@@ -949,7 +949,7 @@ metadata:
   namespace: istio-system
   labels:
     maistra-control-plane: {{ .Release.Namespace }}
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
     app: istiod
     release: istio
     istio.io/rev: default
@@ -974,7 +974,7 @@ metadata:
   namespace: istio-system
   labels:
     maistra-control-plane: {{ .Release.Namespace }}
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
     istio.io/rev: default
 spec:
   configPatches:
@@ -1007,7 +1007,7 @@ metadata:
   namespace: istio-system
   labels:
     maistra-control-plane: {{ .Release.Namespace }}
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
     istio.io/rev: default
 spec:
   configPatches:
@@ -1105,7 +1105,7 @@ metadata:
   namespace: istio-system
   labels:
     maistra-control-plane: {{ .Release.Namespace }}
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
     istio.io/rev: default
 spec:
   configPatches:
@@ -1142,7 +1142,7 @@ metadata:
   namespace: istio-system
   labels:
     maistra-control-plane: {{ .Release.Namespace }}
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
     istio.io/rev: default
 spec:
   configPatches:
@@ -1199,7 +1199,7 @@ metadata:
   namespace: istio-system
   labels:
     maistra-control-plane: {{ .Release.Namespace }}
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
     istio.io/rev: default
 spec:
   configPatches:
@@ -1309,7 +1309,7 @@ metadata:
   namespace: istio-system
   labels:
     maistra-control-plane: {{ .Release.Namespace }}
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
     istio.io/rev: default
 spec:
   configPatches:
@@ -1412,7 +1412,7 @@ metadata:
   namespace: istio-system
   labels:
     maistra-control-plane: {{ .Release.Namespace }}
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
     istio.io/rev: default
 spec:
   configPatches:
@@ -1450,7 +1450,7 @@ metadata:
   namespace: istio-system
   labels:
     maistra-control-plane: {{ .Release.Namespace }}
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
     istio.io/rev: default
 spec:
   configPatches:
@@ -1510,7 +1510,7 @@ metadata:
   namespace: istio-system
   labels:
     maistra-control-plane: {{ .Release.Namespace }}
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
     istio.io/rev: default
 spec:
   configPatches:
@@ -1620,7 +1620,7 @@ metadata:
   namespace: istio-system
   labels:
     maistra-control-plane: {{ .Release.Namespace }}
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
     istio.io/rev: default
 spec:
   configPatches:
@@ -1724,7 +1724,7 @@ metadata:
 
   labels:
     maistra-control-plane: {{ .Release.Namespace }}
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
     istio.io/rev: default
     app: sidecar-injector
     release: istio

diff --git a/resources/helm/v2.0/istio-control/istio-discovery/templates/autoscale.yaml b/resources/helm/v2.0/istio-control/istio-discovery/templates/autoscale.yaml
@@ -5,7 +5,7 @@ metadata:
   name: istiod-{{ .Values.revision | default "default" }}
   namespace: {{ .Release.Namespace }}
   labels:
-    maistra-version: 2.0.0.2
+    maistra-version: "2.0.0.2"
     app: istiod
     release: {{ .Release.Name }}
     istio.io/rev: {{ .Values.revision | default "default" }}