diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 91c3edf59b5..269d3aaec79 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -13,7 +13,7 @@ ENV HELM_UNITTEST_VERSION 0.3.2 ENV K3D_VERSION v5.7.1 # kontainer-driver-metadata branch to be set for specific branch other than dev/master, logic at rancher/rancher/pkg/settings/setting.go -ENV CATTLE_KDM_BRANCH=dev-v2.10 +ENV CATTLE_KDM_BRANCH=release-v2.10 RUN zypper -n install gcc binutils glibc-devel-static ca-certificates git-core wget curl unzip tar vim less file xz gzip sed gawk iproute2 iptables jq skopeo # use containerd from k3s image, not from bci diff --git a/package/Dockerfile b/package/Dockerfile index b0f8a07d14f..9f3cea24da4 100644 --- a/package/Dockerfile +++ b/package/Dockerfile @@ -50,7 +50,7 @@ ARG CHART_DEFAULT_BRANCH=release-v2.10 ARG PARTNER_CHART_DEFAULT_BRANCH=main ARG RKE2_CHART_DEFAULT_BRANCH=main # kontainer-driver-metadata branch to be set for specific branch other than dev/master, logic at rancher/rancher/pkg/settings/setting.go -ARG CATTLE_KDM_BRANCH=dev-v2.10 +ARG CATTLE_KDM_BRANCH=release-v2.10 ARG VERSION=${VERSION} ENV CATTLE_SYSTEM_CHART_DEFAULT_BRANCH=$SYSTEM_CHART_DEFAULT_BRANCH diff --git a/pkg/settings/setting.go b/pkg/settings/setting.go index de3d30d63d8..cb2b60541c4 100644 --- a/pkg/settings/setting.go +++ b/pkg/settings/setting.go @@ -89,7 +89,7 @@ var ( KubernetesVersionToSystemImages = NewSetting("k8s-version-to-images", "") KubernetesVersionsCurrent = NewSetting("k8s-versions-current", "") KubernetesVersionsDeprecated = NewSetting("k8s-versions-deprecated", "") - KDMBranch = NewSetting("kdm-branch", "dev-v2.10") + KDMBranch = NewSetting("kdm-branch", "release-v2.10") MachineVersion = NewSetting("machine-version", "dev") Namespace = NewSetting("namespace", os.Getenv("CATTLE_NAMESPACE")) PasswordMinLength = NewSetting("password-min-length", "12") diff --git a/scripts/gha/tests b/scripts/gha/tests index 9ad0b9c6f45..4a6ef7f1c6b 100755 --- a/scripts/gha/tests +++ b/scripts/gha/tests @@ -48,7 +48,7 @@ if [ -z "${SOME_K8S_VERSION}" ]; then # https://github.com/rancher/rancher/issues/36827 has added appDefaults. We do not use appDefaults # here for simplicity's sake, as it requires semver parsing & matching. The last release should # be good enough for our needs. -export SOME_K8S_VERSION=$(curl -sS https://raw.githubusercontent.com/rancher/kontainer-driver-metadata/dev-v2.10/data/data.json | jq -r ".$DIST.releases[-1].version") +export SOME_K8S_VERSION=$(curl -sS https://raw.githubusercontent.com/rancher/kontainer-driver-metadata/release-v2.10/data/data.json | jq -r ".$DIST.releases[-1].version") fi if [ -z "${CATTLE_CHART_DEFAULT_URL}" ]; then diff --git a/scripts/provisioning-tests b/scripts/provisioning-tests index b515fed88e1..305997c1bf7 100755 --- a/scripts/provisioning-tests +++ b/scripts/provisioning-tests @@ -79,7 +79,7 @@ if [ -z "${SOME_K8S_VERSION}" ]; then # https://github.com/rancher/rancher/issues/36827 has added appDefaults. We do not use appDefaults # here for simplicity's sake, as it requires semver parsing & matching. The last release should # be good enough for our needs. - export SOME_K8S_VERSION=$(curl -sS https://raw.githubusercontent.com/rancher/kontainer-driver-metadata/dev-v2.10/data/data.json | jq -r ".$DIST.releases[-1].version") + export SOME_K8S_VERSION=$(curl -sS https://raw.githubusercontent.com/rancher/kontainer-driver-metadata/release-v2.10/data/data.json | jq -r ".$DIST.releases[-1].version") fi if [ -z "${CATTLE_CHART_DEFAULT_URL}" ]; then diff --git a/scripts/test b/scripts/test index 88856fbb22d..0eac4c0695c 100755 --- a/scripts/test +++ b/scripts/test @@ -61,7 +61,7 @@ if [ -z "${SOME_K8S_VERSION}" ]; then # https://github.com/rancher/rancher/issues/36827 has added appDefaults. We do not use appDefaults # here for simplicity's sake, as it requires semver parsing & matching. The last release should # be good enough for our needs. -export SOME_K8S_VERSION=$(curl -sS https://raw.githubusercontent.com/rancher/kontainer-driver-metadata/dev-v2.10/data/data.json | jq -r ".$DIST.releases[-1].version") +export SOME_K8S_VERSION=$(curl -sS https://raw.githubusercontent.com/rancher/kontainer-driver-metadata/release-v2.10/data/data.json | jq -r ".$DIST.releases[-1].version") fi if [ -z "${CATTLE_CHART_DEFAULT_URL}" ]; then diff --git a/tests/v2/codecoverage/package/Dockerfile b/tests/v2/codecoverage/package/Dockerfile index 4a78a8ec10b..2847fb3975e 100644 --- a/tests/v2/codecoverage/package/Dockerfile +++ b/tests/v2/codecoverage/package/Dockerfile @@ -46,7 +46,7 @@ ARG CHART_DEFAULT_BRANCH=release-v2.10 ARG PARTNER_CHART_DEFAULT_BRANCH=main ARG RKE2_CHART_DEFAULT_BRANCH=main # kontainer-driver-metadata branch to be set for specific branch other than dev/master, logic at rancher/rancher/pkg/settings/setting.go -ARG CATTLE_KDM_BRANCH=dev-v2.10 +ARG CATTLE_KDM_BRANCH=release-v2.10 ENV CATTLE_SYSTEM_CHART_DEFAULT_BRANCH=$SYSTEM_CHART_DEFAULT_BRANCH ENV CATTLE_CHART_DEFAULT_BRANCH=$CHART_DEFAULT_BRANCH diff --git a/tests/v2/codecoverage/scripts/build-rancher.sh b/tests/v2/codecoverage/scripts/build-rancher.sh index 1ff8b08f35f..88571a733f2 100755 --- a/tests/v2/codecoverage/scripts/build-rancher.sh +++ b/tests/v2/codecoverage/scripts/build-rancher.sh @@ -6,7 +6,7 @@ cd $(dirname $0)/../../../../ source $(dirname $0)/scripts/version source $(dirname $0)/scripts/export-config -CATTLE_KDM_BRANCH=dev-v2.10 +CATTLE_KDM_BRANCH=release-v2.10 mkdir -p bin diff --git a/tests/v2/codecoverage/scripts/run_provisioning_integration_tests.sh b/tests/v2/codecoverage/scripts/run_provisioning_integration_tests.sh index 0cd6ae5af98..549722a94c6 100755 --- a/tests/v2/codecoverage/scripts/run_provisioning_integration_tests.sh +++ b/tests/v2/codecoverage/scripts/run_provisioning_integration_tests.sh @@ -36,7 +36,7 @@ if [ -z "${SOME_K8S_VERSION}" ]; then # https://github.com/rancher/rancher/issues/36827 has added appDefaults. We do not use appDefaults # here for simplicity's sake, as it requires semver parsing & matching. The last release should # be good enough for our needs. -export SOME_K8S_VERSION=$(curl -sS https://raw.githubusercontent.com/rancher/kontainer-driver-metadata/dev-v2.10/data/data.json | jq -r ".$DIST.releases[-1].version") +export SOME_K8S_VERSION=$(curl -sS https://raw.githubusercontent.com/rancher/kontainer-driver-metadata/release-v2.10/data/data.json | jq -r ".$DIST.releases[-1].version") fi echo "Starting rancher server for provisioning-tests using $SOME_K8S_VERSION"