Skip to content

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

Upgrade to V1.21.10+k3s1 (#5137)

* Update to v1.21.10 Signed-off-by: 's avatargalal-hussein <hussein.galal.ahmed.11@gmail.com> * Upgrade treafik image 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> * add debug to download script Signed-off-by: 's avatargalal-hussein <hussein.galal.ahmed.11@gmail.com> * Enable make generate to use dapper and standardize go and gzip versions (#4861) Signed-off-by: 's avatarDerek Nola <derek.nola@suse.com> * fix go generate Signed-off-by: 's avatargalal-hussein <hussein.galal.ahmed.11@gmail.com> * fix deep copy generated file Signed-off-by: 's avatargalal-hussein <hussein.galal.ahmed.11@gmail.com> * Update go.mod Signed-off-by: 's avatargalal-hussein <hussein.galal.ahmed.11@gmail.com> Co-authored-by: 's avatarDerek Nola <derek.nola@suse.com>
parent c88374a3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 49 deletions
BUILDING.md
View file @ 471f5eb3
......@@ -10,7 +10,7 @@ This repo includes all of Kubernetes history so `--depth 1` will avoid most of t
The k3s build process requires some autogenerated code and remote artifacts that are not checked in to version control.
To prepare these resources for your build environment, run:.
```bash
mkdir -p build/data && ./scripts/download && go generate
mkdir -p build/data && make download && make generate
```
To build the full release binary, you may now run `make`, which will create `./dist/artifacts/k3s`.
......
Dockerfile.dapper
View file @ 471f5eb3
......@@ -42,7 +42,7 @@ ENV SELINUX $SELINUX
ENV DAPPER_RUN_ARGS --privileged -v k3s-cache:/go/src/github.com/rancher/k3s/.cache -v trivy-cache:/root/.cache/trivy
ENV DAPPER_ENV REPO TAG DRONE_TAG IMAGE_NAME SKIP_VALIDATE GCLOUD_AUTH GITHUB_TOKEN GOLANG
ENV DAPPER_SOURCE /go/src/github.com/rancher/k3s/
ENV DAPPER_OUTPUT ./bin ./dist ./build/out
ENV DAPPER_OUTPUT ./bin ./dist ./build/out ./build/static ./pkg/static ./pkg/deploy
ENV DAPPER_DOCKER_SOCKET true
ENV HOME ${DAPPER_SOURCE}
ENV CROSS true
......
Makefile
View file @ 471f5eb3
......@@ -22,11 +22,6 @@ release:
.PHONY: $(TARGETS)
.PHONY: generate
generate: build/data
./scripts/download
go generate
build/data:
mkdir -p $@
......
go.mod
View file @ 471f5eb3
......@@ -37,34 +37,34 @@ replace (
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884
google.golang.org/grpc => google.golang.org/grpc v1.27.1
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.21.9-k3s1
k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.21.9-k3s1
k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.21.9-k3s1
k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.21.9-k3s1
k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.21.9-k3s1
k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.21.9-k3s1
k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.21.9-k3s1
k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.21.9-k3s1
k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.21.9-k3s1
k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.21.9-k3s1
k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.21.9-k3s1
k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.21.9-k3s1
k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.21.9-k3s1
k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.21.9-k3s1
k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.21.9-k3s1
k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.21.9-k3s1
k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.21.9-k3s1
k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.21.9-k3s1
k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.21.9-k3s1
k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.21.9-k3s1
k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.21.9-k3s1
k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.21.9-k3s1
k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.21.9-k3s1
k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.21.9-k3s1
k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.21.9-k3s1
k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.21.9-k3s1
k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.21.9-k3s1
k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.21.9-k3s1
k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.21.10-k3s1
k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.21.10-k3s1
k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.21.10-k3s1
k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.21.10-k3s1
k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.21.10-k3s1
k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.21.10-k3s1
k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.21.10-k3s1
k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.21.10-k3s1
k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.21.10-k3s1
k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.21.10-k3s1
k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.21.10-k3s1
k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.21.10-k3s1
k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.21.10-k3s1
k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.21.10-k3s1
k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.21.10-k3s1
k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.21.10-k3s1
k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.21.10-k3s1
k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.21.10-k3s1
k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.21.10-k3s1
k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.21.10-k3s1
k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.21.10-k3s1
k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.21.10-k3s1
k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.21.10-k3s1
k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.21.10-k3s1
k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.21.10-k3s1
k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.21.10-k3s1
k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.21.10-k3s1
k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.21.10-k3s1
mvdan.cc/unparam => mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7
)
......@@ -120,17 +120,17 @@ require (
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e
google.golang.org/grpc v1.41.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.21.9
k8s.io/apimachinery v0.21.9
k8s.io/apiserver v0.21.9
k8s.io/api v0.21.10
k8s.io/apimachinery v0.21.10
k8s.io/apiserver v0.21.10
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
k8s.io/cloud-provider v0.21.9
k8s.io/component-base v0.21.9
k8s.io/controller-manager v0.21.9 // indirect
k8s.io/cri-api v0.21.9
k8s.io/cloud-provider v0.21.10
k8s.io/component-base v0.21.10
k8s.io/controller-manager v0.21.10 // indirect
k8s.io/cri-api v0.21.10
k8s.io/klog v1.0.0
k8s.io/kubectl v0.21.9
k8s.io/kubernetes v1.21.9
k8s.io/kubectl v0.21.10
k8s.io/kubernetes v1.21.10
k8s.io/utils v0.0.0-20210521133846-da695404a2bc
sigs.k8s.io/yaml v1.2.0
)
manifests/traefik.yaml
View file @ 471f5eb3
......@@ -4,7 +4,7 @@ metadata:
name: traefik-crd
namespace: kube-system
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
kind: HelmChart
......@@ -12,7 +12,7 @@ metadata:
name: traefik
namespace: kube-system
spec:
chart: https://%{KUBERNETES_API}%/static/charts/traefik-10.9.100.tgz
chart: https://%{KUBERNETES_API}%/static/charts/traefik-10.14.100.tgz
set:
global.systemDefaultRegistry: "%{SYSTEM_DEFAULT_REGISTRY_RAW}%"
valuesContent: |-
......@@ -32,6 +32,7 @@ spec:
priorityClassName: "system-cluster-critical"
image:
name: "rancher/mirrored-library-traefik"
tag: "2.6.1"
tolerations:
- key: "CriticalAddonsOnly"
operator: "Exists"
......
pkg/deploy/zz_generated_bindata.go
View file @ 471f5eb3
......@@ -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\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\xba\x77\x5f\x91\xd8\xc5\x50\x41\x8b\xbe\x2b\x8c\x16\xf1\x58\xb8\x58\xee\x4f\xb2\x9d\x0b\xb6\x82\xf7\xe8\xbb\x79\xab\x49\xb2\x0e\x45\x5b\x2d\xba\xca\x00\x82\xee\xb0\x02\x21\x8d\x1b\xb7\x53\x86\xec\xed\x8c\x7b\x6d\xb0\x82\xdd\xd0\xa0\xe2\x03\x0b\x76\x19\xf7\x68\xd2\x89\x49\x90\x0a\x5a\x91\x9e\xab\xb2\x9c\x5c\x7f\xb8\x7c\x53\x2f\x2e\xea\x55\xbd\x5c\xcf\xbe\x9c\xdf\x4c\x4a\x16\x2d\xce\x94\xc7\x45\x2e\x1f\xc1\xd5\xc9\xb4\x78\x5d\x9c\x4c\xa7\x85\x6c\x7f\x66\x4a\xa9\xec\x1f\x39\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\x98\x44\x52\x92\x54\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\x3b\xfb\x15\x89\x6d\xf0\x05\x34\xe8\xda\xcc\x68\x11\x87\x99\x0d\xf9\x6e\x92\x6c\xad\xaf\x0b\x78\x8f\xae\x9d\x35\x9a\x24\x69\x51\x74\xad\x45\x17\x09\x80\xd7\x2d\x16\x20\xa4\x71\x6d\xb7\xca\x50\x7d\x5f\xe3\x4e\x1b\x2c\x60\xdb\x57\xa8\x78\xcf\x82\x6d\xc2\x1d\x9a\x38\x62\x22\xa4\x80\x46\xa4\xe3\x22\xcf\x47\xb7\x1f\xae\xdf\x94\xf3\xab\x72\x59\x2e\x56\xd3\x2f\x97\x77\xa3\x9c\x45\x8b\x35\xf9\xa1\x91\xf3\x13\xb8\x9a\x8c\xb3\xc9\xab\x6c\x32\x1e\x67\xb2\xf9\x99\x28\xa5\x92\x7f\x24\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\x68\x8d\x6e\xbc\x69\x04\x00\x00")
func traefikYamlBytes() ([]byte, error) {
return bindataRead(
......
pkg/static/zz_generated_bindata.go
View file @ 471f5eb3
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 @ 471f5eb3
......@@ -3,6 +3,6 @@ docker.io/rancher/klipper-lb:v0.3.4
docker.io/rancher/local-path-provisioner:v0.0.21
docker.io/rancher/mirrored-coredns-coredns:1.8.6
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-pause:3.5
scripts/download
View file @ 471f5eb3
#!/bin/bash
set -e
set -ex
cd $(dirname $0)/..
......
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