removed rke version inject setting

.github/actions/build-images/server/action.yml

@@ -45,7 +45,6 @@ runs:
         build-args: |
           "VERSION=${{ env.TAG }}"
           "COMMIT=${{ env.COMMIT }}"
-          "RKE_VERSION=${{ steps.env.outputs.RKE_VERSION }}"
           "ARCH=${{ env.ARCH }}"
           "CATTLE_RANCHER_WEBHOOK_VERSION=${{ steps.env.outputs.CATTLE_RANCHER_WEBHOOK_VERSION }}"
           "CATTLE_REMOTEDIALER_PROXY_VERSION=${{ steps.env.outputs.CATTLE_REMOTEDIALER_PROXY_VERSION }}"

.github/actions/setup-build-env/action.yml

@@ -16,9 +16,6 @@ outputs:
   HELM_UNITTEST_VERSION: 
     description: "HELM_UNITTEST_VERSION from Dockerfile.dapper"
     value: ${{ steps.vars.outputs.HELM_UNITTEST_VERSION }}
-  RKE_VERSION: 
-    description: "RKE_VERSION from go.mod"
-    value: ${{ steps.vars.outputs.RKE_VERSION }}
   CATTLE_RANCHER_WEBHOOK_VERSION: 
     description: "CATTLE_RANCHER_WEBHOOK_VERSION from scripts/export-config"
     value: ${{ steps.vars.outputs.CATTLE_RANCHER_WEBHOOK_VERSION }}
@@ -46,11 +43,6 @@ runs:
         HELM_VERSION=$(grep -m1 'ENV HELM_VERSION=' package/Dockerfile.installer | cut -d '=' -f2)
         GO_VERSION=$(grep -m1 'golang:' package/Dockerfile | cut -d ':' -f2 | cut -d ' ' -f1)
         HELM_UNITTEST_VERSION=$(grep -m1 'ENV HELM_UNITTEST_VERSION' Dockerfile.dapper | awk '{print $3}')
-        RKE_VERSION=$(grep -m1 'github.com/rancher/rke' go.mod | awk '{print $2}')
-        if [[ -z "$RKE_VERSION" ]]; then
-          RKE_VERSION=$(grep -m1 'github.com/rancher/rke' go.mod | awk '{print $4}')
-        fi
-        RKE_VERSION=$RKE_VERSION
         CATTLE_RANCHER_WEBHOOK_VERSION=$CATTLE_RANCHER_WEBHOOK_VERSION
         CATTLE_REMOTEDIALER_PROXY_VERSION=$CATTLE_REMOTEDIALER_PROXY_VERSION
         CATTLE_RANCHER_PROVISIONING_CAPI_VERSION=$CATTLE_RANCHER_PROVISIONING_CAPI_VERSION
@@ -77,10 +69,6 @@ runs:
           echo "HELM_UNITTEST_VERSION not found"
           exit 1
         fi
-        if [[ -z "$RKE_VERSION" ]]; then
-          echo "RKE_VERSION not found"
-          exit 1
-        fi
         if [[ -z "$CATTLE_RANCHER_WEBHOOK_VERSION" ]]; then
           echo "CATTLE_RANCHER_WEBHOOK_VERSION not found"
           exit 1
@@ -107,7 +95,6 @@ runs:
 
         echo "GO_VERSION=$GO_VERSION" >> $GITHUB_OUTPUT 
         echo "HELM_UNITTEST_VERSION=$HELM_UNITTEST_VERSION" >> $GITHUB_OUTPUT
-        echo "RKE_VERSION=$RKE_VERSION" >> $GITHUB_OUTPUT 
         echo "CATTLE_RANCHER_WEBHOOK_VERSION=$CATTLE_RANCHER_WEBHOOK_VERSION" >> $GITHUB_OUTPUT 
         echo "CATTLE_REMOTEDIALER_PROXY_VERSION=$CATTLE_REMOTEDIALER_PROXY_VERSION" >> $GITHUB_OUTPUT 
         echo "CATTLE_RANCHER_PROVISIONING_CAPI_VERSION=$CATTLE_RANCHER_PROVISIONING_CAPI_VERSION" >> $GITHUB_OUTPUT

dev-scripts/quick

@@ -13,10 +13,6 @@ ARCH="${ARCH:-amd64}"
 REPO="${REPO:-rancher}"
 CATTLE_K3S_VERSION=$(grep -m1 'ENV CATTLE_K3S_VERSION' package/Dockerfile | awk '{print $3}')
 CATTLE_KDM_BRANCH=$(grep -m1 'ARG CATTLE_KDM_BRANCH=' package/Dockerfile | cut -d '=' -f2)
