[main] update system-agent to v0.3.9

.github/workflows/system-agent-upgrade.yml

@@ -0,0 +1,91 @@
+name: System Agent Upgrade
+on:
+  workflow_dispatch:
+    inputs:
+      system_agent_version:
+        type: string
+        description: "system agent version to update"
+      source_author:
+        type: string
+        description: "Username of the source for this workflow run"
+
+env:
+  SYSTEM_AGENT_VERSION: ${{ github.event.inputs.system_agent_version }}
+  INPUT_SOURCE_AUTHOR: ${{ github.event.inputs.source_author }}
+
+permissions:
+  contents: write
+  pull-requests: write
+jobs:
+  system-agent-update:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v2
+      - name: Update system agent in files
+        run: make system-agent-upgrade
+      - name: Check for repository changes
+        run: |
+          if git diff --name-only --exit-code; then
+            echo "No changes found in repository after 'go get'"
+            echo "changes_exist=false" >> $GITHUB_ENV
+          else
+            echo "Changes found in repository after 'go get':"
+            git diff --name-only
+            echo "changes_exist=true" >> $GITHUB_ENV
+          fi
+      - name: Create branch, commit and push
+        if: ${{ env.changes_exist == 'true' }}
+        id: branch
+        run: |
+          BRANCH="githubaction-system-agent-upgrade-$(date +%Y-%m-%d-%H-%M-%S)"
+          echo "::set-output name=branch::$BRANCH"
+          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git config --global user.name "github-actions[bot]"
+          git checkout -b "$BRANCH"
+          git commit -a -m "updated system-agent to ${SYSTEM_AGENT_VERSION}"
+          git push origin "$BRANCH"
+      - name: Create Pull Request
+        if: ${{ env.changes_exist == 'true' }}
+        id: cpr
+        uses: actions/[email protected]
+        env:
+          SOURCE_BRANCH: ${{ steps.branch.outputs.branch }}
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const { SYSTEM_AGENT_VERSION } = process.env
+            let body = 'Auto-generated by GitHub Actions\n\n'
+            if  ( `${ process.env.INPUT_SOURCE_URL }` ) {
+              body += `\nSource URL: ${ process.env.INPUT_SOURCE_URL }`
+            }
+            if  ( `${ process.env.INPUT_SOURCE_AUTHOR }` ) {
+              body += `\nSource AUTHOR: @${ process.env.INPUT_SOURCE_AUTHOR}`
+            }
+
+            const { data: pr } = await github.rest.pulls.create({
+              title: `[${{ github.ref_name }}] update system-agent to ${SYSTEM_AGENT_VERSION}`,
+              body: body,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              base: "${{ github.ref_name }}",
+              head: `${ process.env.SOURCE_BRANCH }`
+            });
+            await github.rest.issues.addLabels({
+              ...context.repo,
+              issue_number: pr.number,
+              labels: ["status/auto-created"],
+            });
+            if  ( `${ process.env.INPUT_SOURCE_AUTHOR }` ) {
+              await github.rest.issues.addAssignees({
+                ...context.repo,
+                issue_number: pr.number,
+                assignees: [`${ process.env.INPUT_SOURCE_AUTHOR}`],
+              });
+            }
+            console.log('Created new pull request');
+            return pr.html_url;
+      - name: Check outputs
+        if: ${{ env.changes_exist == 'true' }}
+        run: |
+          echo "Pull Request URL - ${{ steps.cpr.outputs.result }}"

Dockerfile.dapper

@@ -119,7 +119,7 @@ RUN curl -sLf https://github.com/rancher/k3s/releases/download/${CATTLE_K3S_VERS
 RUN zypper -n install python311-pip python311-base python311 python311-devel python311-tox libffi-devel libopenssl-devel
 
 ENV HELM_HOME /root/.helm
-ENV DAPPER_ENV REPO TAG CI DRONE_BUILD_NUMBER DRONE_TAG DRONE_COMMIT DRONE_BRANCH DRONE_BUILD_EVENT SYSTEM_CHART_DEFAULT_BRANCH FOSSA_API_KEY GOGET_MODULE GOGET_VERSION RELEASE_ACTION RELEASE_TYPE POSTRELEASE_RANCHER_VERSION POSTRELEASE_RANCHER_STABLE DEBUG SOME_K8S_VERSION V2PROV_TEST_DIST V2PROV_TEST_RUN_REGEX V2PROV_DISTRO_DATA_DIR V2PROV_PROVISIONING_DATA_DIR V2PROV_SYSTEM_AGENT_DATA_DIR
+ENV DAPPER_ENV REPO TAG CI DRONE_BUILD_NUMBER DRONE_TAG DRONE_COMMIT DRONE_BRANCH DRONE_BUILD_EVENT SYSTEM_CHART_DEFAULT_BRANCH FOSSA_API_KEY GOGET_MODULE GOGET_VERSION RELEASE_ACTION RELEASE_TYPE POSTRELEASE_RANCHER_VERSION POSTRELEASE_RANCHER_STABLE DEBUG SOME_K8S_VERSION V2PROV_TEST_DIST V2PROV_TEST_RUN_REGEX V2PROV_DISTRO_DATA_DIR V2PROV_PROVISIONING_DATA_DIR V2PROV_SYSTEM_AGENT_DATA_DIR SYSTEM_AGENT_VERSION
 ENV DAPPER_SOURCE /go/src/github.com/rancher/rancher/
 ENV DAPPER_OUTPUT ./bin ./dist ./go.mod ./go.sum ./pkg/apis/go.mod ./pkg/apis/go.sum ./pkg/client/go.mod ./pkg/client/go.sum ./scripts/package ./pkg/settings/setting.go ./package/Dockerfile ./Dockerfile.dapper ./pkg/crds/yaml/generated
 ENV DAPPER_DOCKER_SOCKET true

