diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 7246d40f1e635fcaaf85cfbd724e5dfb15c05c65..ac644bc7d7acdd62eef9b9615eca0faf9774c581 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -16,7 +16,7 @@ ENV HELM_VERSION v3.2.0 ENV KUSTOMIZE_VERSION v3.5.4 # kontainer-driver-metadata branch to be set for specific branch, logic at rancher/rancher/pkg/settings/setting.go -ENV RANCHER_METADATA_BRANCH=dev-v2.4 +ENV RANCHER_METADATA_BRANCH=release-v2.4 RUN apt-get update && \ apt-get install -y gcc ca-certificates git wget curl vim less file xz-utils unzip && \ diff --git a/go.mod b/go.mod index 0196f28ada46a5371e10a41409e534f3738b51ed..48608d895027a43e227e339780e624b1058dd928 100644 --- a/go.mod +++ b/go.mod @@ -83,7 +83,7 @@ require ( github.com/rancher/norman v0.0.0-20200609224801-7afd2e9bf37f github.com/rancher/rdns-server v0.0.0-20180802070304-bf662911db6a github.com/rancher/remotedialer v0.2.6-0.20200401224317-04cc22157b83 - github.com/rancher/rke v1.1.3-rc6 + github.com/rancher/rke v1.1.3 github.com/rancher/security-scan v0.1.7-0.20200222041501-f7377f127168 github.com/rancher/steve v0.0.0-20200522224200-dc9f969673f8 github.com/rancher/system-upgrade-controller v0.4.1-0.20200326220202-4655d4a551bd diff --git a/go.sum b/go.sum index c337a10adca289fbfdbbbbd7744e802e4d308725..f1ed8e4016b9f519b6c878fe8458ebbb42c87a6c 100644 --- a/go.sum +++ b/go.sum @@ -837,8 +837,8 @@ github.com/rancher/rdns-server v0.0.0-20180802070304-bf662911db6a/go.mod h1:YW8w github.com/rancher/remotedialer v0.2.6-0.20200401224317-04cc22157b83 h1:0+HVgp5uVy7BvBn1Ee3PrXG4GktYlD/mwCBBKH77RCw= github.com/rancher/remotedialer v0.2.6-0.20200401224317-04cc22157b83/go.mod h1:dbzn9NF1JWbGEHL6Q/1KG4KFROILiY/j6wmfF1Np3fk= github.com/rancher/rke v1.1.2-0.20200520231200-ceb7c46ce54b/go.mod h1:KIfhYQY3TyLup74RTmbVMWVeINCQ5wGTFDb9rRlfHLQ= -github.com/rancher/rke v1.1.3-rc6 h1:QJITWuJJk8rfbF2j6lR5dtDBoHrVkoos2y4o7vaxX/Y= -github.com/rancher/rke v1.1.3-rc6/go.mod h1:6ILvhMXD6PpjYYOvsfb4tBKN19TwhOEc3KKiKNVFcXA= +github.com/rancher/rke v1.1.3 h1:6HoFGRbeGbWJYxZI/7nwFA2ajlnjx6SiJgplqbshubg= +github.com/rancher/rke v1.1.3/go.mod h1:6ILvhMXD6PpjYYOvsfb4tBKN19TwhOEc3KKiKNVFcXA= github.com/rancher/saml v0.0.0-20180713225824-ce1532152fde h1:+gd9up4jLeFeuNC5bHn7qfRXZO9WKtBe8b4vhucg9lg= github.com/rancher/saml v0.0.0-20180713225824-ce1532152fde/go.mod h1:Bp1IBnlwVB1EqRfSKecoPyf+1Wjh8zykMjlq4vJJhxY= github.com/rancher/security-scan v0.1.7-0.20200222041501-f7377f127168 h1:SIshhsz0O71FYyyDmjUmbFGvmgp4ASm8J1zmhMK/UG0= diff --git a/package/Dockerfile b/package/Dockerfile index 1e38b12ac007a9c9a35d883f243b7821395e3bde..1e0553dd444ff1e3b094ad9affd3aa8e7fd01d7b 100644 --- a/package/Dockerfile +++ b/package/Dockerfile @@ -13,10 +13,10 @@ WORKDIR /var/lib/rancher ARG ARCH=amd64 ARG IMAGE_REPO=rancher -ARG SYSTEM_CHART_DEFAULT_BRANCH=dev-v2.4 +ARG SYSTEM_CHART_DEFAULT_BRANCH=release-v2.4 ARG DASHBOARD_BRANCH=release-2.4 # kontainer-driver-metadata branch to be set for specific branch, logic at rancher/rancher/pkg/settings/setting.go -ARG RANCHER_METADATA_BRANCH=dev-v2.4 +ARG RANCHER_METADATA_BRANCH=release-v2.4 ENV CATTLE_SYSTEM_CHART_DEFAULT_BRANCH=$SYSTEM_CHART_DEFAULT_BRANCH ENV CATTLE_HELM_VERSION v2.16.8-rancher1 @@ -104,7 +104,7 @@ RUN curl -sLf ${!TINI_URL} > /usr/bin/tini && \ ENV CATTLE_UI_PATH /usr/share/rancher/ui ENV CATTLE_UI_VERSION 2.4.28 -ENV CATTLE_CLI_VERSION v2.4.5-rc1 +ENV CATTLE_CLI_VERSION v2.4.5 # Please update the api-ui-version in pkg/settings/settings.go when updating the version here. ENV CATTLE_API_UI_VERSION 1.1.9 diff --git a/pkg/settings/setting.go b/pkg/settings/setting.go index 40c340e988f7f08557cd7b1782c361ba82a01015..631622cf7ce189095b1f4d9502ba30afbc0e4cfb 100644 --- a/pkg/settings/setting.go +++ b/pkg/settings/setting.go @@ -174,7 +174,7 @@ func GetEnvKey(key string) string { func getMetadataConfig() string { branch := os.Getenv("RANCHER_METADATA_BRANCH") if branch == "" { - branch = "dev-v2.4" + branch = "release-v2.4" } data := map[string]interface{}{ "url": fmt.Sprintf("https://releases.rancher.com/kontainer-driver-metadata/%s/data.json", branch), diff --git a/scripts/package b/scripts/package index dccd7bb50a098bb9db4138fe81244d10c876f1da..ca6e6831fbf4c2a35208d6bf11d6c0555c74f1fa 100755 --- a/scripts/package +++ b/scripts/package @@ -4,7 +4,7 @@ set -e source $(dirname $0)/version ARCH=${ARCH:-"amd64"} -SYSTEM_CHART_DEFAULT_BRANCH=${SYSTEM_CHART_DEFAULT_BRANCH:-"dev-v2.4"} +SYSTEM_CHART_DEFAULT_BRANCH=${SYSTEM_CHART_DEFAULT_BRANCH:-"release-v2.4"} SUFFIX="" [ "${ARCH}" != "amd64" ] && SUFFIX="_${ARCH}" diff --git a/vendor/modules.txt b/vendor/modules.txt index 979c21c2b32941642b4c2e5f2e2b1cbcb504f276..e148e5558279351bf4d15374e70154ccbb9c70bd 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -422,7 +422,7 @@ github.com/rancher/rdns-server/model # github.com/rancher/remotedialer v0.2.6-0.20200401224317-04cc22157b83 github.com/rancher/remotedialer github.com/rancher/remotedialer/metrics -# github.com/rancher/rke v1.1.3-rc6 +# github.com/rancher/rke v1.1.3 github.com/rancher/rke/addons github.com/rancher/rke/authz github.com/rancher/rke/cloudprovider