From 8fc35befc7747e578f2971e477d6888af7bf03a6 Mon Sep 17 00:00:00 2001 From: Ross Kirkpatrick Date: Fri, 18 Mar 2022 10:55:02 -0400 Subject: [PATCH 1/4] bump wins to v0.1.1-patch1 and cni plugin to 0.9.1 --- package/Dockerfile | 2 +- package/Dockerfile.windows | 2 +- package/Dockerfile.windows.20H2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/Dockerfile b/package/Dockerfile index 0f89c6eb..8d6f7515 100644 --- a/package/Dockerfile +++ b/package/Dockerfile @@ -23,7 +23,7 @@ RUN apk -U --no-cache add curl wget ca-certificates tar sysstat acl\ && apk del curl RUN mkdir -p /opt/cni/bin -RUN wget -q -O - https://github.com/containernetworking/cni/releases/download/v0.4.0/cni-${ARCH}-v0.4.0.tgz | tar xzf - -C /tmp +RUN wget -q -O - https://github.com/containernetworking/cni/releases/download/v0.9.1/cni-${ARCH}-v0.9.1.tgz | tar xzf - -C /tmp RUN wget -q -O /tmp/portmap https://github.com/rancher/plugins/releases/download/v1.9.1-rancher1/portmap-${ARCH} ENV ETCD_URL=https://github.com/etcd-io/etcd/releases/download/v3.4.15/etcd-v3.4.15-linux-${ARCH}.tar.gz diff --git a/package/Dockerfile.windows b/package/Dockerfile.windows index 1862c79e..0188bef1 100644 --- a/package/Dockerfile.windows +++ b/package/Dockerfile.windows @@ -85,7 +85,7 @@ RUN $URL = 'https://github.com/microsoft/K8s-Storage-Plugins/releases/download/V \ Write-Host 'Complete.' # download wins -RUN $URL = 'https://github.com/rancher/wins/releases/download/v0.1.1/wins.exe'; \ +RUN $URL = 'https://github.com/rancher/wins/releases/download/v0.1.1-patch1/wins.exe'; \ \ Write-Host ('Downloading wins from {0} ...' -f $URL); \ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ diff --git a/package/Dockerfile.windows.20H2 b/package/Dockerfile.windows.20H2 index 4e8bb7d7..2f8d453d 100644 --- a/package/Dockerfile.windows.20H2 +++ b/package/Dockerfile.windows.20H2 @@ -85,7 +85,7 @@ RUN $URL = 'https://github.com/microsoft/K8s-Storage-Plugins/releases/download/V \ Write-Host 'Complete.' # download wins -RUN $URL = 'https://github.com/rancher/wins/releases/download/v0.1.1/wins.exe'; \ +RUN $URL = 'https://github.com/rancher/wins/releases/download/v0.1.1-patch1/wins.exe'; \ \ Write-Host ('Downloading wins from {0} ...' -f $URL); \ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ From 1592973fb46e2e6d4c3e97d6bb6bc2177c21677e Mon Sep 17 00:00:00 2001 From: Ross Kirkpatrick Date: Fri, 18 Mar 2022 11:09:00 -0400 Subject: [PATCH 2/4] fix cni plugin url --- package/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/Dockerfile b/package/Dockerfile index 8d6f7515..0200b61d 100644 --- a/package/Dockerfile +++ b/package/Dockerfile @@ -23,7 +23,7 @@ RUN apk -U --no-cache add curl wget ca-certificates tar sysstat acl\ && apk del curl RUN mkdir -p /opt/cni/bin -RUN wget -q -O - https://github.com/containernetworking/cni/releases/download/v0.9.1/cni-${ARCH}-v0.9.1.tgz | tar xzf - -C /tmp +RUN wget -q -O - https://github.com/containernetworking/plugins/releases/download/v0.9.1/cni-plugins-linux-${ARCH}-v0.9.1.tgz | tar xzf - -C /tmp RUN wget -q -O /tmp/portmap https://github.com/rancher/plugins/releases/download/v1.9.1-rancher1/portmap-${ARCH} ENV ETCD_URL=https://github.com/etcd-io/etcd/releases/download/v3.4.15/etcd-v3.4.15-linux-${ARCH}.tar.gz From 31e47411787767dd49f6b49bf05f22a29e51da3d Mon Sep 17 00:00:00 2001 From: Ross Kirkpatrick Date: Fri, 18 Mar 2022 15:59:12 -0400 Subject: [PATCH 3/4] bump to v0.2.1 of wins --- package/Dockerfile.windows | 2 +- package/Dockerfile.windows.20H2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/Dockerfile.windows b/package/Dockerfile.windows index 0188bef1..ab65d354 100644 --- a/package/Dockerfile.windows +++ b/package/Dockerfile.windows @@ -85,7 +85,7 @@ RUN $URL = 'https://github.com/microsoft/K8s-Storage-Plugins/releases/download/V \ Write-Host 'Complete.' # download wins -RUN $URL = 'https://github.com/rancher/wins/releases/download/v0.1.1-patch1/wins.exe'; \ +RUN $URL = 'https://github.com/rancher/wins/releases/download/v0.2.1/wins.exe'; \ \ Write-Host ('Downloading wins from {0} ...' -f $URL); \ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ diff --git a/package/Dockerfile.windows.20H2 b/package/Dockerfile.windows.20H2 index 2f8d453d..de02ce4e 100644 --- a/package/Dockerfile.windows.20H2 +++ b/package/Dockerfile.windows.20H2 @@ -85,7 +85,7 @@ RUN $URL = 'https://github.com/microsoft/K8s-Storage-Plugins/releases/download/V \ Write-Host 'Complete.' # download wins -RUN $URL = 'https://github.com/rancher/wins/releases/download/v0.1.1-patch1/wins.exe'; \ +RUN $URL = 'https://github.com/rancher/wins/releases/download/v0.2.1/wins.exe'; \ \ Write-Host ('Downloading wins from {0} ...' -f $URL); \ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ From ce64a4d4c412624e2e05161607a3111de68861ca Mon Sep 17 00:00:00 2001 From: Ross Kirkpatrick Date: Fri, 18 Mar 2022 19:29:48 -0400 Subject: [PATCH 4/4] switch order of winsargs --- windows/sidecar.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/sidecar.ps1 b/windows/sidecar.ps1 index 53d9bcfd..2c9424a3 100644 --- a/windows/sidecar.ps1 +++ b/windows/sidecar.ps1 @@ -293,7 +293,7 @@ if ($networkConfigObj) $winsArgs = $($flannelArgs -join ' ') Log-Info "Start flanneld with: $winsArgs" - wins.exe cli prc run --path "$prefixPath\opt\bin\flanneld.exe" --exposes ("UDP:{0}" -f $port) --args "$winsArgs" --envs "NODE_NAME=$nodeName" + wins.exe cli prc run --path "$prefixPath\opt\bin\flanneld.exe" --exposes ("UDP:{0}" -f $port) --envs "NODE_NAME=$nodeName" --args "$winsArgs" } }