diff --git a/bin/helm-build b/bin/helm-build index 0c25845924835..f437ea45c010e 100755 --- a/bin/helm-build +++ b/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 diff --git a/charts/linkerd-control-plane/Chart.yaml b/charts/linkerd-control-plane/Chart.yaml index 5100859f9f8c0..377733487c708 100644 --- a/charts/linkerd-control-plane/Chart.yaml +++ b/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 diff --git a/charts/linkerd-control-plane/README.md b/charts/linkerd-control-plane/README.md index 2b78b1a011a6a..199d56f43005b 100644 --- a/charts/linkerd-control-plane/README.md +++ b/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) diff --git a/charts/linkerd-control-plane/templates/config.yaml b/charts/linkerd-control-plane/templates/config.yaml index 51f7b32de90d7..0ccddbb5ea9ef 100644 --- a/charts/linkerd-control-plane/templates/config.yaml +++ b/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 }} {{- /* diff --git a/charts/linkerd-crds/Chart.yaml b/charts/linkerd-crds/Chart.yaml index 021275d95a8f6..e7ec4b7086134 100644 --- a/charts/linkerd-crds/Chart.yaml +++ b/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 diff --git a/charts/linkerd-crds/README.md b/charts/linkerd-crds/README.md index 101de0fe90ead..cb8a552163393 100644 --- a/charts/linkerd-crds/README.md +++ b/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:** diff --git a/charts/linkerd-crds/templates/policy-crd.yaml b/charts/linkerd-crds/templates/policy-crd.yaml index 3f6efcb1d8903..56aa92651a99d 100644 --- a/charts/linkerd-crds/templates/policy-crd.yaml +++ b/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 diff --git a/charts/linkerd-crds/templates/serviceprofile-crd.yaml b/charts/linkerd-crds/templates/serviceprofile-crd.yaml index 8e8ceb883438c..647adab7b6bb6 100644 --- a/charts/linkerd-crds/templates/serviceprofile-crd.yaml +++ b/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 diff --git a/cli/cmd/testdata/install_controlplane_tracing_output.golden b/cli/cmd/testdata/install_controlplane_tracing_output.golden index 049ab3473f69a..129000032d7d0 100644 --- a/cli/cmd/testdata/install_controlplane_tracing_output.golden +++ b/cli/cmd/testdata/install_controlplane_tracing_output.golden @@ -6,6 +6,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -151,6 +152,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -439,6 +441,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: linkerd.io @@ -1131,6 +1134,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined data: + linkerd-crds-chart-version: linkerd-crds-1.0.0-edge values: | cliVersion: linkerd/cli dev-undefined clusterDomain: cluster.local diff --git a/cli/cmd/testdata/install_custom_domain.golden b/cli/cmd/testdata/install_custom_domain.golden index bcd1a7c791831..629a27767b060 100644 --- a/cli/cmd/testdata/install_custom_domain.golden +++ b/cli/cmd/testdata/install_custom_domain.golden @@ -6,6 +6,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -151,6 +152,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -439,6 +441,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: linkerd.io @@ -1131,6 +1134,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined data: + linkerd-crds-chart-version: linkerd-crds-1.0.0-edge values: | cliVersion: linkerd/cli dev-undefined clusterDomain: cluster.local diff --git a/cli/cmd/testdata/install_custom_registry.golden b/cli/cmd/testdata/install_custom_registry.golden index 1e6da928a125b..47a7c8838398b 100644 --- a/cli/cmd/testdata/install_custom_registry.golden +++ b/cli/cmd/testdata/install_custom_registry.golden @@ -6,6 +6,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -151,6 +152,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -439,6 +441,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: linkerd.io @@ -1131,6 +1134,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined data: + linkerd-crds-chart-version: linkerd-crds-1.0.0-edge values: | cliVersion: linkerd/cli dev-undefined clusterDomain: cluster.local diff --git a/cli/cmd/testdata/install_default.golden b/cli/cmd/testdata/install_default.golden index bcd1a7c791831..629a27767b060 100644 --- a/cli/cmd/testdata/install_default.golden +++ b/cli/cmd/testdata/install_default.golden @@ -6,6 +6,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -151,6 +152,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -439,6 +441,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: linkerd.io @@ -1131,6 +1134,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined data: + linkerd-crds-chart-version: linkerd-crds-1.0.0-edge values: | cliVersion: linkerd/cli dev-undefined clusterDomain: cluster.local diff --git a/cli/cmd/testdata/install_default_override_dst_get_nets.golden b/cli/cmd/testdata/install_default_override_dst_get_nets.golden index 8b348d4cdd9be..6b9cad0d7f95e 100644 --- a/cli/cmd/testdata/install_default_override_dst_get_nets.golden +++ b/cli/cmd/testdata/install_default_override_dst_get_nets.golden @@ -6,6 +6,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -151,6 +152,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -439,6 +441,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: linkerd.io @@ -1131,6 +1134,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined data: + linkerd-crds-chart-version: linkerd-crds-1.0.0-edge values: | cliVersion: linkerd/cli dev-undefined clusterDomain: cluster.local diff --git a/cli/cmd/testdata/install_default_token.golden b/cli/cmd/testdata/install_default_token.golden index e8fa7dadb219b..ae78e5992bec7 100644 --- a/cli/cmd/testdata/install_default_token.golden +++ b/cli/cmd/testdata/install_default_token.golden @@ -6,6 +6,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -151,6 +152,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -439,6 +441,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: linkerd.io @@ -1131,6 +1134,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined data: + linkerd-crds-chart-version: linkerd-crds-1.0.0-edge values: | cliVersion: linkerd/cli dev-undefined clusterDomain: cluster.local diff --git a/cli/cmd/testdata/install_ha_output.golden b/cli/cmd/testdata/install_ha_output.golden index 1991519bf39b2..88633d01b7888 100644 --- a/cli/cmd/testdata/install_ha_output.golden +++ b/cli/cmd/testdata/install_ha_output.golden @@ -6,6 +6,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -151,6 +152,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -439,6 +441,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: linkerd.io @@ -1131,6 +1134,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined data: + linkerd-crds-chart-version: linkerd-crds-1.0.0-edge values: | cliVersion: linkerd/cli dev-undefined clusterDomain: cluster.local diff --git a/cli/cmd/testdata/install_ha_with_overrides_output.golden b/cli/cmd/testdata/install_ha_with_overrides_output.golden index d352da19f0b44..d5301244d291f 100644 --- a/cli/cmd/testdata/install_ha_with_overrides_output.golden +++ b/cli/cmd/testdata/install_ha_with_overrides_output.golden @@ -6,6 +6,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -151,6 +152,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -439,6 +441,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: linkerd.io @@ -1131,6 +1134,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined data: + linkerd-crds-chart-version: linkerd-crds-1.0.0-edge values: | cliVersion: linkerd/cli dev-undefined clusterDomain: cluster.local diff --git a/cli/cmd/testdata/install_heartbeat_disabled_output.golden b/cli/cmd/testdata/install_heartbeat_disabled_output.golden index 99ebf9fb926ff..ebbf2f57efe43 100644 --- a/cli/cmd/testdata/install_heartbeat_disabled_output.golden +++ b/cli/cmd/testdata/install_heartbeat_disabled_output.golden @@ -6,6 +6,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -151,6 +152,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -439,6 +441,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: linkerd.io @@ -1062,6 +1065,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined data: + linkerd-crds-chart-version: linkerd-crds-1.0.0-edge values: | cliVersion: linkerd/cli dev-undefined clusterDomain: cluster.local diff --git a/cli/cmd/testdata/install_helm_control_plane_output.golden b/cli/cmd/testdata/install_helm_control_plane_output.golden index 1e0913f166654..c74f053323f85 100644 --- a/cli/cmd/testdata/install_helm_control_plane_output.golden +++ b/cli/cmd/testdata/install_helm_control_plane_output.golden @@ -424,6 +424,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/helm linkerd-version data: + linkerd-crds-chart-version: linkerd-crds-1.0.0-edge values: | cliVersion: "" clusterDomain: cluster.local diff --git a/cli/cmd/testdata/install_helm_control_plane_output_ha.golden b/cli/cmd/testdata/install_helm_control_plane_output_ha.golden index 0fbf4e63b4181..3c3fbf790c476 100644 --- a/cli/cmd/testdata/install_helm_control_plane_output_ha.golden +++ b/cli/cmd/testdata/install_helm_control_plane_output_ha.golden @@ -424,6 +424,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/helm linkerd-version data: + linkerd-crds-chart-version: linkerd-crds-1.0.0-edge values: | cliVersion: "" clusterDomain: cluster.local diff --git a/cli/cmd/testdata/install_helm_crds_output.golden b/cli/cmd/testdata/install_helm_crds_output.golden index 91d141c475120..4f5983ed7fb1a 100644 --- a/cli/cmd/testdata/install_helm_crds_output.golden +++ b/cli/cmd/testdata/install_helm_crds_output.golden @@ -8,6 +8,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/helm linkerd-version labels: + helm.sh/chart: linkerd-crds- linkerd.io/control-plane-ns: linkerd-dev spec: group: policy.linkerd.io @@ -153,6 +154,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/helm linkerd-version labels: + helm.sh/chart: linkerd-crds- linkerd.io/control-plane-ns: linkerd-dev spec: group: policy.linkerd.io @@ -443,6 +445,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/helm linkerd-version labels: + helm.sh/chart: linkerd-crds- linkerd.io/control-plane-ns: linkerd-dev spec: group: linkerd.io diff --git a/cli/cmd/testdata/install_helm_crds_output_ha.golden b/cli/cmd/testdata/install_helm_crds_output_ha.golden index 91d141c475120..4f5983ed7fb1a 100644 --- a/cli/cmd/testdata/install_helm_crds_output_ha.golden +++ b/cli/cmd/testdata/install_helm_crds_output_ha.golden @@ -8,6 +8,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/helm linkerd-version labels: + helm.sh/chart: linkerd-crds- linkerd.io/control-plane-ns: linkerd-dev spec: group: policy.linkerd.io @@ -153,6 +154,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/helm linkerd-version labels: + helm.sh/chart: linkerd-crds- linkerd.io/control-plane-ns: linkerd-dev spec: group: policy.linkerd.io @@ -443,6 +445,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/helm linkerd-version labels: + helm.sh/chart: linkerd-crds- linkerd.io/control-plane-ns: linkerd-dev spec: group: linkerd.io diff --git a/cli/cmd/testdata/install_helm_output_ha_labels.golden b/cli/cmd/testdata/install_helm_output_ha_labels.golden index 7c9cd9621e2cd..0b5b539bc7cd2 100644 --- a/cli/cmd/testdata/install_helm_output_ha_labels.golden +++ b/cli/cmd/testdata/install_helm_output_ha_labels.golden @@ -424,6 +424,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/helm linkerd-version data: + linkerd-crds-chart-version: linkerd-crds-1.0.0-edge values: | cliVersion: "" clusterDomain: cluster.local diff --git a/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden b/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden index a2ebfd26642b6..d58e490cb87dd 100644 --- a/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden +++ b/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden @@ -424,6 +424,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/helm linkerd-version data: + linkerd-crds-chart-version: linkerd-crds-1.0.0-edge values: | cliVersion: "" clusterDomain: cluster.local diff --git a/cli/cmd/testdata/install_no_init_container.golden b/cli/cmd/testdata/install_no_init_container.golden index 9556865e43fca..707d85f0ec571 100644 --- a/cli/cmd/testdata/install_no_init_container.golden +++ b/cli/cmd/testdata/install_no_init_container.golden @@ -6,6 +6,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -151,6 +152,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -439,6 +441,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: linkerd.io @@ -1131,6 +1134,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined data: + linkerd-crds-chart-version: linkerd-crds-1.0.0-edge values: | cliVersion: linkerd/cli dev-undefined clusterDomain: cluster.local diff --git a/cli/cmd/testdata/install_output.golden b/cli/cmd/testdata/install_output.golden index 704de4e0f4de1..151a01515de93 100644 --- a/cli/cmd/testdata/install_output.golden +++ b/cli/cmd/testdata/install_output.golden @@ -6,6 +6,7 @@ metadata: annotations: linkerd.io/created-by: CliVersion labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -151,6 +152,7 @@ metadata: annotations: linkerd.io/created-by: CliVersion labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -439,6 +441,7 @@ metadata: annotations: linkerd.io/created-by: CliVersion labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: linkerd.io @@ -1128,6 +1131,7 @@ metadata: annotations: linkerd.io/created-by: CliVersion data: + linkerd-crds-chart-version: linkerd-crds-1.0.0-edge values: | cliVersion: CliVersion clusterDomain: cluster.local diff --git a/cli/cmd/testdata/install_proxy_ignores.golden b/cli/cmd/testdata/install_proxy_ignores.golden index 60629f5e2b27e..ff0a83e1abe2a 100644 --- a/cli/cmd/testdata/install_proxy_ignores.golden +++ b/cli/cmd/testdata/install_proxy_ignores.golden @@ -6,6 +6,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -151,6 +152,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -439,6 +441,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: linkerd.io @@ -1131,6 +1134,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined data: + linkerd-crds-chart-version: linkerd-crds-1.0.0-edge values: | cliVersion: linkerd/cli dev-undefined clusterDomain: cluster.local diff --git a/cli/cmd/testdata/install_values_file.golden b/cli/cmd/testdata/install_values_file.golden index d01a8ec4f0feb..7330bf6ba5d4c 100644 --- a/cli/cmd/testdata/install_values_file.golden +++ b/cli/cmd/testdata/install_values_file.golden @@ -6,6 +6,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -151,6 +152,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -439,6 +441,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: + helm.sh/chart: linkerd-control-plane-1.0.0-edge linkerd.io/control-plane-ns: linkerd spec: group: linkerd.io @@ -1131,6 +1134,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined data: + linkerd-crds-chart-version: linkerd-crds-1.0.0-edge values: | cliVersion: linkerd/cli dev-undefined clusterDomain: example.com