Merge pull request #1321 from Nordix/capm3/v1.6-kashif

Bump CAPI to v1.6 and export CAPM3 diagnostics var for clusterctl
metal3-io · Dec 11, 2023 · 063d902 · 063d902
2 parents 959aade + a1efa64
commit 063d902
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/lib/releases.sh b/lib/releases.sh
@@ -83,8 +83,8 @@ elif [ "${CAPM3RELEASEBRANCH}" = "release-1.5" ]; then
 else
   # 1.5.99 points to the head of the main branch as well. Local override for CAPM3 is created for this version.
   # We should change it to v1.6.99 when we point main branch towards CAI v1.6 contract soon. 
-  export CAPM3RELEASE="v1.5.99"
-  export CAPIRELEASE="${CAPIRELEASE:-$(get_latest_release "${CAPIRELEASEPATH}" "v1.5.")}"
+  export CAPM3RELEASE="v1.6.99"
+  export CAPIRELEASE="${CAPIRELEASE:-$(get_latest_release "${CAPIRELEASEPATH}" "v1.6.")}"
 fi
 
 CAPIBRANCH="${CAPIBRANCH:-${CAPIRELEASE}}"

diff --git a/tests/roles/run_tests/templates/clusterctl-vars.yaml b/tests/roles/run_tests/templates/clusterctl-vars.yaml
@@ -26,3 +26,9 @@ EXTERNAL_SUBNET_V4_PREFIX: {{ EXTERNAL_SUBNET_V4_PREFIX }}
 EXTERNAL_SUBNET_V4_HOST: {{ EXTERNAL_SUBNET_V4_HOST }}
 EXTERNAL_SUBNET_V6_PREFIX: {{ EXTERNAL_SUBNET_V6_PREFIX }}
 EXTERNAL_SUBNET_V6_HOST: {{ EXTERNAL_SUBNET_V6_HOST }}
+
+# Metrics
+CAPM3_DIAGNOSTICS_ADDRESS: {{ CAPM3_DIAGNOSTICS_ADDRESS }}
+CAPM3_INSECURE_DIAGNOSTICS: {{ CAPM3_INSECURE_DIAGNOSTICS }}
+IPAM_DIAGNOSTICS_ADDRESS: {{ IPAM_DIAGNOSTICS_ADDRESS }}
+IPAM_INSECURE_DIAGNOSTICS: {{ IPAM_INSECURE_DIAGNOSTICS }}
diff --git a/tests/roles/run_tests/vars/main.yml b/tests/roles/run_tests/vars/main.yml
@@ -87,6 +87,12 @@ IRONIC_TLS_SETUP: "{{ lookup('env', 'IRONIC_TLS_SETUP') | default('true', true)
 IRONIC_BASIC_AUTH: "{{ lookup('env', 'IRONIC_BASIC_AUTH') | default('true', true) }}"
 IRONIC_USE_MARIADB: "{{ lookup('env', 'IRONIC_USE_MARIADB') | default('false', true) }}"
 
+# Metrics
+CAPM3_DIAGNOSTICS_ADDRESS: "localhost:8080"
+CAPM3_INSECURE_DIAGNOSTICS: "true"
+IPAM_DIAGNOSTICS_ADDRESS: "localhost:8080"
+IPAM_INSECURE_DIAGNOSTICS: "true"
+
 # Args to pass to the deploy.sh script when deploying Ironic and BMO
 # [k]eepalived [t]ls [n]o basic auth or [m]ariadb
 BMO_IRONIC_ARGS: "-k {{ (IRONIC_TLS_SETUP == 'true') | ternary('-t', '') }}