Fix for: zrok & ziti-router helm charts. Remove duplicated already defined labels

[qdrddr]

• zrok
• ziti-router

Remove from spec.template.metadata.labels duplicated already defined labels:

• app.kubernetes.io/managed-by
• app.kubernetes.io/instance
• helm.sh/chart

So it would not prevent deploying these helm charts, otherwise you can see error "unmarshal errors [...] mapping key [...] already defined"

apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
helmCharts:
  - name: zrok
    repo: https://docs.openziti.io/helm-charts/
#    version: 0.2.7
    version: 0.2.7
    releaseName: zrok
    namespace: openziti-system
    valuesFile: zrok-values.yaml
    includeCRDs: true

  - name: ziti-router
    repo: https://docs.openziti.io/helm-charts/
#    version: 1.1.7
    version: 1.1.7
    releaseName: ziti-router
    namespace: openziti-system
    valuesFile: ziti-router-values.yaml
    includeCRDs: true

If not fixed, you'll get:

kustomize build ./kustomizations --enable-helm > ./openziti.kustimized.yaml
Error: map[string]interface {}(nil): yaml: unmarshal errors:
  line 27: mapping key "app.kubernetes.io/managed-by" already defined at line 22
  line 29: mapping key "app.kubernetes.io/instance" already defined at line 23
  line 25: mapping key "helm.sh/chart" already defined at line 24

If I manually remove the duplicated lebels from spec.template.metadata.labels when I inflate the helm chart the resulting manifest will have spec.template.metadata.labels set inherited from the helm chart, confirming that setting them in the template is unneccessary.

[qrkourier]

Looks good. Thank you for sharing your rationale and for the patch!

[qdrddr]

@qrkourier which versions of zrok & ziti-router helm charts will this be merged to?
the same or the next? And when it will be ready? Thanks

Current versions are:

• zrok 0.2.7
• ziti-router 1.1.7

[qrkourier]

These changes are now in latest: https://github.com/openziti/helm-charts/releases