linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Properly version Helm charts for extensions (#7568) 

This follows up the the versioning scheme used for `linkerd-crds` and
`linkerd-control-plane` but for extension charts. So no longer will
a chart's `version` just mimic `appVersion`'s value, but instead it'll
change depending on how the chart changes on each realease.

Unfortunately this means a bit more of manual work during releases, but
we should be able to automate some of it at some point.
This commit is contained in:
Alejandro Pedraza 2022-01-06 15:59:08 -05:00 committed by GitHub
parent 9b5aff5749
commit d20d318c13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/helm-build
View File

@ -68,10 +68,10 @@ if [ "$1" = package ]; then
"$bindir"/helm -d "$rootdir"/target/helm package "$rootdir"/charts/linkerd-crds
"$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
"$bindir"/helm --version "$version" --app-version "$tag" -d "$rootdir"/target/helm package "$rootdir"/viz/charts/linkerd-viz
"$bindir"/helm --app-version "$tag" -d "$rootdir"/target/helm package "$rootdir"/charts/linkerd2-cni
"$bindir"/helm --app-version "$tag" -d "$rootdir"/target/helm package "$rootdir"/multicluster/charts/linkerd-multicluster
"$bindir"/helm --app-version "$tag" -d "$rootdir"/target/helm package "$rootdir"/jaeger/charts/linkerd-jaeger
"$bindir"/helm --app-version "$tag" -d "$rootdir"/target/helm package "$rootdir"/viz/charts/linkerd-viz
mv "$rootdir"/target/helm/index-pre.yaml "$rootdir"/target/helm/index-pre-"$version".yaml
"$bindir"/helm repo index --url "https://helm.linkerd.io/$repo/" --merge "$rootdir"/target/helm/index-pre-"$version".yaml "$rootdir"/target/helm

2
charts/linkerd2-cni/Chart.yaml
View File

@ -9,5 +9,5 @@ description: |
kubeVersion: ">=1.20.0-0"
icon: https://linkerd.io/images/logo-only-200h.png
name: "linkerd2-cni"
version: 0.1.0
version: 1.0.0-edge

2
charts/linkerd2-cni/README.md
View File

@ -6,7 +6,7 @@ Linkerd [CNI plugin](https://linkerd.io/2/features/cni/) takes care of setting
up your pod's network so incoming and outgoing traffic is proxied through the
data plane.
![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)
![AppVersion: edge-XX.X.X](https://img.shields.io/badge/AppVersion-edge--XX.X.X-informational?style=flat-square)

3
jaeger/charts/linkerd-jaeger/Chart.yaml
View File

@ -11,8 +11,7 @@ kubeVersion: ">=1.20.0-0"
name: linkerd-jaeger
sources:
- https://github.com/linkerd/linkerd2/
# 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

2
jaeger/charts/linkerd-jaeger/README.md
View File

@ -3,7 +3,7 @@
The Linkerd-Jaeger extension adds distributed tracing to Linkerd using
OpenCensus and Jaeger.
![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)
![AppVersion: edge-XX.X.X](https://img.shields.io/badge/AppVersion-edge--XX.X.X-informational?style=flat-square)

3
multicluster/charts/linkerd-multicluster/Chart.yaml
View File

@ -11,8 +11,7 @@ kubeVersion: ">=1.20.0-0"
name: "linkerd-multicluster"
sources:
- https://github.com/linkerd/linkerd2/
# 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

2
multicluster/charts/linkerd-multicluster/README.md
View File

@ -3,7 +3,7 @@
The Linkerd-Multicluster extension contains resources to support multicluster
linking to remote clusters
![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)
![AppVersion: edge-XX.X.X](https://img.shields.io/badge/AppVersion-edge--XX.X.X-informational?style=flat-square)

3
viz/charts/linkerd-viz/Chart.yaml
View File

@ -11,8 +11,7 @@ kubeVersion: ">=1.20.0-0"
name: "linkerd-viz"
sources:
- https://github.com/linkerd/linkerd2/
# 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

2
viz/charts/linkerd-viz/README.md
View File

@ -3,7 +3,7 @@
The Linkerd-Viz extension contains observability and visualization
components for Linkerd.
![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)
![AppVersion: edge-XX.X.X](https://img.shields.io/badge/AppVersion-edge--XX.X.X-informational?style=flat-square)