ci: adds n-2 flag

Author: faiq

hack/addons/generate-mindthegap-repofile.sh

@@ -13,14 +13,20 @@ ASSETS_DIR="$(mktemp -d -p "${TMPDIR:-/tmp}")"
 cp "${GIT_REPO_ROOT}/charts/cluster-api-runtime-extensions-nutanix/templates/helm-config.yaml" "${ASSETS_DIR}"
 
 gh release download "${PREVIOUS_CAREN_CHARTS_VERSION}" \
-  -p "runtime-extension-components.yaml" -D "${ASSETS_DIR}/" --clobber
+  -p "runtime-extension-components.yaml" -O "${ASSETS_DIR}/runtime-extension-components-n-1.yaml"
 
-yq e '. | select(.metadata.name == "default-helm-addons-config")' >>"${ASSETS_DIR}/previous-charts.yaml" <"${ASSETS_DIR}/runtime-extension-components.yaml"
+gh release download "${CAREN_CHARTS_VERSION_N_MINUS_2}" \
+  -p "runtime-extension-components.yaml" -O "${ASSETS_DIR}/runtime-extension-components-n-2.yaml"
+
+yq e '. | select(.metadata.name == "default-helm-addons-config")' >>"${ASSETS_DIR}/previous-charts.yaml" <"${ASSETS_DIR}/runtime-extension-components-n-1.yaml"
+
+yq e '. | select(.metadata.name == "default-helm-addons-config")' >>"${ASSETS_DIR}/n-2-charts.yaml" <"${ASSETS_DIR}/runtime-extension-components-n-2.yaml"
 
 # this sed line is needed because the go library is unable to parse yaml with a template string.
 sed -i s/"{{ .Values.helmAddonsConfigMap }}"/placeholder/g "${ASSETS_DIR}/helm-config.yaml"
 go run "${GIT_REPO_ROOT}/hack/tools/mindthegap-helm-reg/main.go" --input-configmap-file="${ASSETS_DIR}/helm-config.yaml" --output-file="${ASSETS_DIR}/repos.yaml" \
-  --previous-configmap-file="${ASSETS_DIR}/previous-charts.yaml"
+  --previous-configmap-file="${ASSETS_DIR}/previous-charts.yaml" \
+  --n-minus-2-configmap-file="${ASSETS_DIR}/n-2-charts.yaml" \
 
 # add warning not to edit file directly
 cat <<EOF >"${GIT_REPO_ROOT}/hack/addons/mindthegap-helm-registry/repos.yaml"

hack/addons/mindthegap-helm-registry/repos.yaml

@@ -51,6 +51,7 @@ repositories:
     charts:
       nutanix-cloud-provider:
       - 0.4.1
+      - 0.4.0
   nutanix-csi-storage:
     repoURL: https://nutanix.github.io/helm-releases/
     charts:

hack/tools/mindthegap-helm-reg/main.go

@@ -41,6 +41,7 @@ func main() {
 		outputFile            string
 		inputConfigMapFile    string
 		previousConfigMapFile string
+		nminus2ConfigMapFile  string
 	)
 	flagSet := flag.NewFlagSet("mindthegap-helm-registry", flag.ExitOnError)
 	flagSet.StringVar(
@@ -61,6 +62,12 @@ func main() {
 		"",
 		"input configmap file to create the mindthegap repo file from",
 	)
+	flagSet.StringVar(
+		&nminus2ConfigMapFile,
+		"n-minus-2-configmap-file",
+		"",
+		"input configmap file to create the mindthegap repo file from",
+	)
 	err := flagSet.Parse(args[1:])
 	if err != nil {
 		log.Error(err, "failed to parse args")
@@ -78,6 +85,11 @@ func main() {
 		log.Error(err, fmt.Sprintf("failed to get configmap from file %s %w", inputConfigMapFile, err))
 	}
 	ConfigMapToHelmChartConfig(&out, previousCm)
+	nMinus2Cm, err := getConfigMapFromFile(nminus2ConfigMapFile)
+	if err != nil {
+		log.Error(err, fmt.Sprintf("failed to get configmap from file %s %w", inputConfigMapFile, err))
+	}
+	ConfigMapToHelmChartConfig(&out, nMinus2Cm)
 	b, err := yaml.Marshal(out)
 	if err != nil {
 		log.Error(err, fmt.Sprintf("failed to marshal obj %v", out))

make/addons.mk

@@ -25,7 +25,9 @@ export KUBE_VIP_VERSION := v0.8.3
 
 export METALLB_CHART_VERSION := 0.14.8
 
+# these versions correspond to n-1 and n-2 shipped releases.
 export PREVIOUS_CAREN_CHARTS_VERSION := v0.14.6
+export CAREN_CHARTS_VERSION_N_MINUS_2 := v0.13.7
 
 .PHONY: addons.sync
 addons.sync: $(addprefix update-addon.,calico cilium nfd cluster-autoscaler snapshot-controller local-path-provisioner-csi aws-ebs-csi kube-vip)