From b29830c1774387a0db6b61e3effdcaa0ce845af8 Mon Sep 17 00:00:00 2001 From: Harrison Affel Date: Mon, 16 Sep 2024 11:38:32 -0400 Subject: [PATCH] bump wins to v0.4.18 --- package/Dockerfile | 2 +- package/windows/Dockerfile.agent | 2 +- pkg/settings/setting.go | 2 +- tests/v2/codecoverage/package/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/Dockerfile b/package/Dockerfile index 3be76747a15..76ab2d553f1 100644 --- a/package/Dockerfile +++ b/package/Dockerfile @@ -86,7 +86,7 @@ ENV DOCKER_MACHINE_HARVESTER_VERSION v0.6.7 ENV CATTLE_KDM_BRANCH ${CATTLE_KDM_BRANCH} ENV HELM_VERSION v3.13.3 ENV KUSTOMIZE_VERSION v5.0.1 -ENV CATTLE_WINS_AGENT_VERSION v0.4.18-rc2 +ENV CATTLE_WINS_AGENT_VERSION v0.4.18 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} diff --git a/package/windows/Dockerfile.agent b/package/windows/Dockerfile.agent index d54b4b767b3..490e005f6a7 100644 --- a/package/windows/Dockerfile.agent +++ b/package/windows/Dockerfile.agent @@ -18,7 +18,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.18-rc2/wins.exe'; \ +RUN $URL = 'https://github.com/rancher/wins/releases/download/v0.4.18/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 527093f7826..b81a92155a1 100644 --- a/pkg/settings/setting.go +++ b/pkg/settings/setting.go @@ -103,7 +103,7 @@ var ( 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. - WinsAgentInstallScript = NewSetting("wins-agent-install-script", "https://raw.githubusercontent.com/rancher/wins/v0.4.18-rc2/install.ps1") + WinsAgentInstallScript = NewSetting("wins-agent-install-script", "https://raw.githubusercontent.com/rancher/wins/v0.4.18/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 34667256ce5..245d8c1ccfc 100644 --- a/tests/v2/codecoverage/package/Dockerfile +++ b/tests/v2/codecoverage/package/Dockerfile @@ -42,7 +42,7 @@ ENV DOCKER_MACHINE_HARVESTER_VERSION v0.6.5 ENV CATTLE_KDM_BRANCH ${CATTLE_KDM_BRANCH} ENV HELM_VERSION v3.12.3 ENV KUSTOMIZE_VERSION v5.0.1 -ENV CATTLE_WINS_AGENT_VERSION v0.4.18-rc2 +ENV CATTLE_WINS_AGENT_VERSION v0.4.18 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}