Merge pull request #3008 from erikwilson/update-traefik-v2.4.6

k3s v1.21 - Bump traefik to v2.4.8

manifests/traefik.yaml

@@ -4,7 +4,7 @@ metadata:
   name: traefik-crd
   namespace: kube-system
 spec:
-  chart: https://%{KUBERNETES_API}%/static/charts/traefik-crd-9.14.2.tgz
+  chart: https://%{KUBERNETES_API}%/static/charts/traefik-crd-9.18.2.tgz
 ---
 apiVersion: helm.cattle.io/v1
 kind: HelmChart
@@ -12,7 +12,7 @@ metadata:
   name: traefik
   namespace: kube-system
 spec:
-  chart: https://%{KUBERNETES_API}%/static/charts/traefik-9.14.2.tgz
+  chart: https://%{KUBERNETES_API}%/static/charts/traefik-9.18.2.tgz
   valuesContent: |-
     rbac:
       enabled: true

pkg/deploy/zz_generated_bindata.go

@@ -310,7 +310,7 @@ func rolebindingsYaml() (*asset, error) {
 	return a, nil
 }
 
-var _traefikYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x91\x5d\x8b\xdb\x3c\x10\x85\xef\xfd\x2b\x06\xc3\x5e\xca\x7e\x77\x79\x2f\xb6\xba\x4b\x43\xa0\x4b\x21\x2d\x4d\xdb\xdb\x32\x96\x27\xb1\x88\x2c\x89\x99\x71\xda\xf4\xe3\xbf\x17\xe5\x6b\x53\x58\xd8\x52\x5a\xdf\x79\x34\xe7\x99\xc3\x39\x98\xfd\x47\x62\xf1\x29\x5a\x18\x28\x8c\x8d\x43\xd5\x40\x8d\x4f\xed\xee\xb6\xda\xfa\xd8\x5b\x78\x45\x61\x9c\x0f\xc8\x5a\x8d\xa4\xd8\xa3\xa2\xad\x00\x22\x8e\x64\x41\x19\x69\xed\xb7\xc6\x71\x7f\x9a\x49\x46\x47\x16\xb6\x53\x47\x46\xf6\xa2\x34\x56\x92\xc9\x15\x89\x2b\x10\x0b\x83\x6a\x16\xdb\xb6\x37\xdf\x5e\x7f\x78\xb9\x78\xb7\x5c\xbc\x5f\xac\x3e\xcd\xde\x3e\xfc\xb8\x69\x45\x51\xbd\x6b\x0f\x8b\xd2\x5e\xc1\xcd\x8b\xe6\xf6\xff\xe6\xae\xd1\xcd\xd7\xca\x18\x53\xfd\x25\xdf\xff\xce\xf3\x95\x5f\x80\x1d\x86\x89\x64\x9e\xa2\x52\x54\x0b\xdf\x4d\x05\x00\xc0\x1d\x1e\x4e\x94\x8f\x22\x76\x81\xfa\x62\x6c\xa2\xc3\x2c\x27\x56\x39\x3f\x7f\xa6\x4e\xc8\x4d\x4c\xe7\x01\x80\x06\x79\xfc\x79\x1a\xd0\xcf\x62\x4c\xc5\x5d\x8a\x97\xdd\xcc\x69\x24\x1d\x68\x92\x92\x55\x39\x62\xa1\xbe\xff\xef\xfe\xae\x7e\x72\x41\x1c\x63\x26\x0b\x75\xc1\x1e\x57\x32\xa7\x9d\xef\x89\x2f\xc8\x12\x1b\x47\x52\x92\x87\xb8\x61\x92\x2b\x5f\x79\xea\x82\x97\x81\xfa\x15\xf1\xce\x3b\x7a\xc6\x31\xfb\xc4\x5e\xf7\xf3\x80\x22\xcb\x43\x4f\xf5\xb1\x0e\xe3\xc2\x24\x4a\x6c\x1c\x7b\xf5\x0e\xc3\xd1\x8a\x1f\x71\x73\x61\x1e\x8b\xad\x19\xa3\x1b\x88\xdb\xe0\x3b\x46\xde\x9b\x53\x21\x47\x81\xa6\x40\x7c\x1d\x88\x81\x2d\xed\x2d\xd4\xf3\x13\x77\xd6\xf7\x29\xca\x9b\x18\xf6\xe7\x3c\x52\x2e\x8a\xc4\x16\xea\xc5\x17\x2f\x2a\xf5\x2f\xc2\x98\x7a\x32\x9c\x02\x35\x8f\x31\x94\xe0\x5c\x8a\xca\x29\x98\x1c\x30\xd2\x33\x2c\x00\x5a\xaf\xc9\x95\x26\x96\x69\xe5\x06\xea\xa7\x40\xbf\x77\x66\xc4\x12\xcb\x9f\xf1\x7f\x06\x00\x00\xff\xff\xd5\xb5\xd7\x89\xfc\x03\x00\x00")
+var _traefikYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x91\x4f\x8b\x13\x41\x10\xc5\xef\xf3\x29\x8a\x81\x3d\xf6\x8c\xbb\xa7\xb5\x6f\x31\x04\x5c\x84\x28\x46\xbd\x4a\x4d\x4f\x25\xd3\xa4\xa7\xbb\xa9\xaa\x89\xc6\x3f\xdf\x5d\x3a\xff\x36\xc2\xc2\x8a\xe8\xdc\xa6\xba\xde\xaf\x1e\xef\x61\xf6\x9f\x88\xc5\xa7\x68\x61\xa0\x30\x36\x0e\x55\x03\x35\x3e\xb5\xbb\xdb\x6a\xeb\x63\x6f\xe1\x35\x85\x71\x3e\x20\x6b\x35\x92\x62\x8f\x8a\xb6\x02\x88\x38\x92\x05\x65\xa4\xb5\xdf\x1a\xc7\xfd\x69\x26\x19\x1d\x59\xd8\x4e\x1d\x19\xd9\x8b\xd2\x58\x49\x26\x57\x24\xae\x40\x2c\x0c\xaa\x59\x6c\xdb\xde\x7c\x7f\xf3\xf1\xd5\xe2\xfd\x72\xf1\x61\xb1\xfa\x3c\x7b\xf7\xf0\xf3\xa6\x15\x45\xf5\xae\x3d\x2c\x4a\x7b\x05\x37\x2f\x9b\xdb\xfb\xe6\xae\xd1\xcd\xb7\xca\x18\x53\xfd\x23\xdf\xff\xcf\xf3\x95\x5f\x80\x1d\x86\x89\x64\x9e\xa2\x52\x54\x0b\x3f\x4c\x05\x00\xc0\x1d\x1e\x4e\x94\x8f\x22\x76\x81\xfa\x62\x6c\xa2\xc3\x2c\x27\x56\x39\x3f\x7f\xa1\x4e\xc8\x4d\x4c\xe7\x01\x80\x06\x79\xfc\x79\x1a\xd0\xcf\x62\x4c\xc5\x5d\x8a\x97\xdd\xcc\x69\x24\x1d\x68\x92\x92\x55\x39\x62\xa1\xbe\x7f\x71\x7f\x57\x3f\xb9\x20\x8e\x31\x93\x85\xba\x60\x8f\x2b\x99\xd3\xce\xf7\xc4\x17\x64\x89\x8d\x23\x29\xc9\x43\xdc\x30\xc9\x95\xaf\x3c\x75\xc1\xcb\x40\xfd\x8a\x78\xe7\x1d\x3d\xe3\x98\x7d\x62\xaf\xfb\x79\x40\x91\xe5\xa1\xa7\xfa\x58\x87\x71\x61\x12\x25\x36\x8e\xbd\x7a\x87\xe1\x68\xc5\x8f\xb8\xb9\x30\x8f\xc5\xd6\x8c\xd1\x0d\xc4\x6d\xf0\x1d\x23\xef\xcd\xa9\x90\xa3\x40\x53\x20\xbe\x0e\xc4\xc0\x96\xf6\x16\xea\xf9\x89\x3b\xeb\xfb\x14\xe5\x6d\x0c\xfb\x73\x1e\x29\x17\x45\x62\x0b\xf5\xe2\xab\x17\x95\xfa\x37\x61\x4c\x3d\x19\x4e\x81\x9a\xc7\x18\x4a\x70\x2e\x45\xe5\x14\x4c\x0e\x18\xe9\x19\x16\x00\xad\xd7\xe4\x4a\x13\xcb\xb4\x72\x03\xf5\x53\xa0\x3f\x3b\x33\x62\x89\xe5\xef\xf8\xbf\x02\x00\x00\xff\xff\xfc\xc8\xc6\x55\xfc\x03\x00\x00")
 
 func traefikYamlBytes() ([]byte, error) {
 	return bindataRead(

scripts/airgap/image-list.txt

@@ -2,7 +2,7 @@ docker.io/rancher/coredns-coredns:1.8.0
 docker.io/rancher/klipper-helm:v0.4.3
 docker.io/rancher/klipper-lb:v0.1.2
 docker.io/rancher/library-busybox:1.32.1
-docker.io/rancher/library-traefik:2.4.2
+docker.io/rancher/library-traefik:2.4.8
 docker.io/rancher/local-path-provisioner:v0.0.19
 docker.io/rancher/metrics-server:v0.3.6
 docker.io/rancher/pause:3.1

scripts/download

@@ -5,7 +5,7 @@ cd $(dirname $0)/..
 . ./scripts/version.sh
 
 ROOT_VERSION=v0.8.1
-TRAEFIK_VERSION=9.14.2  # appVersion: 2.4.2
+TRAEFIK_VERSION=9.18.2  # appVersion: 2.4.8
 CHARTS_DIR=build/static/charts
 DATA_DIR=build/data
 export TZ=UTC

scripts/provision/vagrant

@@ -51,7 +51,7 @@ EOF
 mkdir -p ${GOPATH}/bin
 mkdir -p /go
 ln -sf $GOPATH/bin /go/bin
-sed ':a;N;$!ba;s/\\\n/ /g' <Dockerfile.dapper | grep '^RUN ' | sed -e 's/^RUN //' >/tmp/docker-run
+sed ':a;N;$!ba;s/\\\n/ /g' <Dockerfile.dapper | grep -E '^(ARG|ENV|RUN) ' | sed -E -e 's/^RUN //' -e 's/^(ARG|ENV) +([^ =]*) *=? *(.*)/export \2="\3"/' >/tmp/docker-run
 export BINDIR=/go/bin
 export GOPATH=/go
 export HOME=/tmp
@@ -70,7 +70,7 @@ EOF
 
 # --- Utility function to download go
 download_go() {
-    goversion=$(grep "^FROM " Dockerfile.dapper | sed -e 's/^FROM golang:\(.*\)-.*/\1/')
+    goversion=$(grep "golang:" Dockerfile.dapper | sed -e 's/.*golang:\(.*\)-.*/\1/')
     if [ -z "$goversion" ]; then
         echo 'Cannot find version of go to fetch'
         return 1