Merge pull request #32079 from PennyScissors/relv25-v258rc3

[release/v2.5] Update tags for rke, ui, and dashboard
rancher · Apr 13, 2021 · 7002499 · 7002499
2 parents b75af2a + cee1a67
commit 7002499
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/go.mod b/go.mod
@@ -99,7 +99,7 @@ require (
 	github.com/rancher/rancher/pkg/client v0.0.0
 	github.com/rancher/rdns-server v0.0.0-20180802070304-bf662911db6a
 	github.com/rancher/remotedialer v0.2.6-0.20200820180140-e5448aaba7ee
-	github.com/rancher/rke v1.2.8-rc1.0.20210409005002-9213a4d08d08
+	github.com/rancher/rke v1.2.8-rc2
 	github.com/rancher/security-scan v0.1.7-0.20200222041501-f7377f127168
 	github.com/rancher/steve v0.0.0-20210126001943-00da04b7d566
 	github.com/rancher/system-upgrade-controller/pkg/apis v0.0.0-20200825145542-a04e2061be24

diff --git a/go.sum b/go.sum
@@ -949,8 +949,8 @@ github.com/rancher/rdns-server v0.0.0-20180802070304-bf662911db6a h1:6xqYlVz4uAX
 github.com/rancher/rdns-server v0.0.0-20180802070304-bf662911db6a/go.mod h1:YW8wJ/coee2n9ed937uPBWQArBaVlxs+5wkkS9KiyDc=
 github.com/rancher/remotedialer v0.2.6-0.20200820180140-e5448aaba7ee h1:hAHJO9u3nF4NMoHC3FwdlQ+O/WnBvehkr9Ubwt3jk+g=
 github.com/rancher/remotedialer v0.2.6-0.20200820180140-e5448aaba7ee/go.mod h1:dbzn9NF1JWbGEHL6Q/1KG4KFROILiY/j6wmfF1Np3fk=
-github.com/rancher/rke v1.2.8-rc1.0.20210409005002-9213a4d08d08 h1:gBxOQB13LwD2AMLXbR6XF5esL4TzYgFfxD2VZFFU0Aw=
-github.com/rancher/rke v1.2.8-rc1.0.20210409005002-9213a4d08d08/go.mod h1:osU/R8vPjgV3AwNnPamC0eOZ6aI0UfpHTyZ5K/b/vZE=
+github.com/rancher/rke v1.2.8-rc2 h1:+X9P/DEKpHxDsWhJ4mhU9Mt/2F6cx3LxlDrRO9zyb14=
+github.com/rancher/rke v1.2.8-rc2/go.mod h1:osU/R8vPjgV3AwNnPamC0eOZ6aI0UfpHTyZ5K/b/vZE=
 github.com/rancher/security-scan v0.1.7-0.20200222041501-f7377f127168 h1:SIshhsz0O71FYyyDmjUmbFGvmgp4ASm8J1zmhMK/UG0=
 github.com/rancher/security-scan v0.1.7-0.20200222041501-f7377f127168/go.mod h1:WlLAocVyVQs5J8r0IiQXsp0ajVZO6hYi/Vo6zxjo73s=
 github.com/rancher/steve v0.0.0-20210126001943-00da04b7d566 h1:OnB+XzBDM6GzZ/KycroFV0alLetgE+Bv0aBOGl5gDuc=

diff --git a/package/Dockerfile b/package/Dockerfile
@@ -113,8 +113,8 @@ RUN curl -sLf ${!TINI_URL} > /usr/bin/tini && \
     chmod +x /usr/bin/tini /usr/bin/telemetry /usr/bin/k3s /usr/bin/kubectl /usr/bin/channelserver && \
     mkdir -p /var/lib/rancher-data/driver-metadata
 
-ENV CATTLE_UI_VERSION 2.5.8-rc2
-ENV CATTLE_DASHBOARD_UI_VERSION v2.5.8-rc2
+ENV CATTLE_UI_VERSION 2.5.8-rc3
+ENV CATTLE_DASHBOARD_UI_VERSION v2.5.8-rc3
 ENV CATTLE_CLI_VERSION v2.4.11-rc4
 # 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/apis/go.mod b/pkg/apis/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/rancher/eks-operator v1.0.6
 	github.com/rancher/gke-operator v1.0.1-rc6
 	github.com/rancher/norman v0.0.0-20210225010917-c7fd1e24145b
-	github.com/rancher/rke v1.2.8-rc1.0.20210409005002-9213a4d08d08
+	github.com/rancher/rke v1.2.8-rc2
 	github.com/rancher/wrangler v0.7.3-0.20210331224822-5bd357588083
 	github.com/sirupsen/logrus v1.6.0
 	k8s.io/api v0.20.0

diff --git a/pkg/apis/go.sum b/pkg/apis/go.sum
@@ -521,8 +521,8 @@ github.com/rancher/lasso v0.0.0-20200905045615-7fcb07d6a20b/go.mod h1:OhBBBO1pBw
 github.com/rancher/norman v0.0.0-20200517050325-f53cae161640/go.mod h1:92rz/7QN7DOeLQZlJY/8aFBOmF085igIVguR0wpxLas=
 github.com/rancher/norman v0.0.0-20210225010917-c7fd1e24145b h1:4SV/mEqaGmwvAV5XIO+hRqacZR1KyW6sTqzFNIlyTAY=
 github.com/rancher/norman v0.0.0-20210225010917-c7fd1e24145b/go.mod h1:hhnf77V2lmZD7cvUqi4vTBpIs3KpHNL/AmuN0MqEClI=
-github.com/rancher/rke v1.2.8-rc1.0.20210409005002-9213a4d08d08 h1:gBxOQB13LwD2AMLXbR6XF5esL4TzYgFfxD2VZFFU0Aw=
-github.com/rancher/rke v1.2.8-rc1.0.20210409005002-9213a4d08d08/go.mod h1:osU/R8vPjgV3AwNnPamC0eOZ6aI0UfpHTyZ5K/b/vZE=
+github.com/rancher/rke v1.2.8-rc2 h1:+X9P/DEKpHxDsWhJ4mhU9Mt/2F6cx3LxlDrRO9zyb14=
+github.com/rancher/rke v1.2.8-rc2/go.mod h1:osU/R8vPjgV3AwNnPamC0eOZ6aI0UfpHTyZ5K/b/vZE=
 github.com/rancher/wrangler v0.6.2-0.20200427172034-da9b142ae061/go.mod h1:n5Du/gGD7WoiqnEo0SHnPirDIp1V9Zu+6guc8lXS2dk=
 github.com/rancher/wrangler v0.6.2-0.20200515155908-1923f3f8ec3f/go.mod h1:NmtmlLkchboIksYJuBemwcP4RBfv8FpeyhVoWXB9Wdc=
 github.com/rancher/wrangler v0.6.2-0.20200820173016-2068de651106/go.mod h1:iKqQcYs4YSDjsme52OZtQU4jHPmLlIiM93aj2c8c/W8=