Skip to content

K
k3s
Unverified Commit 43b1cb48 authored by Hussein Galal's avatar Hussein Galal Committed by GitHub
Browse files
Options

Update to V1.23.4 k3s1 (#5135)

* Update to v1.23.4 Signed-off-by: 's avatargalal-hussein <hussein.galal.ahmed.11@gmail.com> * Upgrade treafik to 2.6.1 Signed-off-by: 's avatargalal-hussein <hussein.galal.ahmed.11@gmail.com> * Upgrade treafik to 2.6.1 Signed-off-by: 's avatargalal-hussein <hussein.galal.ahmed.11@gmail.com> * Upgrade treafik image in image-list Signed-off-by: 's avatargalal-hussein <hussein.galal.ahmed.11@gmail.com> * Update kubernetes Signed-off-by: 's avatargalal-hussein <hussein.galal.ahmed.11@gmail.com>
parent feb6feea
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 42 deletions
go.mod
View file @ 43b1cb48
...@@ -29,37 +29,37 @@ replace ( ...@@ -29,37 +29,37 @@ replace (
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 google.golang.org/genproto => google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2
google.golang.org/grpc => google.golang.org/grpc v1.40.0 google.golang.org/grpc => google.golang.org/grpc v1.40.0
gopkg.in/square/go-jose.v2 => gopkg.in/square/go-jose.v2 v2.2.2 gopkg.in/square/go-jose.v2 => gopkg.in/square/go-jose.v2 v2.2.2
k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.23.3-k3s1 k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.23.4-k3s1
k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.23.3-k3s1 k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.23.4-k3s1
k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.23.3-k3s1 k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.23.4-k3s1
k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.23.3-k3s1 k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.23.4-k3s1
k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.23.3-k3s1 k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.23.4-k3s1
k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.23.3-k3s1 k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.23.4-k3s1
k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.23.3-k3s1 k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.23.4-k3s1
k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.23.3-k3s1 k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.23.4-k3s1
k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.23.3-k3s1 k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.23.4-k3s1
k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.23.3-k3s1 k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.23.4-k3s1
k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.23.3-k3s1 k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.23.4-k3s1
k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.23.3-k3s1 k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.23.4-k3s1
k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.23.3-k3s1 k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.23.4-k3s1
k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.23.3-k3s1 k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.23.4-k3s1
k8s.io/klog => github.com/k3s-io/klog v1.0.0-k3s2 // k3s-release-1.x k8s.io/klog => github.com/k3s-io/klog v1.0.0-k3s2 // k3s-release-1.x
k8s.io/klog/v2 => github.com/k3s-io/klog/v2 v2.30.0-k3s1 // k3s-main k8s.io/klog/v2 => github.com/k3s-io/klog/v2 v2.30.0-k3s1 // k3s-main
k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.23.3-k3s1 k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.23.4-k3s1
k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.23.3-k3s1 k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.23.4-k3s1
k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.23.3-k3s1 k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.23.4-k3s1
k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.23.3-k3s1 k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.23.4-k3s1
k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.23.3-k3s1 k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.23.4-k3s1
k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.23.3-k3s1 k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.23.4-k3s1
k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.23.3-k3s1 k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.23.4-k3s1
k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.23.3-k3s1 k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.23.4-k3s1
k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.23.3-k3s1 k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.23.4-k3s1
k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.23.3-k3s1 k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.23.4-k3s1
k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.23.3-k3s1 k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.23.4-k3s1
k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.23.3-k3s1 k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.23.4-k3s1
k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.23.3-k3s1 k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.23.4-k3s1
k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.23.3-k3s1 k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.23.4-k3s1
k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.23.3-k3s1 k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.23.4-k3s1
mvdan.cc/unparam => mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7 mvdan.cc/unparam => mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7
) )
...@@ -118,18 +118,18 @@ require ( ...@@ -118,18 +118,18 @@ require (
google.golang.org/grpc v1.42.0 google.golang.org/grpc v1.42.0
gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v2 v2.4.0
inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252 inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252
k8s.io/api v0.23.3 k8s.io/api v0.23.4
k8s.io/apimachinery v0.23.3 k8s.io/apimachinery v0.23.4
k8s.io/apiserver v0.23.3 k8s.io/apiserver v0.23.4
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
k8s.io/cloud-provider v0.23.3 k8s.io/cloud-provider v0.23.4
k8s.io/component-base v0.23.3 k8s.io/component-base v0.23.4
k8s.io/component-helpers v0.0.0 k8s.io/component-helpers v0.0.0
k8s.io/controller-manager v0.23.3 // indirect k8s.io/controller-manager v0.23.4 // indirect
k8s.io/cri-api v0.23.3 k8s.io/cri-api v0.23.4
k8s.io/klog v1.0.0 k8s.io/klog v1.0.0
k8s.io/kubectl v0.23.3 k8s.io/kubectl v0.23.4
k8s.io/kubernetes v1.23.3 k8s.io/kubernetes v1.23.4
k8s.io/utils v0.0.0-20211116205334-6203023598ed k8s.io/utils v0.0.0-20211116205334-6203023598ed
sigs.k8s.io/yaml v1.2.0 sigs.k8s.io/yaml v1.2.0
) )
manifests/traefik.yaml
View file @ 43b1cb48
...@@ -5,7 +5,7 @@ metadata: ...@@ -5,7 +5,7 @@ metadata:
name: traefik-crd name: traefik-crd
namespace: kube-system namespace: kube-system
spec: spec:
chart: https://%{KUBERNETES_API}%/static/charts/traefik-crd-10.9.100.tgz chart: https://%{KUBERNETES_API}%/static/charts/traefik-crd-10.14.100.tgz
--- ---
apiVersion: helm.cattle.io/v1 apiVersion: helm.cattle.io/v1
kind: HelmChart kind: HelmChart
...@@ -13,7 +13,7 @@ metadata: ...@@ -13,7 +13,7 @@ metadata:
name: traefik name: traefik
namespace: kube-system namespace: kube-system
spec: spec:
chart: https://%{KUBERNETES_API}%/static/charts/traefik-10.9.100.tgz chart: https://%{KUBERNETES_API}%/static/charts/traefik-10.14.100.tgz
set: set:
global.systemDefaultRegistry: "%{SYSTEM_DEFAULT_REGISTRY_RAW}%" global.systemDefaultRegistry: "%{SYSTEM_DEFAULT_REGISTRY_RAW}%"
valuesContent: |- valuesContent: |-
...@@ -33,6 +33,7 @@ spec: ...@@ -33,6 +33,7 @@ spec:
priorityClassName: "system-cluster-critical" priorityClassName: "system-cluster-critical"
image: image:
name: "rancher/mirrored-library-traefik" name: "rancher/mirrored-library-traefik"
tag: "2.6.1"
tolerations: tolerations:
- key: "CriticalAddonsOnly" - key: "CriticalAddonsOnly"
operator: "Exists" operator: "Exists"
......
pkg/deploy/zz_generated_bindata.go
View file @ 43b1cb48
...@@ -311,7 +311,7 @@ func rolebindingsYaml() (*asset, error) { ...@@ -311,7 +311,7 @@ func rolebindingsYaml() (*asset, error) {
return a, nil return a, nil
} }
var _traefikYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x92\x4f\x6f\xd3\x40\x10\xc5\xef\xfe\x14\x23\x4b\x39\xae\x9d\x72\x2a\xbe\x85\xd4\x40\x05\x14\x94\xa4\xa0\x9e\xa2\xf5\xee\x24\x5e\x65\xbd\x6b\xcd\x8c\x03\xa1\xf4\xbb\xa3\x8d\xfb\x57\xaa\x54\x84\xe0\x98\xc9\xcc\xef\xbd\x7d\xcf\x4a\xa9\x4c\xf7\xee\x2b\x12\xbb\x18\x2a\x68\xd1\x77\x85\xd1\x22\x1e\x0b\x17\xcb\xfd\x49\xb6\x73\xc1\x56\xf0\x1e\x7d\x37\x6f\x35\x49\xd6\xa1\x68\xab\x45\x57\x19\x40\xd0\x1d\x56\x20\xa4\x71\xe3\x76\xca\x90\xbd\x9d\x71\xaf\x0d\x56\xb0\x1b\x1a\x54\x7c\x60\xc1\x2e\xe3\x1e\x4d\x3a\x31\x09\x52\x41\x2b\xd2\x73\x55\x96\x93\xeb\x0f\x97\x6f\xea\xc5\x45\xbd\xaa\x97\xeb\xd9\x97\xf3\x9b\x49\xc9\xa2\xc5\x99\xf2\xb8\xc8\xe5\x23\xb8\x3a\x99\x16\xaf\x8b\x93\xe9\xb4\x90\xed\xcf\xec\x1f\x3a\xff\x7f\xae\x9f\x38\x06\x60\x94\x44\x03\xd8\xfa\xd8\x68\x5f\x8c\x2a\x67\xb8\xd1\x83\x97\x05\x6e\x1d\x0b\x1d\x2a\xc8\x27\xd7\xcb\xab\xe5\xaa\xfe\xb4\x3e\xab\xdf\xce\x2e\x3f\xae\xd6\x8b\xfa\xdd\xf9\x72\xb5\xb8\x5a\x2f\x66\xdf\x6e\x26\x79\x06\xb0\xd7\x7e\x40\x9e\xc7\x20\x18\xa4\x82\x5f\xea\xc8\xa5\x46\x9b\x51\x01\x00\x83\x6e\x3c\xda\xf4\xca\x01\x8f\xb3\x3e\x92\xf0\xdd\xdf\xdf\xb1\x61\x34\x03\xe1\xdd\x00\x40\x3c\x3f\xfc\x78\x1e\x60\x67\x21\xc4\xf4\xd4\x18\xee\x77\x7b\x8a\x1d\x4a\x8b\x03\xa7\xe0\x93\x48\x05\xf9\xe9\xf4\xf4\x55\xfe\xec\x02\x1b\xd2\x3d\x56\x90\x27\xec\xb8\xd2\x53\xdc\x3b\x8b\x74\x8f\x4c\x1d\x50\x40\x41\x3e\x0f\x5b\x42\x7e\xe4\xab\x1f\x1a\xef\xb8\x45\xbb\x44\xda\x3b\x83\x2f\x38\x26\x17\xc9\xc9\x61\xee\x35\xf3\xc5\xb1\xf4\x7c\x4c\x5d\x19\x3f\xb0\x20\x29\x43\x4e\x9c\xd1\x7e\xb4\xe2\x3a\xbd\xbd\x67\x8e\x5f\x49\x4e\x3a\x98\x16\xa9\xec\x1c\x51\x24\xb4\xca\xbb\x86\x34\x1d\xd4\x6d\xcd\xe3\xa5\x44\x8f\xf4\x38\x19\x05\x3b\x4c\x6d\xce\x6f\x05\x66\xd6\xc6\xc0\x9f\x83\x3f\xdc\x05\x13\xfb\x74\x11\xa9\x82\xbc\xfe\xe1\x58\x38\x7f\x72\x18\xa2\x45\x45\xd1\x63\xf1\x90\x47\x4a\xd0\xc4\x20\x14\xbd\xea\xbd\x0e\xf8\x02\x0b\x00\x37\x1b\x34\xa9\x92\x8b\xb8\x34\x2d\xda\xc1\xe3\x9f\xc9\x74\x3a\xe5\xf3\x77\xfc\xdf\x01\x00\x00\xff\xff\x36\xe7\x8c\x9c\x58\x04\x00\x00") var _traefikYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x92\x41\x6f\xd3\x40\x10\x85\xef\xfe\x15\x23\x4b\x39\xae\x9d\x54\x08\x55\xbe\x85\xd4\x40\x05\x14\x94\xa4\xa0\x9e\xa2\xf5\x7a\x12\xaf\xb2\xde\xb5\x66\xc6\x81\x50\xfa\xdf\xd1\xc6\x4d\x9b\x4a\x95\x8a\x10\x1c\x3d\x9e\xf9\xe6\xcd\x7b\xab\x94\x4a\x74\x67\xbf\x22\xb1\x0d\xbe\x80\x06\x5d\x9b\x19\x2d\xe2\x30\xb3\x21\xdf\x4d\x92\xad\xf5\x75\x01\xef\xd1\xb5\xb3\x46\x93\x24\x2d\x8a\xae\xb5\xe8\x22\x01\xf0\xba\xc5\x02\x84\x34\xae\xed\x56\x19\xaa\xef\x6b\xdc\x69\x83\x05\x6c\xfb\x0a\x15\xef\x59\xb0\x4d\xb8\x43\x13\x47\x4c\x84\x14\xd0\x88\x74\x5c\xe4\xf9\xe8\xf6\xc3\xf5\x9b\x72\x7e\x55\x2e\xcb\xc5\x6a\xfa\xe5\xf2\x6e\x94\xb3\x68\xb1\x26\x3f\x34\x72\x7e\x02\x57\x93\x71\x36\x79\x95\x4d\xc6\xe3\x4c\x36\x3f\x93\x7f\x28\xfd\xff\xc9\x7e\x2a\x19\x80\x51\x22\x0e\x60\xe3\x42\xa5\x5d\x36\xac\xb9\xc0\xb5\xee\x9d\xcc\x71\x63\x59\x68\x5f\x40\x3a\xba\x5d\xdc\x2c\x96\xe5\xa7\xd5\x45\xf9\x76\x7a\xfd\x71\xb9\x9a\x97\xef\x2e\x17\xcb\xf9\xcd\x6a\x3e\xfd\x76\x37\x4a\x13\x80\x9d\x76\x3d\xf2\x2c\x78\x41\x2f\x05\xfc\x52\x07\x2e\x55\xda\x0c\x1b\x00\xd0\xeb\xca\x61\x1d\xcf\xec\xf1\x50\xeb\x02\x09\x1f\x7f\x7f\xc7\x8a\xd1\xf4\x84\xc7\x02\x80\x38\x7e\xfc\x78\x1e\x50\x4f\xbd\x0f\xf1\xd6\xe0\x1f\x7a\x3b\x0a\x2d\x4a\x83\x3d\x47\xe7\xe3\x92\x02\xd2\xf3\xf1\xf9\x59\xfa\x6c\x03\x1b\xd2\x1d\x16\x90\x46\xec\xd0\xd2\x51\xd8\xd9\x1a\xe9\x01\x19\x43\x20\x8f\x82\x7c\xe9\x37\x84\x7c\xa2\xab\xeb\x2b\x67\xb9\xc1\x7a\x81\xb4\xb3\x06\x5f\x50\x4c\x36\x90\x95\xfd\xcc\x69\xe6\xab\x43\xea\xe9\xe0\xba\x32\xae\x67\x41\x52\x86\xac\x58\xa3\xdd\x20\xc5\xb6\x7a\xf3\xc0\x1c\x9e\x49\x4a\xda\x9b\x06\x29\x6f\x2d\x51\x20\xac\x95\xb3\x15\x69\xda\xab\xfb\x9c\x8f\x77\x8a\xde\x14\x90\x9e\x65\xaf\xb3\xc9\x50\x92\xe0\x90\x4e\xcd\x52\xb0\xc5\x18\xf0\xec\x7e\xe7\xb4\xae\x83\xe7\xcf\xde\xed\x8f\x8c\xd0\xc5\x89\x40\x05\xa4\xe5\x0f\xcb\xc2\xe9\x93\x41\x1f\x6a\x54\x14\x1c\x66\x8f\x16\x45\x53\x4d\xf0\x42\xc1\xa9\xce\x69\x8f\x2f\xb0\x00\x70\xbd\x46\x13\x53\xba\x0a\x0b\xd3\x60\xdd\x3b\xfc\xb3\x35\xad\x8e\x96\xfd\x1d\xff\x77\x00\x00\x00\xff\xff\x23\x6f\x75\x5d\x6d\x04\x00\x00")
func traefikYamlBytes() ([]byte, error) { func traefikYamlBytes() ([]byte, error) {
return bindataRead( return bindataRead(
......
pkg/static/zz_generated_bindata.go
View file @ 43b1cb48
This source diff could not be displayed because it is too large. You can view the blob instead.
scripts/airgap/image-list.txt
View file @ 43b1cb48
...@@ -3,6 +3,6 @@ docker.io/rancher/klipper-lb:v0.3.4 ...@@ -3,6 +3,6 @@ docker.io/rancher/klipper-lb:v0.3.4
docker.io/rancher/local-path-provisioner:v0.0.21 docker.io/rancher/local-path-provisioner:v0.0.21
docker.io/rancher/mirrored-coredns-coredns:1.8.6 docker.io/rancher/mirrored-coredns-coredns:1.8.6
docker.io/rancher/mirrored-library-busybox:1.34.1 docker.io/rancher/mirrored-library-busybox:1.34.1
docker.io/rancher/mirrored-library-traefik:2.5.6 docker.io/rancher/mirrored-library-traefik:2.6.1
docker.io/rancher/mirrored-metrics-server:v0.5.2 docker.io/rancher/mirrored-metrics-server:v0.5.2
docker.io/rancher/mirrored-pause:3.6 docker.io/rancher/mirrored-pause:3.6
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment