More fixes for versions

Signed-off-by: Pete Wall <pete.wall@grafana.com>

Author: petewall

.github/workflows/test-v1.yml

@@ -176,15 +176,15 @@ jobs:
           helm install alloy grafana/alloy -f "${GRAFANA_ALLOY_VALUES}" -n alloy --create-namespace --wait
 
           # This prometheus instance is used pod annotation testing with https
-          helm install prometheus-workload prometheus-community/prometheus --version ^2 -f "${PROMETHEUS_WORKLOAD_VALUES}" -n prometheus --create-namespace --timeout 10m --wait
+          helm install prometheus-workload prometheus-community/prometheus --version ^25 -f "${PROMETHEUS_WORKLOAD_VALUES}" -n prometheus --create-namespace --timeout 10m --wait
 
           # Deploy the Prometheus Operator CRDs, since we want to deploy Loki with a ServiceMonitor later
           helm install prom-crds prometheus-community/prometheus-operator-crds --wait
 
       - name: Deploy Prometheus
         if: (steps.list-changed.outputs.changed == 'true') || (contains(github.event.pull_request.labels.*.name, 'full_test_required'))
         run: |
-          helm install prometheus prometheus-community/prometheus --version ^2 -f "${PROMETHEUS_VALUES}" -n prometheus --create-namespace --timeout 10m --wait
+          helm install prometheus prometheus-community/prometheus --version ^25 -f "${PROMETHEUS_VALUES}" -n prometheus --create-namespace --timeout 10m --wait
 
       - name: Deploy Loki
         if: (steps.list-changed.outputs.changed == 'true') || (contains(github.event.pull_request.labels.*.name, 'full_test_required'))

charts/k8s-monitoring/tests/integration/auth/test-manifest.yaml

@@ -6,7 +6,7 @@ deployments:
     type: helm
     repo: https://prometheus-community.github.io/helm-charts
     chart: prometheus
-    version: ^2
+    version: ^25
     namespace: prometheus
     valuesFile: configs/prometheus.yaml
   - name: passwords

charts/k8s-monitoring/tests/integration/auto-instrumentation/test-manifest.yaml

@@ -6,7 +6,7 @@ deployments:
     type: helm
     repo: https://prometheus-community.github.io/helm-charts
     chart: prometheus
-    version: ^2
+    version: ^25
     namespace: prometheus
     valuesFile: configs/prometheus.yaml
   - name: loki

charts/k8s-monitoring/tests/integration/cluster-monitoring/test-manifest.yaml

@@ -14,7 +14,7 @@ deployments:
     type: helm
     repo: https://prometheus-community.github.io/helm-charts
     chart: prometheus
-    version: ^2
+    version: ^25
     namespace: prometheus
     valuesFile: configs/prometheus.yaml
   - name: loki

charts/k8s-monitoring/tests/integration/control-plane-monitoring/test-manifest.yaml

@@ -8,7 +8,7 @@ deployments:
     type: helm
     repo: https://prometheus-community.github.io/helm-charts
     chart: prometheus
-    version: ^2
+    version: ^25
     namespace: prometheus
     valuesFile: configs/prometheus.yaml
   - name: loki

charts/k8s-monitoring/tests/integration/integration-cert-manager/test-manifest.yaml

@@ -6,7 +6,7 @@ deployments:
     type: helm
     repo: https://prometheus-community.github.io/helm-charts
     chart: prometheus
-    version: ^2
+    version: ^25
     namespace: prometheus
     valuesFile: configs/prometheus.yaml
   - name: cert-manager

charts/k8s-monitoring/tests/integration/integration-mysql/test-manifest.yaml

@@ -6,7 +6,7 @@ deployments:
     type: helm
     repo: https://prometheus-community.github.io/helm-charts
     chart: prometheus
-    version: ^2
+    version: ^25
     namespace: prometheus
     valuesFile: configs/prometheus.yaml
 

scripts/run-integration-test.sh

@@ -79,7 +79,7 @@ for ((i=0; i<deploymentCount; i++)); do
     elif [ -n "${manifestFile}" ]; then
       envsubst < "${TEST_DIRECTORY}/${manifestFile}" | kubectl apply ${namespaceArg} -f -
     else
-      echo "No URL or file specified for manifest prerequisite \"${name}\""
+      echo "No URL or file specified for manifest deployment \"${name}\""
       exit 1
     fi
 
@@ -89,9 +89,9 @@ for ((i=0; i<deploymentCount; i++)); do
     if [ -n "${helmRepo}" ]; then helmRepoArg="--repo ${helmRepo}"; else helmRepoArg=""; fi
     helmChart=$(yq -r ".deployments[$i].chart // \"\"" "${testManifest}")
     helmChartPath=$(yq -r ".deployments[$i].chartPath // \"\""  "${testManifest}")
-    prereqVersion=$(yq -r ".prerequisites[$i].version // \"\"" "${testManifest}")
-    prereqVersionArg=""
-    if [ -n "${prereqVersion}" ]; then prereqVersionArg="--version ${prereqVersion}"; else prereqVersionArg=""; fi
+    version=$(yq -r ".deployments[$i].version // \"\"" "${testManifest}")
+    versionArg=""
+    if [ -n "${version}" ]; then versionArg="--version ${version}"; else versionArg=""; fi
     helmValues="$(yq -r ".deployments[$i].values // \"\"" "${testManifest}")"
     helmValuesFile="$(yq -r ".deployments[$i].valuesFile // \"\"" "${testManifest}")"
     helmTest="$(yq -r ".deployments[$i].test // \"false\"" "${testManifest}")"
@@ -101,13 +101,13 @@ for ((i=0; i<deploymentCount; i++)); do
     fi
 
     if [ -n "${helmValuesFile}" ]; then
-      helm upgrade --install "${name}" ${namespaceArg} --create-namespace ${helmRepoArg} "${helmChart}" ${prereqVersionArg} -f "${TEST_DIRECTORY}/${helmValuesFile}" --hide-notes --wait
+      helm upgrade --install "${name}" ${namespaceArg} --create-namespace ${helmRepoArg} "${helmChart}" ${versionArg} -f "${TEST_DIRECTORY}/${helmValuesFile}" --hide-notes --wait
     elif [ -n "${helmChart}" ]; then
       echo "${helmValues}" > temp-values.yaml
-      helm upgrade --install "${name}" ${namespaceArg} --create-namespace ${helmRepoArg} "${helmChart}" ${prereqVersionArg} -f temp-values.yaml --hide-notes --wait
+      helm upgrade --install "${name}" ${namespaceArg} --create-namespace ${helmRepoArg} "${helmChart}" ${versionArg} -f temp-values.yaml --hide-notes --wait
       rm temp-values.yaml
     else
-      helm upgrade --install "${name}" ${namespaceArg} --create-namespace --repo "${helmRepo}" "${helmChart}" ${prereqVersionArg} --hide-notes --wait
+      helm upgrade --install "${name}" ${namespaceArg} --create-namespace --repo "${helmRepo}" "${helmChart}" ${versionArg} --hide-notes --wait
     fi
 
     if [ "${helmTest}" == "true" ]; then