Merge pull request rancher#47286 from jiaqiluo/27-bump-rancher-machine

crobby · Sep 27, 2024 · 331fe0d · 331fe0d
2 parents 065309f + 6a20c1b
commit 331fe0d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/Dockerfile.dapper b/Dockerfile.dapper
@@ -3,7 +3,7 @@ FROM registry.suse.com/bci/golang:1.20
 ARG DAPPER_HOST_ARCH
 ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH}
 ENV CATTLE_HELM_VERSION v2.16.8-rancher2
-ENV CATTLE_MACHINE_VERSION v0.15.0-rancher109
+ENV CATTLE_MACHINE_VERSION v0.15.0-rancher109-patch1
 ENV CATTLE_K3S_VERSION v1.27.10+k3s2
 # helm 3 version
 ENV HELM_VERSION v3.12.3

diff --git a/go.mod b/go.mod
@@ -17,7 +17,7 @@ replace (
 	github.com/opencontainers/image-spec => github.com/opencontainers/image-spec v1.1.0-rc2 // needed for containers/image/v5
 	github.com/opencontainers/runc => github.com/opencontainers/runc v1.1.12
 
-	github.com/rancher/machine => github.com/rancher/machine v0.15.0-rancher109
+	github.com/rancher/machine => github.com/rancher/machine v0.15.0-rancher109-patch1
 	github.com/rancher/rancher/pkg/apis => ./pkg/apis
 	github.com/rancher/rancher/pkg/client => ./pkg/client
 
@@ -124,7 +124,7 @@ require (
 	github.com/rancher/gke-operator v1.1.7
 	github.com/rancher/kubernetes-provider-detector v0.1.5
 	github.com/rancher/lasso v0.0.0-20230830164424-d684fdeb6f29
-	github.com/rancher/machine v0.15.0-rancher109
+	github.com/rancher/machine v0.15.0-rancher109-patch1
 	github.com/rancher/norman v0.0.0-20240207153035-cb54924f25c7
 	github.com/rancher/rancher/pkg/apis v0.0.0
 	github.com/rancher/rancher/pkg/client v0.0.0

diff --git a/go.sum b/go.sum
@@ -913,8 +913,8 @@ github.com/rancher/kubernetes-provider-detector v0.1.5 h1:hWRAsWuJOemzGjz/XrbTlM
 github.com/rancher/kubernetes-provider-detector v0.1.5/go.mod h1:ypuJS7kP7rUiAn330xG46mj+Nhvym05GM8NqMVekpH0=
 github.com/rancher/lasso v0.0.0-20230830164424-d684fdeb6f29 h1:+kige/h8/LnzWgPjB5NUIHz/pWiW/lFpqcTUkN5uulY=
 github.com/rancher/lasso v0.0.0-20230830164424-d684fdeb6f29/go.mod h1:kgk9kJVMj9FIrrXU0iyM6u/9Je4bEjPImqswkTVaKsQ=
-github.com/rancher/machine v0.15.0-rancher109 h1:+3XVQQzWA6b5FIXikfeYv/2SRiMK2JdRqDiQwkWs47c=
-github.com/rancher/machine v0.15.0-rancher109/go.mod h1:nDJPIUiUO1a+HZ2lxpX95Djo7hJminwW6icga9FRc+w=
+github.com/rancher/machine v0.15.0-rancher109-patch1 h1:XeIuwwNyNcKXoTK/TkFtyyFly29TvlVfnVj39XGHwBI=
+github.com/rancher/machine v0.15.0-rancher109-patch1/go.mod h1:nDJPIUiUO1a+HZ2lxpX95Djo7hJminwW6icga9FRc+w=
 github.com/rancher/moq v0.0.0-20200712062324-13d1f37d2d77 h1:k+vzmkZQsH06rZnDr+phskSixG9ByNj9gVdzHcc8nxw=
 github.com/rancher/moq v0.0.0-20200712062324-13d1f37d2d77/go.mod h1:wpITyDPTi/Na5h73XkbuEf2AP9fbgrIGqqxVzFhYD6U=
 github.com/rancher/norman v0.0.0-20240207153035-cb54924f25c7 h1:NojnqhDccRXZTmsGisFu1EJjim2OTQZFSEYMbwbbPn0=

diff --git a/package/Dockerfile b/package/Dockerfile
@@ -47,7 +47,7 @@ ENV CATTLE_PARTNER_CHART_DEFAULT_BRANCH=$PARTNER_CHART_DEFAULT_BRANCH
 ENV CATTLE_RKE2_CHART_DEFAULT_BRANCH=$RKE2_CHART_DEFAULT_BRANCH
 ENV CATTLE_HELM_VERSION v2.16.8-rancher2
 # make sure the version number is consistent with the one at the 1) tests/v2/codecoverage/package/Dockerfile, 2) Dockerfile.dapper, 3) go.mod and 4) the setting MachineProvisionImage in pkg/settings/setting.go
-ENV CATTLE_MACHINE_VERSION v0.15.0-rancher109
+ENV CATTLE_MACHINE_VERSION v0.15.0-rancher109-patch1
 ENV CATTLE_K3S_VERSION v1.27.10+k3s2
 ENV CATTLE_MACHINE_PROVISION_IMAGE rancher/machine:${CATTLE_MACHINE_VERSION}
 ENV CATTLE_ETCD_VERSION v3.5.1
@@ -262,4 +262,4 @@ VOLUME /var/log
 
 ENV ETCD_UNSUPPORTED_ARCH ${ETCD_UNSUPPORTED_ARCH}
 
-ENTRYPOINT ["entrypoint.sh"]
+ENTRYPOINT ["entrypoint.sh"]
diff --git a/pkg/settings/setting.go b/pkg/settings/setting.go
@@ -128,7 +128,7 @@ var (
 	EKSUpstreamRefresh                  = NewSetting("eks-refresh", "300")
 	GKEUpstreamRefresh                  = NewSetting("gke-refresh", "300")
 	HideLocalCluster                    = NewSetting("hide-local-cluster", "false")
-	MachineProvisionImage               = NewSetting("machine-provision-image", "rancher/machine:v0.15.0-rancher109")
+	MachineProvisionImage               = NewSetting("machine-provision-image", "rancher/machine:v0.15.0-rancher109-patch1")
 	SystemFeatureChartRefreshSeconds    = NewSetting("system-feature-chart-refresh-seconds", "21600")
 	ClusterAgentDefaultAffinity         = NewSetting("cluster-agent-default-affinity", ClusterAgentAffinity)
 	FleetAgentDefaultAffinity           = NewSetting("fleet-agent-default-affinity", FleetAgentAffinity)

diff --git a/tests/v2/codecoverage/package/Dockerfile b/tests/v2/codecoverage/package/Dockerfile
@@ -28,7 +28,7 @@ ENV CATTLE_CHART_DEFAULT_BRANCH=$CHART_DEFAULT_BRANCH
 ENV CATTLE_PARTNER_CHART_DEFAULT_BRANCH=$PARTNER_CHART_DEFAULT_BRANCH
 ENV CATTLE_RKE2_CHART_DEFAULT_BRANCH=$RKE2_CHART_DEFAULT_BRANCH
 ENV CATTLE_HELM_VERSION v2.16.8-rancher2
-ENV CATTLE_MACHINE_VERSION v0.15.0-rancher109
+ENV CATTLE_MACHINE_VERSION v0.15.0-rancher109-patch1
 ENV CATTLE_K3S_VERSION v1.27.10+k3s2
 ENV CATTLE_MACHINE_PROVISION_IMAGE rancher/machine:${CATTLE_MACHINE_VERSION}
 ENV CATTLE_ETCD_VERSION v3.5.1