diff --git a/Dockerfile.dapper b/Dockerfile.dapper index acd9e82aae795dcfda76b426c18d1251fb62f399..33231bab18bb1e61da6496d17a781891bec9fc2b 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -15,7 +15,7 @@ ENV HELM_VERSION v3.3.1 ENV KUSTOMIZE_VERSION v3.5.4 # kontainer-driver-metadata branch to be set for specific branch other than dev/master, logic at rancher/rancher/pkg/settings/setting.go -ENV RANCHER_METADATA_BRANCH=release-v2.5 +ENV RANCHER_METADATA_BRANCH=dev-v2.5-1021-patches RUN apt-get update && \ apt-get install -y gcc ca-certificates git wget curl vim less file xz-utils unzip && \ diff --git a/package/Dockerfile b/package/Dockerfile index 8e3d15261d927623f7d2a8a7cdfefad61b1a47d1..0db61897ed585383ca03393681faaa045f046341 100644 --- a/package/Dockerfile +++ b/package/Dockerfile @@ -17,7 +17,7 @@ ARG SYSTEM_CHART_DEFAULT_BRANCH=release-v2.5 ARG CHART_DEFAULT_BRANCH=release-v2.5 ARG PARTNER_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 RANCHER_METADATA_BRANCH=release-v2.5 +ARG RANCHER_METADATA_BRANCH=dev-v2.5-1021-patches ENV CATTLE_SYSTEM_CHART_DEFAULT_BRANCH=$SYSTEM_CHART_DEFAULT_BRANCH ENV CATTLE_CHART_DEFAULT_BRANCH=$CHART_DEFAULT_BRANCH diff --git a/pkg/settings/setting.go b/pkg/settings/setting.go index 10cb3133ceebbe08766b5887523e6a21682447dd..d07d998e8f71cbc5ed097146f937a71109310e5c 100644 --- a/pkg/settings/setting.go +++ b/pkg/settings/setting.go @@ -224,7 +224,7 @@ func GetEnvKey(key string) string { func getMetadataConfig() string { branch := os.Getenv("RANCHER_METADATA_BRANCH") if branch == "" { - branch = "release-v2.5" + branch = "dev-v2.5-1021-patches" } data := map[string]interface{}{ "url": fmt.Sprintf("https://releases.rancher.com/kontainer-driver-metadata/%s/data.json", branch),