Add comma only if labels are not empty

vmware-tanzu · Nov 23, 2022 · 8deb9f2 · 8deb9f2
1 parent e1ebb73
commit 8deb9f2
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 0 deletions.
diff --git a/packages/tkg-clusterclass-aws/bundle/config/upstream/base.yaml b/packages/tkg-clusterclass-aws/bundle/config/upstream/base.yaml
@@ -524,7 +524,9 @@ spec:
             {{- $key }}={{ $val }}
             {{- end }}
             {{- if .controlPlane.nodeLabels -}}
+              {{- if (index .TKR_DATA .builtin.controlPlane.version).labels -}}
               ,
+              {{- end -}}
               {{- $first := true }}
               {{- range .controlPlane.nodeLabels }}
                 {{- if $first }}
@@ -549,7 +551,9 @@ spec:
             {{- $key }}={{ $val }}
             {{- end }}
             {{- if .controlPlane.nodeLabels -}}
+              {{- if (index .TKR_DATA .builtin.controlPlane.version).labels -}}
               ,
+              {{- end -}}
               {{- $first := true }}
               {{- range .controlPlane.nodeLabels }}
                 {{- if $first }}

diff --git a/packages/tkg-clusterclass-azure/bundle/config/upstream/base.yaml b/packages/tkg-clusterclass-azure/bundle/config/upstream/base.yaml
@@ -769,7 +769,9 @@ spec:
             {{- $key -}} = {{- $val }}
             {{- end }}
             {{- if .controlPlane.nodeLabels -}}
+              {{- if (index .TKR_DATA .builtin.controlPlane.version).labels -}}
               ,
+              {{- end -}}
               {{- $first := true }}
               {{- range .controlPlane.nodeLabels }}
                 {{- if $first }}
@@ -794,7 +796,9 @@ spec:
             {{- $key -}} = {{- $val }}
             {{- end }}
             {{- if .controlPlane.nodeLabels -}}
+              {{- if (index .TKR_DATA .builtin.controlPlane.version).labels -}}
               ,
+              {{- end -}}
               {{- $first := true }}
               {{- range .controlPlane.nodeLabels }}
                 {{- if $first }}

diff --git a/packages/tkg-clusterclass-vsphere/bundle/config/upstream/base.yaml b/packages/tkg-clusterclass-vsphere/bundle/config/upstream/base.yaml
@@ -972,7 +972,9 @@ spec:
             {{- end }}
             {{- end }}
             {{- if .controlPlane.nodeLabels -}}
+              {{- if (index .TKR_DATA .builtin.controlPlane.version).labels -}}
               ,
+              {{- end -}}
               {{- $first := true }}
               {{- range .controlPlane.nodeLabels }}
                 {{- if $first }}
@@ -999,7 +1001,9 @@ spec:
             {{- end }}
             {{- end }}
             {{- if .controlPlane.nodeLabels -}}
+              {{- if (index .TKR_DATA .builtin.controlPlane.version).labels -}}
               ,
+              {{- end -}}
               {{- $first := true }}
               {{- range .controlPlane.nodeLabels }}
                 {{- if $first }}

diff --git a/providers/infrastructure-aws/v2.0.0-beta.1/cconly/base.yaml b/providers/infrastructure-aws/v2.0.0-beta.1/cconly/base.yaml
@@ -524,7 +524,9 @@ spec:
             {{- $key }}={{ $val }}
             {{- end }}
             {{- if .controlPlane.nodeLabels -}}
+              {{- if (index .TKR_DATA .builtin.controlPlane.version).labels -}}
               ,
+              {{- end -}}
               {{- $first := true }}
               {{- range .controlPlane.nodeLabels }}
                 {{- if $first }}
@@ -549,7 +551,9 @@ spec:
             {{- $key }}={{ $val }}
             {{- end }}
             {{- if .controlPlane.nodeLabels -}}
+              {{- if (index .TKR_DATA .builtin.controlPlane.version).labels -}}
               ,
+              {{- end -}}
               {{- $first := true }}
               {{- range .controlPlane.nodeLabels }}
                 {{- if $first }}

diff --git a/providers/infrastructure-azure/v1.5.3/cconly/base.yaml b/providers/infrastructure-azure/v1.5.3/cconly/base.yaml
@@ -769,7 +769,9 @@ spec:
             {{- $key -}} = {{- $val }}
             {{- end }}
             {{- if .controlPlane.nodeLabels -}}
+              {{- if (index .TKR_DATA .builtin.controlPlane.version).labels -}}
               ,
+              {{- end -}}
               {{- $first := true }}
               {{- range .controlPlane.nodeLabels }}
                 {{- if $first }}
@@ -794,7 +796,9 @@ spec:
             {{- $key -}} = {{- $val }}
             {{- end }}
             {{- if .controlPlane.nodeLabels -}}
+              {{- if (index .TKR_DATA .builtin.controlPlane.version).labels -}}
               ,
+              {{- end -}}
               {{- $first := true }}
               {{- range .controlPlane.nodeLabels }}
                 {{- if $first }}

diff --git a/providers/infrastructure-vsphere/v1.4.1/cconly/base.yaml b/providers/infrastructure-vsphere/v1.4.1/cconly/base.yaml
@@ -972,7 +972,9 @@ spec:
             {{- end }}
             {{- end }}
             {{- if .controlPlane.nodeLabels -}}
+              {{- if (index .TKR_DATA .builtin.controlPlane.version).labels -}}
               ,
+              {{- end -}}
               {{- $first := true }}
               {{- range .controlPlane.nodeLabels }}
                 {{- if $first }}
@@ -999,7 +1001,9 @@ spec:
             {{- end }}
             {{- end }}
             {{- if .controlPlane.nodeLabels -}}
+              {{- if (index .TKR_DATA .builtin.controlPlane.version).labels -}}
               ,
+              {{- end -}}
               {{- $first := true }}
               {{- range .controlPlane.nodeLabels }}
                 {{- if $first }}