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..933bbcd 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,20 +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-22.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 + +``` +
+
Kubernetes: v1.30, Arch: arm64, Ubuntu: 20.04, Region: eu + +```yaml +ipRange: "10.0.0.0/16" masterCount: 3 serverComponents: ubuntu: 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: @@ -296,23 +300,23 @@ cluster-autoscaler: maxSize: 20 instanceType: cax41 region: fsn1 - ```
-
Kubernetes: v1.29, Arch: arm64, Ubuntu: 22.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-22.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: @@ -322,9 +326,10 @@ cluster-autoscaler: maxSize: 20 instanceType: cax41 region: fsn1 + ```
-
Kubernetes: v1.30, Arch: amd64, Ubuntu: 20.04, Region: eu +
Kubernetes: v1.31, Arch: amd64, Ubuntu: 20.04, Region: eu ```yaml ipRange: "10.0.0.0/16" @@ -334,15 +339,15 @@ serverComponents: version: ubuntu-20.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: amd64, Ubuntu: 20.04, Region: us +
Kubernetes: v1.31, Arch: amd64, Ubuntu: 20.04, Region: us ```yaml ipRange: "10.0.0.0/16" @@ -357,11 +362,11 @@ serverComponents: version: ubuntu-20.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 cluster-autoscaler: autoscalingGroups: - name: cpx51-ash @@ -371,7 +376,7 @@ cluster-autoscaler: region: ash ```
-
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,15 +386,15 @@ 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: arm64, Ubuntu: 20.04, Region: eu ```yaml ipRange: "10.0.0.0/16" @@ -399,11 +404,11 @@ serverComponents: version: ubuntu-20.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: @@ -415,7 +420,7 @@ cluster-autoscaler: region: fsn1 ```
-
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 +430,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/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