From f0c9f495967b83a6c880553ce2d4def721c80872 Mon Sep 17 00:00:00 2001 From: Harrison Affel Date: Wed, 13 Nov 2024 17:02:06 -0500 Subject: [PATCH] un-rc rancher-wins and system-agent --- package/Dockerfile | 4 ++-- package/windows/Dockerfile.agent | 2 +- pkg/settings/setting.go | 4 ++-- tests/v2/codecoverage/package/Dockerfile | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/Dockerfile b/package/Dockerfile index 9f3cea24da4..85c6bf0e201 100644 --- a/package/Dockerfile +++ b/package/Dockerfile @@ -71,13 +71,13 @@ ENV DOCKER_MACHINE_HARVESTER_VERSION v0.7.0 ENV CATTLE_KDM_BRANCH ${CATTLE_KDM_BRANCH} ENV HELM_VERSION v3.16.1 ENV KUSTOMIZE_VERSION v5.4.2 -ENV CATTLE_WINS_AGENT_VERSION v0.4.20-rc.1 +ENV CATTLE_WINS_AGENT_VERSION v0.4.20 ENV CATTLE_WINS_AGENT_INSTALL_SCRIPT https://raw.githubusercontent.com/rancher/wins/${CATTLE_WINS_AGENT_VERSION}/install.ps1 ENV CATTLE_WINS_AGENT_UNINSTALL_SCRIPT https://raw.githubusercontent.com/rancher/wins/${CATTLE_WINS_AGENT_VERSION}/uninstall.ps1 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.11-rc.1 +ENV CATTLE_SYSTEM_AGENT_VERSION v0.3.11 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- diff --git a/package/windows/Dockerfile.agent b/package/windows/Dockerfile.agent index 5e715e72abf..6c426325096 100644 --- a/package/windows/Dockerfile.agent +++ b/package/windows/Dockerfile.agent @@ -17,7 +17,7 @@ RUN go build -tags "${TAGS}" -ldflags "${LDFLAGS}" -o agent.exe ./cmd/agent FROM mcr.microsoft.com/windows/servercore:${SERVERCORE_VERSION} AS builder SHELL ["powershell", "-NoLogo", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] # download wins -RUN $URL = 'https://github.com/rancher/wins/releases/download/v0.4.20-rc.1/wins.exe'; \ +RUN $URL = 'https://github.com/rancher/wins/releases/download/v0.4.20/wins.exe'; \ \ Write-Host ('Downloading Wins from {0} ...' -f $URL); \ curl.exe -sfL $URL -o c:\wins.exe; \ diff --git a/pkg/settings/setting.go b/pkg/settings/setting.go index cb2b60541c4..9ff76ee31ae 100644 --- a/pkg/settings/setting.go +++ b/pkg/settings/setting.go @@ -103,8 +103,8 @@ 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.11-rc.1/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.20-rc.1/install.ps1") + SystemAgentInstallScript = NewSetting("system-agent-install-script", "https://github.com/rancher/system-agent/releases/download/v0.3.11/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.20/install.ps1") SystemAgentInstallerImage = NewSetting("system-agent-installer-image", "") // Defined via environment variable SystemAgentUpgradeImage = NewSetting("system-agent-upgrade-image", "") // Defined via environment variable WinsAgentUpgradeImage = NewSetting("wins-agent-upgrade-image", "") diff --git a/tests/v2/codecoverage/package/Dockerfile b/tests/v2/codecoverage/package/Dockerfile index 2847fb3975e..9eeabae706a 100644 --- a/tests/v2/codecoverage/package/Dockerfile +++ b/tests/v2/codecoverage/package/Dockerfile @@ -66,13 +66,13 @@ ENV DOCKER_MACHINE_HARVESTER_VERSION v0.6.7 ENV CATTLE_KDM_BRANCH ${CATTLE_KDM_BRANCH} ENV HELM_VERSION v3.16.1 ENV KUSTOMIZE_VERSION v5.4.2 -ENV CATTLE_WINS_AGENT_VERSION v0.4.20-rc.1 +ENV CATTLE_WINS_AGENT_VERSION v0.4.20 ENV CATTLE_WINS_AGENT_INSTALL_SCRIPT https://raw.githubusercontent.com/rancher/wins/${CATTLE_WINS_AGENT_VERSION}/install.ps1 ENV CATTLE_WINS_AGENT_UNINSTALL_SCRIPT https://raw.githubusercontent.com/rancher/wins/${CATTLE_WINS_AGENT_VERSION}/uninstall.ps1 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.11-rc.1 +ENV CATTLE_SYSTEM_AGENT_VERSION v0.3.11 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-