Merge pull request rancher#179 from kinarashah/1205

kinarashah · web-flow · commit 7589f9f8ba4a · 2021-03-29T09:10:46.000-07:00
Add k8s v1.20.5
diff --git a/Dockerfile.windows b/Dockerfile.windows
@@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \
             Exit 1; \
        } \
     }
-ENV K8S_VERSION v1.20.4
+ENV K8S_VERSION v1.20.5
 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \
     \
     function Expand-GZip ($inFile, $outFile) { \
diff --git a/Dockerfile.windows.20H2 b/Dockerfile.windows.20H2
@@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \
             Exit 1; \
        } \
     }
-ENV K8S_VERSION v1.20.4
+ENV K8S_VERSION v1.20.5
 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \
     \
     function Expand-GZip ($inFile, $outFile) { \
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-K8S_VERSION?=v1.20.4
+K8S_VERSION?=v1.20.5
 
 ARCH?=amd64
 ALL_ARCH=amd64 arm64

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \`
`10`	`10`	`Exit 1; \`
`11`	`11`	`} \`
`12`	`12`	`}`
`13`		`-ENV K8S_VERSION v1.20.4`
	`13`	`+ENV K8S_VERSION v1.20.5`
`14`	`14`	`RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \`
`15`	`15`	`\`
`16`	`16`	`function Expand-GZip ($inFile, $outFile) { \`