Merge pull request #35755 from brendarearden/v2.6.3-rc4

Add tags for v2.6.3 rc4

go.mod

@@ -118,7 +118,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.20210318171128-d1ebd5202be4
-	github.com/rancher/rke v1.3.3-rc2.0.20211125090811-397ffdbb8117
+	github.com/rancher/rke v1.3.3-rc4
 	github.com/rancher/security-scan v0.1.7-0.20200222041501-f7377f127168
 	github.com/rancher/steve v0.0.0-20210915171517-ae8b16260899
 	github.com/rancher/system-upgrade-controller/pkg/apis v0.0.0-20210727200656-10b094e30007

go.sum

@@ -1201,8 +1201,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.20210318171128-d1ebd5202be4 h1:wo4G9nT0YUdHMQe6g++ojYMUvNtHoybhLJ2Ckr/L1N8=
 github.com/rancher/remotedialer v0.2.6-0.20210318171128-d1ebd5202be4/go.mod h1:dbzn9NF1JWbGEHL6Q/1KG4KFROILiY/j6wmfF1Np3fk=
-github.com/rancher/rke v1.3.3-rc2.0.20211125090811-397ffdbb8117 h1:ijxMvu1Y/SVbWqIcQP7VF1oNTP1BkLfCCvhllXjNTYQ=
-github.com/rancher/rke v1.3.3-rc2.0.20211125090811-397ffdbb8117/go.mod h1:4StVBXSN7EbrfoWE7nI2AAf/N1td8qSyQMDRyR6nGAg=
+github.com/rancher/rke v1.3.3-rc4 h1:q/AacJ11V/PNGgN73JOJ/btsmQPnncpl84oB/cIChvQ=
+github.com/rancher/rke v1.3.3-rc4/go.mod h1:4StVBXSN7EbrfoWE7nI2AAf/N1td8qSyQMDRyR6nGAg=
 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-20210915171517-ae8b16260899 h1:oJa1C5+nvWzE4N6FtOQgBHTTegdz1/rNvwbOrPCNPCM=

package/Dockerfile

@@ -110,8 +110,8 @@ RUN curl -sLf ${!TINI_URL} > /usr/bin/tini && \
     chmod +x /usr/bin/tini /usr/bin/telemetry /usr/bin/k3s /usr/bin/kubectl && \
     mkdir -p /var/lib/rancher-data/driver-metadata
 
-ENV CATTLE_UI_VERSION 2.6.3-rc3
-ENV CATTLE_DASHBOARD_UI_VERSION v2.6.3-rc3
+ENV CATTLE_UI_VERSION 2.6.3-rc4
+ENV CATTLE_DASHBOARD_UI_VERSION v2.6.3-rc4
 ENV CATTLE_CLI_VERSION v2.6.0-rc2
 
 # Please update the api-ui-version in pkg/settings/settings.go when updating the version here.

pkg/apis/go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/rancher/fleet/pkg/apis v0.0.0-20210918015053-5a141a6b18f0
 	github.com/rancher/gke-operator v1.1.1
 	github.com/rancher/norman v0.0.0-20211201154850-abe17976423e
-	github.com/rancher/rke v1.3.3-rc2.0.20211125090811-397ffdbb8117
+	github.com/rancher/rke v1.3.3-rc4
 	github.com/rancher/wrangler v0.8.10
 	github.com/sirupsen/logrus v1.8.1
 	k8s.io/api v0.22.3

pkg/apis/go.sum

@@ -674,8 +674,8 @@ github.com/rancher/machine v0.15.0-rancher63/go.mod h1:qXYNumxy0J08MO/mh/jNjyRuE
 github.com/rancher/norman v0.0.0-20200517050325-f53cae161640/go.mod h1:92rz/7QN7DOeLQZlJY/8aFBOmF085igIVguR0wpxLas=
 github.com/rancher/norman v0.0.0-20211201154850-abe17976423e h1:ozsbzsCJpKULwrTcqEDddL9aYy8Cdt5s6gAm6BZQKp4=
 github.com/rancher/norman v0.0.0-20211201154850-abe17976423e/go.mod h1:hhnf77V2lmZD7cvUqi4vTBpIs3KpHNL/AmuN0MqEClI=
-github.com/rancher/rke v1.3.3-rc2.0.20211125090811-397ffdbb8117 h1:ijxMvu1Y/SVbWqIcQP7VF1oNTP1BkLfCCvhllXjNTYQ=
-github.com/rancher/rke v1.3.3-rc2.0.20211125090811-397ffdbb8117/go.mod h1:4StVBXSN7EbrfoWE7nI2AAf/N1td8qSyQMDRyR6nGAg=
+github.com/rancher/rke v1.3.3-rc4 h1:q/AacJ11V/PNGgN73JOJ/btsmQPnncpl84oB/cIChvQ=
+github.com/rancher/rke v1.3.3-rc4/go.mod h1:4StVBXSN7EbrfoWE7nI2AAf/N1td8qSyQMDRyR6nGAg=
 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=