fix deployment always update (#1304)

Signed-off-by: DangPeng Liu <[email protected]>
stolostron · Dec 25, 2024 · 9f499ff · 9f499ff
1 parent 7a74c9a
commit 9f499ff
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 5 deletions.
diff --git a/...controllers/agent/manifests/templates/agent/multicluster-global-hub-agent-deployment.yaml b/...controllers/agent/manifests/templates/agent/multicluster-global-hub-agent-deployment.yaml
@@ -73,7 +73,9 @@ spec:
         {{- range .Tolerations}}
         - key: "{{.Key}}"
           operator: "{{.Operator}}"
+          {{- if .Value}}
           value: "{{.Value}}"
+          {{- end}}
           effect: "{{.Effect}}"
           {{- if .TolerationSeconds}}
           tolerationSeconds: {{.TolerationSeconds}}

diff --git a/...ent/manifests/templates/hostedagent/multicluster-global-hub-hosting-agent-deployment.yaml b/...ent/manifests/templates/hostedagent/multicluster-global-hub-hosting-agent-deployment.yaml
@@ -63,7 +63,9 @@ spec:
         {{- range .Tolerations}}
         - key: "{{.Key}}"
           operator: "{{.Operator}}"
+          {{- if .Value}}
           value: "{{.Value}}"
+          {{- end}}
           effect: "{{.Effect}}"
           {{- if .TolerationSeconds}}
           tolerationSeconds: {{.TolerationSeconds}}

diff --git a/operator/pkg/controllers/agent/manifests/templates/hubcluster/hubcluster-mch.yaml b/operator/pkg/controllers/agent/manifests/templates/hubcluster/hubcluster-mch.yaml
@@ -20,7 +20,9 @@ spec:
     {{- range .Tolerations}}
     - key: "{{.Key}}"
       operator: "{{.Operator}}"
+      {{- if .Value}}
       value: "{{.Value}}"
+      {{- end}}
       effect: "{{.Effect}}"
       {{ if .TolerationSeconds }} tolerationSeconds: {{ .TolerationSeconds }} {{- end }}
     {{- end}}

diff --git a/operator/pkg/controllers/grafana/manifests/deployment.yaml b/operator/pkg/controllers/grafana/manifests/deployment.yaml
@@ -167,7 +167,9 @@ spec:
         {{- range .Tolerations}}
         - key: "{{.Key}}"
           operator: "{{.Operator}}"
+          {{- if .Value}}
           value: "{{.Value}}"
+          {{- end}}
           effect: "{{.Effect}}"
           {{- if .TolerationSeconds}}
           tolerationSeconds: {{.TolerationSeconds}}

diff --git a/operator/pkg/controllers/inventory/manifests/deployment.yaml b/operator/pkg/controllers/inventory/manifests/deployment.yaml
@@ -102,7 +102,9 @@ spec:
         {{- range .Tolerations}}
         - key: "{{.Key}}"
           operator: "{{.Operator}}"
+          {{- if .Value}}
           value: "{{.Value}}"
+          {{- end}}
           effect: "{{.Effect}}"
           {{- if .TolerationSeconds}}
           tolerationSeconds: {{.TolerationSeconds}}

diff --git a/operator/pkg/controllers/manager/manifests/deployment.yaml b/operator/pkg/controllers/manager/manifests/deployment.yaml
@@ -151,7 +151,9 @@ spec:
         {{- range .Tolerations}}
         - key: "{{.Key}}"
           operator: "{{.Operator}}"
+          {{- if .Value}}
           value: "{{.Value}}"
+          {{- end}}
           effect: "{{.Effect}}"
           {{- if .TolerationSeconds}}
           tolerationSeconds: {{.TolerationSeconds}}

diff --git a/operator/pkg/controllers/storage/manifests.sts/postgres-statefulset.yaml b/operator/pkg/controllers/storage/manifests.sts/postgres-statefulset.yaml
@@ -130,7 +130,9 @@ spec:
         {{- range .Tolerations}}
         - key: "{{.Key}}"
           operator: "{{.Operator}}"
+          {{- if .Value}}
           value: "{{.Value}}"
+          {{- end}}
           effect: "{{.Effect}}"
           {{- if .TolerationSeconds}}
           tolerationSeconds: {{.TolerationSeconds}}

diff --git a/operator/pkg/renderer/testdata/app/nginx-deployment.yaml b/operator/pkg/renderer/testdata/app/nginx-deployment.yaml
@@ -74,7 +74,9 @@ spec:
         {{- range .Tolerations}}
         - key: "{{.Key}}"
           operator: "{{.Operator}}"
+          {{- if .Value}}
           value: "{{.Value}}"
+          {{- end}}
           effect: "{{.Effect}}"
           {{- if .TolerationSeconds}}
           tolerationSeconds: {{.TolerationSeconds}}

diff --git a/operator/pkg/renderer/testdata/output/all-nginx.golden.yaml b/operator/pkg/renderer/testdata/output/all-nginx.golden.yaml
@@ -49,7 +49,6 @@ spec:
       serviceAccountName: nginx
       tolerations:
       - key: node.kubernetes.io/unreachable
-        value: ""
         operator: Exists
         effect: NoExecute
         tolerationSeconds: 6000

diff --git a/operator/pkg/renderer/testdata/output/all.golden.yaml b/operator/pkg/renderer/testdata/output/all.golden.yaml
@@ -49,7 +49,6 @@ spec:
       serviceAccountName: nginx
       tolerations:
       - key: node.kubernetes.io/unreachable
-        value: ""
         operator: Exists
         effect: NoExecute
         tolerationSeconds: 6000

diff --git a/operator/pkg/renderer/testdata/output/default.golden.yaml b/operator/pkg/renderer/testdata/output/default.golden.yaml
@@ -61,7 +61,6 @@ spec:
       serviceAccountName: nginx
       tolerations:
       - key: node.kubernetes.io/unreachable
-        value: ""
         operator: Exists
         effect: NoExecute
         tolerationSeconds: 6000

diff --git a/operator/pkg/renderer/testdata/output/external.golden.yaml b/operator/pkg/renderer/testdata/output/external.golden.yaml
@@ -50,7 +50,6 @@ spec:
       serviceAccountName: nginx
       tolerations:
       - key: node.kubernetes.io/unreachable
-        value: ""
         operator: Exists
         effect: NoExecute
         tolerationSeconds: 6000

diff --git a/operator/pkg/renderer/testdata/output/ha.golden.yaml b/operator/pkg/renderer/testdata/output/ha.golden.yaml
@@ -60,7 +60,6 @@ spec:
       serviceAccountName: nginx
       tolerations:
       - key: node.kubernetes.io/unreachable
-        value: ""
         operator: Exists
         effect: NoExecute
         tolerationSeconds: 6000