mirror of https://github.com/k3s-io/k3s
Update to Traefik 2.4.2 and combine manifests
Erik Wilson
parent
54a35505f0
commit
4aac6b6bd0
|
|
@ -1,7 +0,0 @@
|
|||
apiVersion: helm.cattle.io/v1
|
||||
kind: HelmChart
|
||||
metadata:
|
||||
name: traefik-crd
|
||||
namespace: kube-system
|
||||
spec:
|
||||
chart: https://%{KUBERNETES_API}%/static/charts/traefik-crd-9.12.3.tgz
|
||||
|
|
@ -1,10 +1,18 @@
|
|||
apiVersion: helm.cattle.io/v1
|
||||
kind: HelmChart
|
||||
metadata:
|
||||
name: traefik-crd
|
||||
namespace: kube-system
|
||||
spec:
|
||||
chart: https://%{KUBERNETES_API}%/static/charts/traefik-crd-9.14.2.tgz
|
||||
---
|
||||
apiVersion: helm.cattle.io/v1
|
||||
kind: HelmChart
|
||||
metadata:
|
||||
name: traefik
|
||||
namespace: kube-system
|
||||
spec:
|
||||
chart: https://%{KUBERNETES_API}%/static/charts/traefik-9.12.3.tgz
|
||||
chart: https://%{KUBERNETES_API}%/static/charts/traefik-9.14.2.tgz
|
||||
valuesContent: |-
|
||||
rbac:
|
||||
enabled: true
|
||||
|
|
@ -21,7 +29,7 @@ spec:
|
|||
enabled: true
|
||||
priorityClassName: "system-cluster-critical"
|
||||
image:
|
||||
name: "traefik"
|
||||
name: "rancher/library-traefik"
|
||||
tolerations:
|
||||
- key: "CriticalAddonsOnly"
|
||||
operator: "Exists"
|
||||
|
|
|
|||
|
|
@ -6,5 +6,5 @@ const (
|
|||
// coredns and servicelb run controllers that are turned off when their manifests are disabled.
|
||||
// The k3s CloudController also has a bundled manifest and can be disabled via the
|
||||
// --disable-cloud-controller flag or --disable=ccm, but the latter method is not documented.
|
||||
DisableItems = "coredns, servicelb, traefik, traefik-crd, local-storage, metrics-server"
|
||||
DisableItems = "coredns, servicelb, traefik, local-storage, metrics-server"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
// manifests/metrics-server/metrics-server-service.yaml
|
||||
// manifests/metrics-server/resource-reader.yaml
|
||||
// manifests/rolebindings.yaml
|
||||
// manifests/traefik-crd.yaml
|
||||
// manifests/traefik.yaml
|
||||
// +build !no_stage
|
||||
|
||||
|
|
@ -311,27 +310,7 @@ func rolebindingsYaml() (*asset, error) {
|
|||
return a, nil
|
||||
}
|
||||
|
||||
var _traefikCrdYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x4c\xcc\x3d\x0b\xc2\x30\x10\xc6\xf1\x3d\x9f\x22\x4b\xc7\x26\x54\x27\x6f\x53\x29\x28\x82\x88\x6f\xab\x9c\xe9\x69\x43\x9b\x36\xe4\x4e\x41\xc5\xef\x2e\x15\x07\xd7\x87\xe7\xff\xc3\xe8\x8f\x94\xd8\xf7\x1d\xe8\x9a\xda\x60\x1c\x8a\xb4\x64\x7c\x6f\xef\x85\x6a\x7c\x57\x81\x5e\x50\x1b\xe6\x35\x26\x51\x81\x04\x2b\x14\x04\xa5\x75\x87\x81\x40\x4b\x42\xba\xf8\x26\x77\xa9\xfa\x6d\x1c\xd1\x11\xe8\xe6\x76\xa6\x9c\x1f\x2c\x14\x14\x47\x72\x43\xe2\x06\x04\x74\x2d\x12\x19\xac\xcd\x5e\xab\xc3\xac\xdc\xae\xcb\x7d\xb9\x3b\x4d\x37\xcb\x77\x66\x59\x50\xbc\xb3\xdf\x23\xdb\x3f\x3c\x9f\x98\x62\x64\xc6\x46\xae\x4f\xf5\x09\x00\x00\xff\xff\xc3\x85\xab\xf0\xb4\x00\x00\x00")
|
||||
|
||||
func traefikCrdYamlBytes() ([]byte, error) {
|
||||
return bindataRead(
|
||||
_traefikCrdYaml,
|
||||
"traefik-crd.yaml",
|
||||
)
|
||||
}
|
||||
|
||||
func traefikCrdYaml() (*asset, error) {
|
||||
bytes, err := traefikCrdYamlBytes()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
info := bindataFileInfo{name: "traefik-crd.yaml", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)}
|
||||
a := &asset{bytes: bytes, info: info}
|
||||
return a, nil
|
||||
}
|
||||
|
||||
var _traefikYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x91\x4d\x6f\xdb\x3c\x10\x84\xef\xfa\x15\x0b\x01\x39\x4a\x7a\x93\xf7\x92\xf2\xe6\x1a\x06\x1a\x14\x70\x8b\xba\xed\xb5\xa0\xa9\xb1\x45\x98\x22\x89\xdd\x95\x5b\xf7\xe3\xbf\x17\xf4\x57\x52\x20\x40\x8a\xea\x46\x6a\xf8\xec\xec\x8c\xcd\xfe\x33\x58\x7c\x8a\x86\x06\x84\xb1\x75\x56\x35\xa0\xf5\xa9\xdb\xdf\x56\x3b\x1f\x7b\x43\x6f\x10\xc6\xf9\x60\x59\xab\x11\x6a\x7b\xab\xd6\x54\x44\xd1\x8e\x30\xa4\x6c\xb1\xf1\xbb\xf3\x59\xb2\x75\x30\xb4\x9b\xd6\x68\xe4\x20\x8a\xb1\x92\x0c\x57\xe4\xae\x00\x0c\x0d\xaa\x59\x4c\xd7\xdd\xfc\x78\xfb\xe9\xf5\xe2\xc3\x72\xf1\x71\xb1\xfa\x32\x7b\xff\xf0\xeb\xa6\x13\xb5\xea\x5d\x77\x14\x4a\x77\x06\x37\xaf\xda\xdb\xbb\xf6\xff\x56\xb7\xdf\x2b\xa2\xbd\x0d\x13\x64\x9e\xa2\x22\xaa\xa1\x9f\x4d\x45\x44\xc4\x6b\x7b\x1c\x51\x3e\x44\xbb\x0e\xe8\x8b\xb1\x09\xc7\xbb\x9c\x58\xe5\xf2\xfb\x2b\xd6\x02\x37\x31\x2e\x17\x44\x1a\xe4\xf1\xf0\x3c\xa0\x9f\xc5\x98\x8a\xbb\x14\xaf\xda\xcc\x69\x84\x0e\x98\xa4\x64\x55\x86\x18\xaa\xef\xff\xbb\xbf\xab\x9f\x15\x88\x63\x9b\x61\xa8\x2e\xd8\x93\x24\x73\xda\xfb\x1e\x7c\x45\x96\xd8\x38\x42\x21\x0f\x71\xcb\x90\x27\xbe\xf2\xb4\x0e\x5e\x06\xf4\x2b\xf0\xde\x3b\xbc\xe0\x98\x7d\x62\xaf\x87\x79\xb0\x22\xcb\x63\x4f\xf5\xa9\x8e\xc6\x85\x49\x14\xdc\x38\xf6\xea\x9d\x0d\x27\x2b\x7e\xb4\xdb\x2b\xf3\x54\x6c\x7d\x2e\xe0\x24\xd0\x14\xc0\x4f\x03\x68\x68\x87\x83\xa1\x7a\x7e\xe6\xcc\xfa\x3e\x45\x79\x17\xc3\xe1\xb2\x7f\xca\xe5\x45\x62\x43\xf5\xe2\x9b\x17\x95\xfa\x8f\x87\x31\xf5\x68\x38\x05\xb4\x8f\x6b\x97\xa0\x5c\x8a\xca\x29\x34\x39\xd8\x88\x17\x58\x44\xd8\x6c\xe0\x4a\xf2\xcb\xb4\x72\x03\xfa\x29\xe0\xef\xc6\x8c\xb6\xc4\xf0\x6f\xfc\xdf\x01\x00\x00\xff\xff\x49\x78\x8d\x66\x34\x03\x00\x00")
|
||||
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")
|
||||
|
||||
func traefikYamlBytes() ([]byte, error) {
|
||||
return bindataRead(
|
||||
|
|
@ -414,7 +393,6 @@ var _bindata = map[string]func() (*asset, error){
|
|||
"metrics-server/metrics-server-service.yaml": metricsServerMetricsServerServiceYaml,
|
||||
"metrics-server/resource-reader.yaml": metricsServerResourceReaderYaml,
|
||||
"rolebindings.yaml": rolebindingsYaml,
|
||||
"traefik-crd.yaml": traefikCrdYaml,
|
||||
"traefik.yaml": traefikYaml,
|
||||
}
|
||||
|
||||
|
|
@ -472,7 +450,6 @@ var _bintree = &bintree{nil, map[string]*bintree{
|
|||
"resource-reader.yaml": &bintree{metricsServerResourceReaderYaml, map[string]*bintree{}},
|
||||
}},
|
||||
"rolebindings.yaml": &bintree{rolebindingsYaml, map[string]*bintree{}},
|
||||
"traefik-crd.yaml": &bintree{traefikCrdYaml, map[string]*bintree{}},
|
||||
"traefik.yaml": &bintree{traefikYaml, map[string]*bintree{}},
|
||||
}}
|
||||
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,8 +1,8 @@
|
|||
docker.io/library/traefik:2.3.6
|
||||
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/local-path-provisioner:v0.0.19
|
||||
docker.io/rancher/metrics-server:v0.3.6
|
||||
docker.io/rancher/pause:3.1
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ cd $(dirname $0)/..
|
|||
. ./scripts/version.sh
|
||||
|
||||
ROOT_VERSION=v0.8.1
|
||||
TRAEFIK_VERSION=9.12.3 # appVersion: 2.3.6
|
||||
TRAEFIK_VERSION=9.14.2 # appVersion: 2.4.2
|
||||
CHARTS_DIR=build/static/charts
|
||||
|
||||
mkdir -p ${CHARTS_DIR}
|
||||
|
|
|
|||
Loading…
Reference in New Issue