package/Dockerfile

@@ -74,7 +74,7 @@ ENV CATTLE_WINS_AGENT_UNINSTALL_SCRIPT https://raw.githubusercontent.com/rancher
 ENV CATTLE_WINS_AGENT_UPGRADE_IMAGE rancher/wins:${CATTLE_WINS_AGENT_VERSION}
 ENV CATTLE_CSI_PROXY_AGENT_VERSION v1.1.3
 # make sure the CATTLE_SYSTEM_AGENT_VERSION is consistent with tests/v2/codecoverage/package/Dockerfile
-ENV CATTLE_SYSTEM_AGENT_VERSION v0.3.9-rc.4
+ENV CATTLE_SYSTEM_AGENT_VERSION v0.3.9
 ENV CATTLE_SYSTEM_AGENT_DOWNLOAD_PREFIX https://github.com/rancher/system-agent/releases/download
 ENV CATTLE_SYSTEM_AGENT_UPGRADE_IMAGE rancher/system-agent:${CATTLE_SYSTEM_AGENT_VERSION}-suc
 ENV CATTLE_SYSTEM_AGENT_INSTALLER_IMAGE rancher/system-agent-installer-

pkg/settings/setting.go

@@ -103,7 +103,7 @@ var (
 	WinsAgentVersion                    = NewSetting("wins-agent-version", "")
 	CSIProxyAgentVersion                = NewSetting("csi-proxy-agent-version", "")
 	CSIProxyAgentURL                    = NewSetting("csi-proxy-agent-url", "https://acs-mirror.azureedge.net/csi-proxy/%[1]s/binaries/csi-proxy-%[1]s.tar.gz")
-	SystemAgentInstallScript            = NewSetting("system-agent-install-script", "https://github.com/rancher/system-agent/releases/download/v0.3.9-rc.4/install.sh") // To ensure consistency between SystemAgentInstallScript default value and CATTLE_SYSTEM_AGENT_INSTALL_SCRIPT to utilize the local system-agent-install.sh script when both values are equal.
+	SystemAgentInstallScript            = NewSetting("system-agent-install-script", "https://github.com/rancher/system-agent/releases/download/v0.3.9/install.sh") // To ensure consistency between SystemAgentInstallScript default value and CATTLE_SYSTEM_AGENT_INSTALL_SCRIPT to utilize the local system-agent-install.sh script when both values are equal.
 	WinsAgentInstallScript              = NewSetting("wins-agent-install-script", "https://raw.githubusercontent.com/rancher/wins/v0.4.18-rc1/install.ps1")
 	SystemAgentInstallerImage           = NewSetting("system-agent-installer-image", "") // Defined via environment variable
 	SystemAgentUpgradeImage             = NewSetting("system-agent-upgrade-image", "")   // Defined via environment variable

scripts/system-agent-upgrade

@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e
+VERSION=$SYSTEM_AGENT_VERSION
+
+updated_install_script_url="https://github.com/rancher/system-agent/releases/download/${VERSION}/install.sh" # update it to regular expression
+existing_install_script_url=$(grep -E -o 'https:\/\/github.com\/rancher\/system-agent\/releases\/download\/[^/]+\/install.sh' pkg/settings/setting.go)
+sed -i "s|$existing_install_script_url|$updated_install_script_url|g" pkg/settings/setting.go
+
+sed -i "s|^ENV CATTLE_SYSTEM_AGENT_VERSION .\+$|ENV CATTLE_SYSTEM_AGENT_VERSION ${VERSION}|g" package/Dockerfile # try to use regex to avoid extracting the string from the file
+sed -i "s|^ENV CATTLE_SYSTEM_AGENT_VERSION .\+$|ENV CATTLE_SYSTEM_AGENT_VERSION ${VERSION}|g" tests/v2/codecoverage/package/Dockerfile # try to use regex to avoid extracting the string from the file

tests/v2/codecoverage/package/Dockerfile

@@ -73,7 +73,7 @@ ENV CATTLE_WINS_AGENT_UNINSTALL_SCRIPT https://raw.githubusercontent.com/rancher
 ENV CATTLE_WINS_AGENT_UPGRADE_IMAGE rancher/wins:${CATTLE_WINS_AGENT_VERSION}
 ENV CATTLE_CSI_PROXY_AGENT_VERSION v1.1.3
 # make sure the CATTLE_SYSTEM_AGENT_VERSION is consistent with tests/v2/codecoverage/package/Dockerfile
-ENV CATTLE_SYSTEM_AGENT_VERSION v0.3.9-rc.4
+ENV CATTLE_SYSTEM_AGENT_VERSION v0.3.9-rc.6
 ENV CATTLE_SYSTEM_AGENT_DOWNLOAD_PREFIX https://github.com/rancher/system-agent/releases/download
 ENV CATTLE_SYSTEM_AGENT_UPGRADE_IMAGE rancher/system-agent:${CATTLE_SYSTEM_AGENT_VERSION}-suc
 ENV CATTLE_SYSTEM_AGENT_INSTALLER_IMAGE rancher/system-agent-installer-