-RKE_VERSION=$(grep -m1 'github.com/rancher/rke' go.mod | awk '{print $2}')
-if [[ -z "$RKE_VERSION" ]]; then
-    RKE_VERSION=$(grep -m1 'github.com/rancher/rke' go.mod | awk '{print $4}')
-fi
 CATTLE_RANCHER_WEBHOOK_VERSION=$(yq '.webhookVersion' < build.yaml)
 CATTLE_REMOTEDIALER_PROXY_VERSION=$(yq '.remoteDialerProxyVersion' < build.yaml)
 CATTLE_CSP_ADAPTER_MIN_VERSION=$(yq '.cspAdapterMinVersion' < build.yaml)
@@ -39,7 +35,6 @@ if [ -z $TARGET ] || [ $TARGET = "server" ]; then
     --build-arg ARCH="${ARCH}" \
     --build-arg IMAGE_REPO="${REPO}" \
     --build-arg COMMIT="${COMMIT}" \
-    --build-arg RKE_VERSION="${RKE_VERSION}" \
     --build-arg CATTLE_RANCHER_WEBHOOK_VERSION="${CATTLE_RANCHER_WEBHOOK_VERSION}" \
     --build-arg CATTLE_REMOTEDIALER_PROXY_VERSION="${CATTLE_REMOTEDIALER_PROXY_VERSION}" \
     --build-arg CATTLE_RANCHER_PROVISIONING_CAPI_VERSION="${CATTLE_RANCHER_PROVISIONING_CAPI_VERSION}" \
@@ -58,7 +53,6 @@ if [ -z $TARGET ] || [ $TARGET = "agent" ]; then
     --build-arg RANCHER_TAG="${TAG}" \
     --build-arg RANCHER_REPO="${REPO}" \
     --build-arg COMMIT="${COMMIT}" \
-    --build-arg RKE_VERSION="${RKE_VERSION}" \
     --build-arg CATTLE_RANCHER_WEBHOOK_VERSION="${CATTLE_RANCHER_WEBHOOK_VERSION}" \
     --build-arg CATTLE_RANCHER_PROVISIONING_CAPI_VERSION="${CATTLE_RANCHER_PROVISIONING_CAPI_VERSION}" \
     --tag "${REPO}"/rancher-agent:"${TAG}" \

package/Dockerfile

@@ -329,11 +329,9 @@ RUN --mount=type=cache,target=/root/.cache,id=rancher cd pkg/client && go mod do
 FROM --platform=$BUILDPLATFORM rancher-go-builder AS server-build
 ARG VERSION
 ARG COMMIT
-ARG RKE_VERSION
 ARG TAGS="k8s"
 ARG LINKFLAGS="-extldflags -static -s"
-ARG DEFAULT_VALUES="{\"rke-version\":\"${RKE_VERSION}\"}"
-ARG LDFLAGS="-X github.com/rancher/rancher/pkg/version.Version=${VERSION} -X github.com/rancher/rancher/pkg/version.GitCommit=${COMMIT} -X github.com/rancher/rancher/pkg/settings.InjectDefaults=${DEFAULT_VALUES} ${LINKFLAGS}"
+ARG LDFLAGS="-X github.com/rancher/rancher/pkg/version.Version=${VERSION} -X github.com/rancher/rancher/pkg/version.GitCommit=${COMMIT} ${LINKFLAGS}"
 ARG TARGETOS
 ARG TARGETARCH
 COPY pkg/ pkg/

scripts/build-server

@@ -19,17 +19,11 @@ if [ "$(uname)" != "Darwin" ]; then
   fi
 fi
 
-RKE_VERSION="$(grep -m1 'github.com/rancher/rke' go.mod | awk '{print $2}')"
-
-# Inject Setting values
-DEFAULT_VALUES="{\"rke-version\":\"${RKE_VERSION}\"}"
-
 CGO_ENABLED=0 go build -tags k8s \
   -gcflags="all=${GCFLAGS}" \
   -ldflags \
   "-X github.com/rancher/rancher/pkg/version.Version=$VERSION
-   -X github.com/rancher/rancher/pkg/version.GitCommit=$COMMIT
-   -X github.com/rancher/rancher/pkg/settings.InjectDefaults=$DEFAULT_VALUES $LINKFLAGS" \
+   -X github.com/rancher/rancher/pkg/version.GitCommit=$COMMIT $LINKFLAGS" \
   -o bin/rancher
 
 if  [ -n "$CATTLE_KDM_BRANCH" ]; then