fix: use values.yaml for previous version during minor version upgrade

Author: jessesimpson36

.github/workflows/test-chart-version-template.yaml

@@ -16,6 +16,10 @@ on:
         description: Pull Request number. Required due to a github bug that is not giving the concurrency group the pull_request number from the github event
         required: true
         type: string
+      previous-helm-dir:
+        description: base directory of the previous helm version to upgrade from for references to test values.yamls
+        required: false
+        type: string
 
 concurrency:
   group: ${{ github.workflow }}-${{ inputs.pr_number }}-${{ inputs.chart-version }}
@@ -79,5 +83,6 @@ jobs:
       camunda-helm-dir: "camunda-platform-${{ inputs.chart-version }}"
       camunda-helm-git-ref: "${{ github.event.pull_request.head.sha }}"
       camunda-helm-upgrade-version: "${{ inputs.previous-helm-version }}"
+      camunda-upgrade-helm-dir: "${{ inputs.previous-helm-dir }}"
       caller-git-ref: "${{ github.event.pull_request.head.sha }}"
 

.github/workflows/test-chart-version.yaml

@@ -50,3 +50,4 @@ jobs:
       chart-version: "${{ matrix.version }}"
       previous-helm-version: "${{ matrix.previousHelmVersion }}"
       pr_number: "${{ github.event.pull_request.number }}" # Required as there is a github bug that prevent the concurrency group on the sub workflow getting the pull_request number from the github event
+      previous-helm-dir: "${{ matrix.previousHelmDir }}"

.github/workflows/test-integration-template.yaml

@@ -17,6 +17,12 @@ on:
         required: false
         default: camunda-platform-8.8
         type: string
+      # directory to get values.yaml from during minor upgrade flow
+      camunda-upgrade-helm-dir:
+        required: false
+        description: During upgrade, the path towards the chart base dir that contains values.yamls
+        default: ""
+        type: string
       camunda-helm-git-ref:
         required: false
         default: main
@@ -240,12 +246,14 @@ jobs:
         id: test-type-vars
         uses: ./.github/actions/test-type-vars
         with:
-          chart-dir: "${{ inputs.camunda-helm-dir }}"
+          chart-dir: "${{ inputs.camunda-upgrade-helm-dir || inputs.camunda-helm-dir }}"
       - name: Add Helm repos and dependencies
         run: |
-          export chartPath="charts/${{ inputs.camunda-helm-dir }}"
+          export chartPath="charts/$CHART_PATH"
           make helm.repos-add
           make helm.dependency-update
+        env:
+          CHART_PATH: ${{ inputs.camunda-upgrade-helm-dir || inputs.camunda-helm-dir }}
       - name: Create test namespace
         run: |
           echo $TEST_NAMESPACE
@@ -332,14 +340,19 @@ jobs:
         if: matrix.scenario.flow == 'upgrade'
         run: |
           task -d ${CI_TASKS_BASE_DIR}/chart-full-setup upgrade.pre
+      - name: Set test type vars
+        id: test-type-vars-2
+        uses: ./.github/actions/test-type-vars
+        with:
+          chart-dir: "${{ inputs.camunda-helm-dir }}"
       - name: 🌟 Upgrade Camunda chart 🌟
         if: matrix.scenario.flow == 'upgrade'
         env:
           TEST_OPENSHIFT_POST_RENDER: ${{ inputs.camunda-helm-post-render }}
           TEST_HELM_EXTRA_ARGS: >-
             ${{ env.TEST_HELM_EXTRA_ARGS_UPGRADE }}
             --set global.ingress.host=${{ steps.vars.outputs.ingress-host }}
-            --values ${{ steps.test-type-vars.outputs.valuesBaseDir }}/infra/values-infra-${{ inputs.infra-type }}.yaml
+            --values ${{ steps.test-type-vars-2.outputs.valuesBaseDir }}/infra/values-infra-${{ inputs.infra-type }}.yaml
             --values /tmp/extra-values-file.yaml
         run: |
           task -d ${CI_TASKS_BASE_DIR}/chart-full-setup upgrade.exec

scripts/generate-gha-matrix/process.go

@@ -13,15 +13,16 @@ func processInputs(input Input) ([]Output, error) {
 		}
 
 		version := getCamundaVersion(chart)
-		previousVersionMajor, err := getPreviousHelmChartVersion(chart, version)
+		previousVersion, err := getPreviousHelmChartVersion(chart, version)
 		if err != nil {
 			return nil, ProcessErrorf("failed to get previous helm chart metadata for version %s : %s", version, err)
 		}
 
 		matrixRunVector := Output{
 			CamundaVersion:           version,
 			HelmChartVersion:         chart.Metadata.Version,
-			PreviousHelmChartVersion: previousVersionMajor,
+			PreviousHelmChartVersion: previousVersion.Version,
+			PreviousHelmChartDir:     previousVersion.Dir,
 		}
 
 		output = append(output, matrixRunVector)

scripts/generate-gha-matrix/types.go

@@ -8,4 +8,10 @@ type Output struct {
 	CamundaVersion           string `json:"version"`
 	HelmChartVersion         string `json:"chartVersion"`
 	PreviousHelmChartVersion string `json:"previousHelmVersion"`
+	PreviousHelmChartDir     string `json:"previousHelmDir"`
+}
+
+type ChartVersion struct {
+	Version string
+	Dir     string
 }

scripts/generate-gha-matrix/versions.go

@@ -20,19 +20,23 @@ func getCamundaVersion(chart *chart.Chart) string {
 	return camundaVersionParsed
 }
 
-func getPreviousHelmChartVersion(chart *chart.Chart, version string) (string, error) {
+func getPreviousHelmChartVersion(chart *chart.Chart, version string) (*ChartVersion, error) {
 	camundaVersionFloat, err := strconv.ParseFloat(version, 64)
 	if err != nil {
-		return "", VersionParsingErrorf("failed to parse version from input: %s", err)
+		return nil, VersionParsingErrorf("failed to parse version from input: %s", err)
 	}
 	previousVersionFloat := (camundaVersionFloat*10 - 1) / 10
 	previousCamundaVersion := strconv.FormatFloat(previousVersionFloat, 'f', -1, 64)
-	previousChart, err := loader.Load("../../charts/camunda-platform-" + previousCamundaVersion)
+	previousChartDir := "camunda-platform-" + previousCamundaVersion
+	previousChart, err := loader.Load("../../charts/" + previousChartDir)
 	if err != nil {
-		return "", VersionParsingErrorf("failed to load the previous chart: %s", err)
+		return nil, VersionParsingErrorf("failed to load the previous chart: %s", err)
 	}
 	previousChartVersionSemver := "v" + previousChart.Metadata.Version
 	previousVersionMajor := semver.Major(previousChartVersionSemver)
 	previousVersionMajor = strings.TrimPrefix(previousVersionMajor, "v")
-	return previousVersionMajor, nil
+	return &ChartVersion{
+		Version: previousVersionMajor,
+		Dir:     previousChartDir,
+	}, nil
 }

scripts/generate-gha-matrix/versions_test.go

@@ -36,7 +36,8 @@ func TestGetPreviousChart(t *testing.T) {
 	version := getCamundaVersion(chart)
 	previousVersion, err := getPreviousHelmChartVersion(chart, version)
 	require.NoError(t, err)
-	require.Equal(t, "12", previousVersion)
+	require.Equal(t, "12", previousVersion.Version)
+	require.Equal(t, "camunda-platform-8.7", previousVersion.Dir)
 }
 
 func TestGetPreviousChartInvalidVersion(t *testing.T) {