From d4bda1833c944a527d9d84359ee8bc3826dd2f18 Mon Sep 17 00:00:00 2001 From: Arvind Iyengar Date: Thu, 25 Feb 2021 18:39:02 -0800 Subject: [PATCH] Bump all packageVersions and introduce comment Why do we need to bump all the packageVersions? The new charts-build-scripts treat Chart.yaml and requirements.yaml as "managed files", which means that the scripts themselves can make changes to those files. When the scripts touch those files (e.g. to add a new dependency based on the contents of generated-changes/dependencies or to patch a rcVersion or packageVersion to the chart), dumping back out the YAML results in slight changes due to the unmarshalling process, such as the re-ordering of annotations. Since these minor changes comprise a change introduced by Rancher and the scripts refuse changes that modify already released packages, the simple fix for this is just to universally bump the packageVersion as part of the migration process. As part of creating this PR, I generated these minor changes in https://github.com/aiyengar2/charts-diff/tree/rke2-charts/diff so that we can sign off that these are indeed inconsequential to the migration. For context, the process used to generate these files was: - Pull in the current branch. Run make charts with the old scripts - Pull in the migration branch. Run make charts with the new scripts - Dump the diff between them in a patch file Signed-off-by: Arvind Iyengar --- packages/rke2-canal/package.yaml | 3 ++- packages/rke2-coredns/package.yaml | 3 ++- packages/rke2-ingress-nginx/package.yaml | 3 ++- packages/rke2-kube-proxy/package.yaml | 3 ++- packages/rke2-metrics-server/package.yaml | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/rke2-canal/package.yaml b/packages/rke2-canal/package.yaml index ad1b360..0b309fe 100644 --- a/packages/rke2-canal/package.yaml +++ b/packages/rke2-canal/package.yaml @@ -1,3 +1,4 @@ url: local -packageVersion: 00 +packageVersion: 01 +# This repository does not use releaseCandidateVersions, so you can leave this as 00. releaseCandidateVersion: 00 diff --git a/packages/rke2-coredns/package.yaml b/packages/rke2-coredns/package.yaml index c410395..da4fe13 100644 --- a/packages/rke2-coredns/package.yaml +++ b/packages/rke2-coredns/package.yaml @@ -1,3 +1,4 @@ url: https://charts.helm.sh/stable/packages/coredns-1.10.1.tgz -packageVersion: 01 +packageVersion: 02 +# This repository does not use releaseCandidateVersions, so you can leave this as 00. releaseCandidateVersion: 00 diff --git a/packages/rke2-ingress-nginx/package.yaml b/packages/rke2-ingress-nginx/package.yaml index 69f555d..f8f416b 100644 --- a/packages/rke2-ingress-nginx/package.yaml +++ b/packages/rke2-ingress-nginx/package.yaml @@ -1,3 +1,4 @@ url: https://github.com/kubernetes/ingress-nginx/releases/download/ingress-nginx-3.3.0/ingress-nginx-3.3.0.tgz -packageVersion: 00 +packageVersion: 01 +# This repository does not use releaseCandidateVersions, so you can leave this as 00. releaseCandidateVersion: 00 diff --git a/packages/rke2-kube-proxy/package.yaml b/packages/rke2-kube-proxy/package.yaml index ad1b360..0b309fe 100644 --- a/packages/rke2-kube-proxy/package.yaml +++ b/packages/rke2-kube-proxy/package.yaml @@ -1,3 +1,4 @@ url: local -packageVersion: 00 +packageVersion: 01 +# This repository does not use releaseCandidateVersions, so you can leave this as 00. releaseCandidateVersion: 00 diff --git a/packages/rke2-metrics-server/package.yaml b/packages/rke2-metrics-server/package.yaml index 46f880a..6b61ee5 100644 --- a/packages/rke2-metrics-server/package.yaml +++ b/packages/rke2-metrics-server/package.yaml @@ -1,3 +1,3 @@ url: https://charts.helm.sh/stable/packages/metrics-server-2.11.1.tgz -packageVersion: 00 +packageVersion: 01 releaseCandidateVersion: 00