diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 00d3e55..ff60f0b 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -7,7 +7,7 @@ on: e2e_file_name: description: 'Name of the e2e tests' required: false - default: 'v1.30*' + default: 'v1.31*' debug: type: choice description: 'Debug mode' diff --git a/Makefile b/Makefile index e6fba0d..38e3e7f 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,12 @@ fullConfig=./e2e/configs/full.yaml args="" branch=`git rev-parse --abbrev-ref HEAD` +prepare-release: + make save-full-config + make update-readme + @echo "\n" + @echo "WARNING: Please check expiry of apt keys" + @echo "\n" test: ./scripts/validate-license.sh go fmt ./cmd/... ./pkg/... diff --git a/README.md b/README.md index e315d37..cbf8d29 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ for other OS download binnary from [release pages](https://github.com/maksim-pas This will create kubernetes cluster in Hetzner Cloud Europe region with 3 instances, 1 load balancer for the kubernetes control plane and 1 kubernetes worker node, after successful installation the cluster will have: -- [Kubernetes v1.30](https://github.com/kubernetes/kubernetes) +- [Kubernetes v1.31](https://github.com/kubernetes/kubernetes) - [Kubernetes Autoscaler](https://github.com/kubernetes/autoscaler) - [Flannel](https://github.com/flannel-io/flannel) - [Kubernetes Cloud Controller Manager for Hetzner Cloud](https://github.com/hetznercloud/hcloud-cloud-controller-manager) @@ -98,7 +98,7 @@ preStartScript: | ``` -
Kubernetes: v1.28, Arch: amd64, Ubuntu: 20.04, Region: eu +
Kubernetes: v1.29, Arch: amd64, Ubuntu: 20.04, Region: eu ```yaml masterCount: 3 @@ -107,7 +107,7 @@ serverComponents: version: ubuntu-20.04 architecture: x86 kubernetes: - version: 1.28.2-1.1 + version: 1.29.3-1.1 docker: version: 5:24.0.6-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) containerd: @@ -115,7 +115,7 @@ serverComponents: ```
-
Kubernetes: v1.28, Arch: amd64, Ubuntu: 22.04, Region: eu +
Kubernetes: v1.29, Arch: amd64, Ubuntu: 22.04, Region: eu ```yaml masterCount: 3 @@ -124,7 +124,7 @@ serverComponents: version: ubuntu-22.04 architecture: x86 kubernetes: - version: 1.28.2-1.1 + version: 1.29.3-1.1 docker: version: 5:24.0.6-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) containerd: @@ -132,7 +132,7 @@ serverComponents: ```
-
Kubernetes: v1.28, Arch: amd64, Ubuntu: 22.04, Region: us +
Kubernetes: v1.29, Arch: amd64, Ubuntu: 22.04, Region: us ```yaml masterCount: 3 @@ -146,7 +146,7 @@ serverComponents: version: ubuntu-22.04 architecture: x86 kubernetes: - version: 1.28.2-1.1 + version: 1.29.3-1.1 docker: version: 5:24.0.6-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) containerd: @@ -160,7 +160,7 @@ cluster-autoscaler: region: ash ```
-
Kubernetes: v1.28, Arch: arm64, Ubuntu: 20.04, Region: eu +
Kubernetes: v1.29, Arch: arm64, Ubuntu: 20.04, Region: eu ```yaml masterCount: 3 @@ -169,7 +169,7 @@ serverComponents: version: ubuntu-20.04 architecture: arm kubernetes: - version: 1.28.2-1.1 + version: 1.29.3-1.1 docker: version: 5:24.0.6-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) containerd: @@ -186,7 +186,7 @@ cluster-autoscaler: ```
-
Kubernetes: v1.28, Arch: arm64, Ubuntu: 22.04, Region: eu +
Kubernetes: v1.29, Arch: arm64, Ubuntu: 22.04, Region: eu ```yaml masterCount: 3 @@ -195,7 +195,7 @@ serverComponents: version: ubuntu-22.04 architecture: arm kubernetes: - version: 1.28.2-1.1 + version: 1.29.3-1.1 docker: version: 5:24.0.6-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) containerd: @@ -211,43 +211,28 @@ cluster-autoscaler: region: fsn1 ```
-
Kubernetes: v1.29, Arch: amd64, Ubuntu: 20.04, Region: eu +
Kubernetes: v1.30, Arch: amd64, Ubuntu: 20.04, Region: eu ```yaml +ipRange: "10.0.0.0/16" masterCount: 3 serverComponents: ubuntu: version: ubuntu-20.04 architecture: x86 kubernetes: - version: 1.29.3-1.1 - docker: - version: 5:24.0.6-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) - containerd: - version: 1.6.24-1 - -``` -
-
Kubernetes: v1.29, Arch: amd64, Ubuntu: 22.04, Region: eu - -```yaml -masterCount: 3 -serverComponents: - ubuntu: - version: ubuntu-22.04 - architecture: x86 - kubernetes: - version: 1.29.3-1.1 + version: 1.30.5-1.1 docker: - version: 5:24.0.6-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) + version: 5:27.3.1-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) containerd: - version: 1.6.24-1 + version: 1.7.22-1 ```
-
Kubernetes: v1.29, Arch: amd64, Ubuntu: 22.04, Region: us +
Kubernetes: v1.30, Arch: amd64, Ubuntu: 20.04, Region: us ```yaml +ipRange: "10.0.0.0/16" masterCount: 3 networkZone: us-east location: ash @@ -256,14 +241,14 @@ masterServers: servertype: cpx21 serverComponents: ubuntu: - version: ubuntu-22.04 + version: ubuntu-20.04 architecture: x86 kubernetes: - version: 1.29.3-1.1 + version: 1.30.5-1.1 docker: - version: 5:24.0.6-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) + version: 5:27.3.1-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) containerd: - version: 1.6.24-1 + version: 1.7.22-1 cluster-autoscaler: autoscalingGroups: - name: cpx51-ash @@ -273,46 +258,39 @@ cluster-autoscaler: region: ash ```
-
Kubernetes: v1.29, Arch: arm64, Ubuntu: 20.04, Region: eu +
Kubernetes: v1.30, Arch: amd64, Ubuntu: 22.04, Region: eu ```yaml +ipRange: "10.0.0.0/16" masterCount: 3 serverComponents: ubuntu: - version: ubuntu-20.04 - architecture: arm + version: ubuntu-22.04 + architecture: x86 kubernetes: - version: 1.29.3-1.1 + version: 1.30.5-1.1 docker: - version: 5:24.0.6-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) + version: 5:27.3.1-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) containerd: - version: 1.6.24-1 -masterServers: - servertype: cax11 -cluster-autoscaler: - autoscalingGroups: - - name: cax-fsn1 - minSize: 1 - maxSize: 20 - instanceType: cax41 - region: fsn1 + version: 1.7.22-1 ```
-
Kubernetes: v1.29, Arch: arm64, Ubuntu: 22.04, Region: eu +
Kubernetes: v1.30, Arch: arm64, Ubuntu: 20.04, Region: eu ```yaml +ipRange: "10.0.0.0/16" masterCount: 3 serverComponents: ubuntu: - version: ubuntu-22.04 + version: ubuntu-20.04 architecture: arm kubernetes: - version: 1.29.3-1.1 + version: 1.30.5-1.1 docker: - version: 5:24.0.6-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) + version: 5:27.3.1-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) containerd: - version: 1.6.24-1 + version: 1.7.22-1 masterServers: servertype: cax11 cluster-autoscaler: @@ -324,54 +302,34 @@ cluster-autoscaler: region: fsn1 ```
-
Kubernetes: v1.30, Arch: amd64, Ubuntu: 20.04, Region: eu +
Kubernetes: v1.30, Arch: arm64, Ubuntu: 22.04, Region: eu ```yaml ipRange: "10.0.0.0/16" masterCount: 3 serverComponents: ubuntu: - version: ubuntu-20.04 - architecture: x86 + version: ubuntu-22.04 + architecture: arm kubernetes: version: 1.30.5-1.1 docker: version: 5:27.3.1-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) containerd: version: 1.7.22-1 - -``` -
-
Kubernetes: v1.30, Arch: amd64, Ubuntu: 20.04, Region: us - -```yaml -ipRange: "10.0.0.0/16" -masterCount: 3 -networkZone: us-east -location: ash -datacenter: ash-dc1 masterServers: - servertype: cpx21 -serverComponents: - ubuntu: - version: ubuntu-20.04 - architecture: x86 - kubernetes: - version: 1.30.5-1.1 - docker: - version: 5:27.3.1-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) - containerd: - version: 1.7.22-1 + servertype: cax11 cluster-autoscaler: autoscalingGroups: - - name: cpx51-ash + - name: cax-fsn1 minSize: 1 maxSize: 20 - instanceType: cpx51 - region: ash + instanceType: cax41 + region: fsn1 + ```
-
Kubernetes: v1.30, Arch: amd64, Ubuntu: 22.04, Region: eu +
Kubernetes: v1.31, Arch: amd64, Ubuntu: 22.04, Region: eu ```yaml ipRange: "10.0.0.0/16" @@ -381,41 +339,44 @@ serverComponents: version: ubuntu-22.04 architecture: x86 kubernetes: - version: 1.30.5-1.1 + version: 1.31.4-1.1 docker: - version: 5:27.3.1-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) + version: 5:27.4.1-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) containerd: - version: 1.7.22-1 + version: 1.7.24-1 ```
-
Kubernetes: v1.30, Arch: arm64, Ubuntu: 20.04, Region: eu +
Kubernetes: v1.31, Arch: amd64, Ubuntu: 22.04, Region: us ```yaml ipRange: "10.0.0.0/16" masterCount: 3 +networkZone: us-east +location: ash +datacenter: ash-dc1 +masterServers: + servertype: cpx21 serverComponents: ubuntu: - version: ubuntu-20.04 - architecture: arm + version: ubuntu-22.04 + architecture: x86 kubernetes: - version: 1.30.5-1.1 + version: 1.31.4-1.1 docker: - version: 5:27.3.1-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) + version: 5:27.4.1-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) containerd: - version: 1.7.22-1 -masterServers: - servertype: cax11 + version: 1.7.24-1 cluster-autoscaler: autoscalingGroups: - - name: cax-fsn1 + - name: cpx51-ash minSize: 1 maxSize: 20 - instanceType: cax41 - region: fsn1 + instanceType: cpx51 + region: ash ```
-
Kubernetes: v1.30, Arch: arm64, Ubuntu: 22.04, Region: eu +
Kubernetes: v1.31, Arch: arm64, Ubuntu: 22.04, Region: eu ```yaml ipRange: "10.0.0.0/16" @@ -425,11 +386,11 @@ serverComponents: version: ubuntu-22.04 architecture: arm kubernetes: - version: 1.30.5-1.1 + version: 1.31.4-1.1 docker: - version: 5:27.3.1-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) + version: 5:27.4.1-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) containerd: - version: 1.7.22-1 + version: 1.7.24-1 masterServers: servertype: cax11 cluster-autoscaler: diff --git a/e2e/configs/full.yaml b/e2e/configs/full.yaml index 3a40565..8876e89 100644 --- a/e2e/configs/full.yaml +++ b/e2e/configs/full.yaml @@ -5,11 +5,11 @@ serverComponents: username: hcloud-user architecture: x86 kubernetes: - version: 1.30.5-1.1 + version: 1.31.4-1.1 docker: - version: 5:27.3.1-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) + version: 5:27.4.1-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) containerd: - version: 1.7.22-1 + version: 1.7.24-1 pausecontainer: registry.k8s.io/pause:3.2 ipRange: 10.0.0.0/16 ipRangeSubnet: 10.0.0.0/16 diff --git a/e2e/configs/v1.28-amd64-ubuntu-20.04-eu.yaml b/e2e/configs/v1.28-amd64-ubuntu-20.04-eu.yaml deleted file mode 100644 index 34cc410..0000000 --- a/e2e/configs/v1.28-amd64-ubuntu-20.04-eu.yaml +++ /dev/null @@ -1,12 +0,0 @@ -ipRange: "10.0.0.0/16" -masterCount: 3 -serverComponents: - ubuntu: - version: ubuntu-20.04 - architecture: x86 - kubernetes: - version: 1.28.2-1.1 - docker: - version: 5:24.0.6-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) - containerd: - version: 1.6.24-1 diff --git a/e2e/configs/v1.28-amd64-ubuntu-22.04-eu.yaml b/e2e/configs/v1.28-amd64-ubuntu-22.04-eu.yaml deleted file mode 100644 index 2811270..0000000 --- a/e2e/configs/v1.28-amd64-ubuntu-22.04-eu.yaml +++ /dev/null @@ -1,12 +0,0 @@ -ipRange: "10.0.0.0/16" -masterCount: 3 -serverComponents: - ubuntu: - version: ubuntu-22.04 - architecture: x86 - kubernetes: - version: 1.28.2-1.1 - docker: - version: 5:24.0.6-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) - containerd: - version: 1.6.24-1 diff --git a/e2e/configs/v1.28-arm64-ubuntu-20.04-eu.yaml b/e2e/configs/v1.28-arm64-ubuntu-20.04-eu.yaml deleted file mode 100644 index 0224799..0000000 --- a/e2e/configs/v1.28-arm64-ubuntu-20.04-eu.yaml +++ /dev/null @@ -1,21 +0,0 @@ -ipRange: "10.0.0.0/16" -masterCount: 3 -serverComponents: - ubuntu: - version: ubuntu-20.04 - architecture: arm - kubernetes: - version: 1.28.2-1.1 - docker: - version: 5:24.0.6-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) - containerd: - version: 1.6.24-1 -masterServers: - servertype: cax11 -cluster-autoscaler: - autoscalingGroups: - - name: cax-fsn1 - minSize: 1 - maxSize: 20 - instanceType: cax41 - region: fsn1 diff --git a/e2e/configs/v1.31-amd64-ubuntu-22.04-eu.yaml b/e2e/configs/v1.31-amd64-ubuntu-22.04-eu.yaml new file mode 100644 index 0000000..8972c3d --- /dev/null +++ b/e2e/configs/v1.31-amd64-ubuntu-22.04-eu.yaml @@ -0,0 +1,13 @@ +# Kubernetes v1.30 in Europe (ARM64 architecture) +ipRange: "10.0.0.0/16" +masterCount: 3 +serverComponents: + ubuntu: + version: ubuntu-22.04 + architecture: x86 + kubernetes: + version: 1.31.4-1.1 + docker: + version: 5:27.4.1-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) + containerd: + version: 1.7.24-1 diff --git a/e2e/configs/v1.28-amd64-ubuntu-22.04-us.yaml b/e2e/configs/v1.31-amd64-ubuntu-22.04-us.yaml similarity index 72% rename from e2e/configs/v1.28-amd64-ubuntu-22.04-us.yaml rename to e2e/configs/v1.31-amd64-ubuntu-22.04-us.yaml index 8e35d1d..8929b63 100644 --- a/e2e/configs/v1.28-amd64-ubuntu-22.04-us.yaml +++ b/e2e/configs/v1.31-amd64-ubuntu-22.04-us.yaml @@ -1,3 +1,4 @@ +# Kubernetes v1.30 in US East ipRange: "10.0.0.0/16" masterCount: 3 networkZone: us-east @@ -10,11 +11,11 @@ serverComponents: version: ubuntu-22.04 architecture: x86 kubernetes: - version: 1.28.2-1.1 + version: 1.31.4-1.1 docker: - version: 5:24.0.6-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) + version: 5:27.4.1-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) containerd: - version: 1.6.24-1 + version: 1.7.24-1 cluster-autoscaler: autoscalingGroups: - name: cpx51-ash diff --git a/e2e/configs/v1.28-arm64-ubuntu-22.04-eu.yaml b/e2e/configs/v1.31-arm64-ubuntu-22.04-eu.yaml similarity index 63% rename from e2e/configs/v1.28-arm64-ubuntu-22.04-eu.yaml rename to e2e/configs/v1.31-arm64-ubuntu-22.04-eu.yaml index 4b81d04..1e45893 100644 --- a/e2e/configs/v1.28-arm64-ubuntu-22.04-eu.yaml +++ b/e2e/configs/v1.31-arm64-ubuntu-22.04-eu.yaml @@ -1,3 +1,4 @@ +# Kubernetes v1.30 in Europe (ARM64 architecture) ipRange: "10.0.0.0/16" masterCount: 3 serverComponents: @@ -5,11 +6,11 @@ serverComponents: version: ubuntu-22.04 architecture: arm kubernetes: - version: 1.28.2-1.1 + version: 1.31.4-1.1 docker: - version: 5:24.0.6-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) + version: 5:27.4.1-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) containerd: - version: 1.6.24-1 + version: 1.7.24-1 masterServers: servertype: cax11 cluster-autoscaler: @@ -18,4 +19,4 @@ cluster-autoscaler: minSize: 1 maxSize: 20 instanceType: cax41 - region: fsn1 \ No newline at end of file + region: fsn1 diff --git a/go.mod b/go.mod index 4bcb37e..2f8c914 100644 --- a/go.mod +++ b/go.mod @@ -9,25 +9,27 @@ require ( github.com/sirupsen/logrus v1.9.3 golang.org/x/crypto v0.31.0 gopkg.in/yaml.v3 v3.0.1 - k8s.io/api v0.29.2 - k8s.io/apimachinery v0.29.2 - k8s.io/client-go v0.29.2 + k8s.io/api v0.31.4 + k8s.io/apimachinery v0.31.4 + k8s.io/client-go v0.31.4 ) require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/emicklei/go-restful/v3 v3.11.0 // indirect - github.com/go-logr/logr v1.3.0 // indirect + github.com/fxamacker/cbor/v2 v2.7.0 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-openapi/jsonpointer v0.19.6 // indirect github.com/go-openapi/jsonreference v0.20.2 // indirect - github.com/go-openapi/swag v0.22.3 // indirect + github.com/go-openapi/swag v0.22.4 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect + github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/imdario/mergo v0.3.6 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -41,6 +43,7 @@ require ( github.com/prometheus/common v0.61.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect github.com/spf13/pflag v1.0.5 // indirect + github.com/x448/float16 v0.8.4 // indirect golang.org/x/net v0.33.0 // indirect golang.org/x/oauth2 v0.24.0 // indirect golang.org/x/sys v0.28.0 // indirect @@ -50,10 +53,10 @@ require ( google.golang.org/protobuf v1.36.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - k8s.io/klog/v2 v2.110.1 // indirect - k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect - k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect + k8s.io/klog/v2 v2.130.1 // indirect + k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect + k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect - sigs.k8s.io/yaml v1.3.0 // indirect + sigs.k8s.io/yaml v1.4.0 // indirect ) diff --git a/go.sum b/go.sum index c6e2ee8..355a69d 100644 --- a/go.sum +++ b/go.sum @@ -4,38 +4,40 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g= github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= -github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= -github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= +github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= -github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g= github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU= +github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= +github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af h1:kmjWCqn2qkEml422C2Rrd27c3VGxi6a/6HNq8QmHRKM= +github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hetznercloud/hcloud-go/v2 v2.17.1 h1:DPi019dv0WCiECEmtcuTgc//hBvnxESb6QlJnAb4a04= @@ -68,14 +70,15 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4= -github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= -github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg= -github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= +github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= +github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= +github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw= +github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y= github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= @@ -84,8 +87,8 @@ github.com/prometheus/common v0.61.0 h1:3gv/GThfX0cV2lpO7gkTUwZru38mxevy90Bj8YFS github.com/prometheus/common v0.61.0/go.mod h1:zr29OCN/2BsJRaFwG8QOBr41D6kkchKbpeNH7pAjb/s= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= -github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= -github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= @@ -100,6 +103,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= +github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -144,8 +149,6 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.36.0 h1:mjIs9gYtt56AzC4ZaffQuh88TZurBGhIJMBZGSxNerQ= google.golang.org/protobuf v1.36.0/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -159,21 +162,21 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= -k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= -k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= -k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= -k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= -k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= -k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/api v0.31.4 h1:I2QNzitPVsPeLQvexMEsj945QumYraqv9m74isPDKhM= +k8s.io/api v0.31.4/go.mod h1:d+7vgXLvmcdT1BCo79VEgJxHHryww3V5np2OYTr6jdw= +k8s.io/apimachinery v0.31.4 h1:8xjE2C4CzhYVm9DGf60yohpNUh5AEBnPxCryPBECmlM= +k8s.io/apimachinery v0.31.4/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= +k8s.io/client-go v0.31.4 h1:t4QEXt4jgHIkKKlx06+W3+1JOwAFU/2OPiOo7H92eRQ= +k8s.io/client-go v0.31.4/go.mod h1:kvuMro4sFYIa8sulL5Gi5GFqUPvfH2O/dXuKstbaaeg= +k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= +k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= +k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= +k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= +k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= +k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= -sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= -sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= +sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= +sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/pkg/config/config.go b/pkg/config/config.go index 16b4d00..db2defb 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -219,13 +219,13 @@ func defaultConfig() Type { Architecture: hcloud.ArchitectureX86, // x86 or arm }, Kubernetes: serverComponentKubernetes{ - Version: "1.30.5-1.1", + Version: "1.31.4-1.1", }, Docker: serverComponentDocker{ - Version: "5:27.3.1-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs)", + Version: "5:27.4.1-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs)", }, Containerd: serverComponentContainerd{ - Version: "1.7.22-1", + Version: "1.7.24-1", PauseContainer: "registry.k8s.io/pause:3.2", }, }, diff --git a/scripts/chart/Chart.lock b/scripts/chart/Chart.lock index 05848a3..b1191ad 100644 --- a/scripts/chart/Chart.lock +++ b/scripts/chart/Chart.lock @@ -7,18 +7,18 @@ dependencies: version: 0.2.3 - name: hcloud-csi repository: https://charts.hetzner.cloud - version: 2.9.0 + version: 2.11.0 - name: hcloud-cloud-controller-manager repository: https://charts.hetzner.cloud - version: 1.20.0 + version: 1.21.0 - name: cluster-autoscaler repository: https://kubernetes.github.io/autoscaler - version: 9.43.0 + version: 9.43.2 - name: metrics-server repository: https://kubernetes-sigs.github.io/metrics-server - version: 3.12.1 + version: 3.12.2 - name: flannel repository: https://flannel-io.github.io/flannel - version: v0.25.6 -digest: sha256:80b841973c680cbb2e629209388a2231962d04fb2c727440798f4e14d13cd42d -generated: "2024-10-03T10:30:13.174016+01:00" + version: v0.26.2 +digest: sha256:766d7c21d00874a636532fe6b63d8d7fce1971d0b768b2b350584ef3b2c7edf5 +generated: "2024-12-22T08:38:46.023525+01:00" diff --git a/scripts/chart/Chart.yaml b/scripts/chart/Chart.yaml index 25b22da..bacd327 100644 --- a/scripts/chart/Chart.yaml +++ b/scripts/chart/Chart.yaml @@ -10,17 +10,17 @@ dependencies: version: "0.2.3" repository: https://postfinance.github.io/kubelet-csr-approver - name: hcloud-csi - version: "2.9.0" + version: "2.11.0" repository: https://charts.hetzner.cloud - name: hcloud-cloud-controller-manager - version: "1.20.0" + version: "1.21.0" repository: https://charts.hetzner.cloud - name: cluster-autoscaler - version: "9.43.0" + version: "9.43.2" repository: https://kubernetes.github.io/autoscaler - name: metrics-server - version: "3.12.1" + version: "3.12.2" repository: https://kubernetes-sigs.github.io/metrics-server - name: flannel - version: "v0.25.6" + version: "v0.26.2" repository: https://flannel-io.github.io/flannel \ No newline at end of file diff --git a/scripts/chart/values.yaml b/scripts/chart/values.yaml index 04ff3bc..e10dc45 100644 --- a/scripts/chart/values.yaml +++ b/scripts/chart/values.yaml @@ -70,6 +70,10 @@ kubelet-csr-approver: cluster-autoscaler: replicaCount: 2 + image: + # TODO: Remove after chart will have this version + # https://github.com/kubernetes/autoscaler/pull/7298 + tag: v1.31.1 priorityClassName: system-cluster-critical resources: requests: diff --git a/scripts/common-install.sh b/scripts/common-install.sh index 7669daf..4fa6abd 100755 --- a/scripts/common-install.sh +++ b/scripts/common-install.sh @@ -31,7 +31,7 @@ export HOME=/root/ dpkg --purge docker docker-engine docker.io containerd runc # remove old kubernetes sources -rm -rf /etc/apt/sources.list.d/kubernetes.list +rm -rf /etc/apt/sources.list.d/kubernetes-* apt update apt install -y \ @@ -97,30 +97,21 @@ echo LS0tLS1CRUdJTiBQR1AgUFVCTElDIEtFWSBCTE9DSy0tLS0tCgptUUlOQkZpdDJpb0JFQURoV3B | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg # add kubernetes gpg key -# curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.29/deb/Release.key | base64 +# curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.31/deb/Release.key | base64 # expires 2026-12-29 echo LS0tLS1CRUdJTiBQR1AgUFVCTElDIEtFWSBCTE9DSy0tLS0tClZlcnNpb246IEdudVBHIHYxLjQuNSAoR05VL0xpbnV4KQoKbVFFTkJHTUhvWGNCQ0FEdWtHT0VReWxlVmlPZ3RrTVZhN2hLaWZQNlBPQ1RoKzk4eE5XNFRmSEsvbkJKTjJzbQp1NFhhaVVtdEI5VXVHdDlqbDhWeFFnNGhPTVJmNDBjb0l3SHNOd3RTcmMyUjl2NUtncHZjdjUzN1FWSWlnVkhICldNTnZYZW9aa2tvRElVbGp2YkNFRFdhRWhTOVI1T01ZS2Q0QWFKK2YxYzhPRUxoRWNWMmRBUUxMeWp0bkVhRi8KcW1SRU4rM1k5KzVWY1JadlFIZXlCeENHK2hkVUdFNzQwaXhnblkyZ1NxWi9KNFllUW50UTZwTVVFaFQ2cGJhRQoxMHEySFVpZXJqL2ltMFYrWlVkQ2g0NkxrL1JkZmE1WktscVlPaUEyaU4xY29EUElkeXFLYXZjZGZQcVNyYUtGCkxhbjJLTGNaY2dUeFArMCtIZnpLZWZ2R0VuWmExMWNpdmJlOUFCRUJBQUcwUG1semRqcHJkV0psY201bGRHVnoKSUU5Q1V5QlFjbTlxWldOMElEeHBjM1k2YTNWaVpYSnVaWFJsYzBCaWRXbHNaQzV2Y0dWdWMzVnpaUzV2Y21jKwppUUUrQkJNQkNBQW9CUUpuRkYzNEFoc0RCUWtJSzJ5QkJnc0pDQWNEQWdZVkNBSUpDZ3NFRmdJREFRSWVBUUlYCmdBQUtDUkFqUmxUYW1pbGtOdE9BQ0FDREs5ZFE4Q0gySmk5QzNROTI2blZNVWlYZHlKSzFvbkNCclFTRUJxZFIKTEphVDZoR3g1cHp4a1FHZ1VEcFM5cDdMQTB1OTIwSEtMd0diN3lJQVd0eUU1VEFqMkNZcHJHZ3BxOThzZnNHQworVTVUOUlyQWR5YS9CYVRBa2tQNmdOaGZNak5hSzNiT1dzdnVMUmxsdUtNTmNoNGlmeStJd0xxYzFKTEc0MGJqCjJIbktCR1lrQzNtMFZ0UWZVdVBRTUltU0x0YS9Od1JISk1QbzhqZkd5TWFucU1NeHAzNS9lY1AyclhNZmIvbDEKV2pGRFk3aCs2bnFYYXkyMGxqTVhrTjIzVzh3RlRkdkM2bHE0NXd3TTVJQm5LTlIvVGpOTllBSWl6Wm9IRld6MQpjL2VjTVdXV0NCMlM3V2JZNHhJM0pTQ09ENFhJZmYzaWU3cGM2OC9rZ1B5dGlRSWNCQk1CQWdBR0JRSmpCNkYzCkFBb0pFTThMa296ZTFrODczVFFQLzB0MkYvamx0TFJRTUc3VkNMdzcrcHM1SkNXNUZJcXUvUzJpOWdTZE5BMEUKNDJ1K0x5eGpHM1l4bVZvVlJNc3hldTRrRXJ4cjhiTGNBNHA3MVcvbktlcXdGOVZMdVhLaXJzQkM3ejJzeUZpTApOZGwwQVJuQzNFTnd1TVZsU0N3Sk8wTU01TmlKdUxPcU9HWXlEMVh6U2ZuQ3prWE4wSkdBL2JmUFJTNW1QZm9XCjBPSElSWkZocUU3RUQ2d3lXcEhJS1Q4clhrRVNGd3N6VXdXL0Q3bzFIYWdYNytkdUx0OFdrcm9oR2J4VEoyMTUKWWFuT0tTcXlLZCs2WUd6RE5Vb0d1TU5QWko1d1RyVGhPa1R6RUZaNEhqbVExNnc1eG1jVUlTbkNaZDRuaHNiUwpxTi9VeVY5VnUzbG5rYXV0UzE1RTRDY2pQMVJSelNrVDBqa2E2MnZQdEF6dytQaUdyeU0xRjdzdnVSYUVuSkQ1CkdYemo5UkNVYVI2dnRGVnZxcW80ZnZiQTk5azRYWGorZEZBWFcwVFJaL2cyUU1lUFc5Y2RXaWVsY3IrdkhGNFoKMkVuc0FtZHZGN3I1ZTJKQ09VM044T1VvZGViVTZ3czRWZ1JWRzlncHRRZ2ZNUjB2Y2lCYk5ERzJYdWsxV0RrMQpxdHNjYmZtNUZWTDM2bzdka2pBMHgrVFlDdHFaSXI0eDNtbWZBWUZVcXp4cGZ5WGJTSHFVSlIyQ29XeGx5ejcyClhuSjdVRW8vMFViZ3pHenNjeExQRHlKSE1NNURuL05pOUZWVFZLbEFMSG5GT1lZU1RsdW9ZQUNGMURNdDdOSjMKb3lBME1FTEwwSlF6RWluaXhxeHBaMXRhT21WUi84cFFWcnFzdHF3cXNwM1JBQmFlWjgwSmJpZ1VDMjl6SlVWZgo9RXBsagotLS0tLUVORCBQR1AgUFVCTElDIEtFWSBCTE9DSy0tLS0tCg== \ | base64 -d \ | gpg --dearmor -o /usr/share/keyrings/kubernetes-archive-keyring.gpg -cat </etc/apt/sources.list.d/kubernetes-v1.25.list -deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.25/deb/ / -EOF -cat </etc/apt/sources.list.d/kubernetes-v1.26.list -deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.26/deb/ / -EOF -cat </etc/apt/sources.list.d/kubernetes-v1.27.list -deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.27/deb/ / -EOF -cat </etc/apt/sources.list.d/kubernetes-v1.28.list -deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.28/deb/ / -EOF cat </etc/apt/sources.list.d/kubernetes-v1.29.list deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.29/deb/ / EOF cat </etc/apt/sources.list.d/kubernetes-v1.30.list deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.30/deb/ / EOF +cat </etc/apt/sources.list.d/kubernetes-v1.31.list +deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.31/deb/ / +EOF cat </etc/apt/sources.list.d/docker.list deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable EOF diff --git a/scripts/ubuntu-versions.sh b/scripts/ubuntu-versions.sh index c87ccfb..f7269a8 100755 --- a/scripts/ubuntu-versions.sh +++ b/scripts/ubuntu-versions.sh @@ -20,29 +20,22 @@ apt update apt install -y apt-transport-https ca-certificates curl software-properties-common curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg -curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.29/deb/Release.key | gpg --dearmor -o /usr/share/keyrings/kubernetes-archive-keyring.gpg +curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.31/deb/Release.key | gpg --dearmor -o /usr/share/keyrings/kubernetes-archive-keyring.gpg -cat </etc/apt/sources.list.d/kubernetes-v1.25.list -deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.25/deb/ / -EOF -cat </etc/apt/sources.list.d/kubernetes-v1.26.list -deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.26/deb/ / -EOF -cat </etc/apt/sources.list.d/kubernetes-v1.27.list -deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.27/deb/ / -EOF -cat </etc/apt/sources.list.d/kubernetes-v1.28.list -deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.28/deb/ / -EOF cat </etc/apt/sources.list.d/kubernetes-v1.29.list deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.29/deb/ / EOF cat </etc/apt/sources.list.d/kubernetes-v1.30.list deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.30/deb/ / EOF +cat </etc/apt/sources.list.d/kubernetes-v1.31.list +deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.31/deb/ / +EOF cat </etc/apt/sources.list.d/docker.list deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable EOF apt update -apt-cache madison docker-ce containerd.io kubelet \ No newline at end of file +apt-cache madison docker-ce containerd.io kubelet +# check signature expiration +gpg --list-options show-sig-expire /usr/share/keyrings/kubernetes-archive-keyring.gpg \ No newline at end of file