Set up helm charts versioning (#7448)

* Set up helm charts versioning

Implements part of #7405

Separates `version` from `appVersion` in both `linkerd-crds` and
`linkerd-control-plane` charts.

In `linkerd-crds` embeds `version` as a label in the CRDs.

In `linkerd-control-plane`, embeds `linkerd-crds`'s `version` as a new
entry in the `linkerd-config` ConfigMap, to use in a new `linkerd check`
that will be implemented in a separate PR.

bin/helm-build

@@ -68,7 +68,7 @@ if [ "$1" = package ]; then
     setValues "linkerdVersionValue" "$fullVersion"
 
     "$bindir"/helm -d "$rootdir"/target/helm package "$rootdir"/charts/linkerd-crds
-    "$bindir"/helm --version "$version" --app-version "$tag" -d "$rootdir"/target/helm package "$rootdir"/charts/linkerd-control-plane
+    "$bindir"/helm --app-version "$tag" -d "$rootdir"/target/helm package "$rootdir"/charts/linkerd-control-plane
     "$bindir"/helm --version "$version" --app-version "$tag" -d "$rootdir"/target/helm package "$rootdir"/charts/linkerd2-cni
     "$bindir"/helm --version "$version" --app-version "$tag" -d "$rootdir"/target/helm package "$rootdir"/multicluster/charts/linkerd-multicluster
     "$bindir"/helm --version "$version" --app-version "$tag" -d "$rootdir"/target/helm package "$rootdir"/jaeger/charts/linkerd-jaeger

charts/linkerd-control-plane/Chart.yaml

@@ -16,8 +16,7 @@ dependencies:
 - name: partials
   version: 0.1.0
   repository: file://../partials
-# this version will be updated by the CI before publishing the Helm tarball
-version: 0.1.0
+version: 1.0.0-edge
 icon: https://linkerd.io/images/logo-only-200h.png
 maintainers:
   - name: Linkerd authors

charts/linkerd-control-plane/README.md

@@ -3,7 +3,7 @@
 Linkerd gives you observability, reliability, and security
 for your microservices — with no code change required.
 
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square)
+![Version: 1.0.0-edge](https://img.shields.io/badge/Version-1.0.0--edge-informational?style=flat-square)
 ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 ![AppVersion: edge-XX.X.X](https://img.shields.io/badge/AppVersion-edge--XX.X.X-informational?style=flat-square)
 

charts/linkerd-control-plane/templates/config.yaml

@@ -10,6 +10,7 @@ metadata:
   annotations:
     {{ include "partials.annotations.created-by" . }}
 data:
+  linkerd-crds-chart-version: linkerd-crds-1.0.0-edge
   values: |
   {{- $values := deepCopy .Values }}
   {{- /*

charts/linkerd-crds/Chart.yaml

@@ -1,6 +1,4 @@
 apiVersion: "v2"
-# this version will be updated by the CI before publishing the Helm tarball
-appVersion: edge-XX.X.X
 description: |
   Linkerd gives you observability, reliability, and security
   for your microservices — with no code change required.
@@ -16,8 +14,7 @@ dependencies:
 - name: partials
   version: 0.1.0
   repository: file://../partials
-# this version will be updated by the CI before publishing the Helm tarball
-version: 0.1.0
+version: 1.0.0-edge
 icon: https://linkerd.io/images/logo-only-200h.png
 maintainers:
   - name: Linkerd authors

charts/linkerd-crds/README.md

@@ -3,9 +3,8 @@
 Linkerd gives you observability, reliability, and security
 for your microservices — with no code change required.
 
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square)
+![Version: 1.0.0-edge](https://img.shields.io/badge/Version-1.0.0--edge-informational?style=flat-square)
 ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
-![AppVersion: edge-XX.X.X](https://img.shields.io/badge/AppVersion-edge--XX.X.X-informational?style=flat-square)
 
 **Homepage:** <https://linkerd.io>
 

charts/linkerd-crds/templates/policy-crd.yaml

@@ -6,6 +6,7 @@ metadata:
   annotations:
     {{ include "partials.annotations.created-by" . }}
   labels:
+    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     linkerd.io/control-plane-ns: {{.Release.Namespace}}
 spec:
   group: policy.linkerd.io
@@ -151,6 +152,7 @@ metadata:
   annotations:
     {{ include "partials.annotations.created-by" . }}
   labels:
+    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     linkerd.io/control-plane-ns: {{.Release.Namespace}}
 spec:
   group: policy.linkerd.io

charts/linkerd-crds/templates/serviceprofile-crd.yaml

@@ -9,6 +9,7 @@ metadata:
   annotations:
     {{ include "partials.annotations.created-by" . }}
   labels:
+    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     linkerd.io/control-plane-ns: {{.Release.Namespace}}
 spec:
   group: linkerd.io