From 2fd92efe84bfb41bac1af0fa4eb5ff3b36d90fce Mon Sep 17 00:00:00 2001 From: Maksim Paskal Date: Thu, 3 Oct 2024 09:48:42 +0100 Subject: [PATCH] kubernetes 1.30 Signed-off-by: Maksim Paskal --- .github/workflows/e2e.yml | 16 ++++++++++++++-- e2e/configs/v1.30-amd64-eu-central-fsn1.yaml | 10 ++++++++++ e2e/configs/v1.30-amd64-ubuntu-22.04.yaml | 12 ++++++++++++ e2e/configs/v1.30-amd64-us-east-ash.yaml | 20 ++++++++++++++++++++ e2e/configs/v1.30-arm64-ubuntu-22.04.yaml | 20 ++++++++++++++++++++ e2e/configs/v1.30-arm64.yaml | 19 +++++++++++++++++++ e2e/e2e_test.go | 11 ++++++++++- scripts/common-install.sh | 3 +++ scripts/ubuntu-versions.sh | 3 +++ 9 files changed, 111 insertions(+), 3 deletions(-) create mode 100644 e2e/configs/v1.30-amd64-eu-central-fsn1.yaml create mode 100644 e2e/configs/v1.30-amd64-ubuntu-22.04.yaml create mode 100644 e2e/configs/v1.30-amd64-us-east-ash.yaml create mode 100644 e2e/configs/v1.30-arm64-ubuntu-22.04.yaml create mode 100644 e2e/configs/v1.30-arm64.yaml diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index e742426..84f8532 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -1,9 +1,19 @@ on: workflow_dispatch: inputs: - token: + hcloud_token: description: 'Hetzner Cloud API token' required: true + e2e_file_name: + description: 'Name of the e2e tests' + required: false + default: 'v1.30*' + debug: + type: choice + description: 'Debug mode' + required: false + options: ['true', 'false'] + default: 'false' jobs: e2e: @@ -17,4 +27,6 @@ jobs: - run: ssh-keygen -t rsa -q -f "$HOME/.ssh/id_rsa" -N "" - run: make e2e branch=${{ github.base_ref || github.ref_name }} env: - HCLOUD_TOKEN: ${{ github.event.inputs.token }} \ No newline at end of file + HCLOUD_TOKEN: ${{ github.event.inputs.hcloud_token }} + E2E_FILE_NAME: ${{ github.event.inputs.e2e_file_name }} + DEBUG: ${{ github.event.inputs.debug }} \ No newline at end of file diff --git a/e2e/configs/v1.30-amd64-eu-central-fsn1.yaml b/e2e/configs/v1.30-amd64-eu-central-fsn1.yaml new file mode 100644 index 0000000..876da2e --- /dev/null +++ b/e2e/configs/v1.30-amd64-eu-central-fsn1.yaml @@ -0,0 +1,10 @@ +# Kubernetes v1.30 in Europe +ipRange: "10.0.0.0/16" +masterCount: 3 +serverComponents: + kubernetes: + version: 1.30.5 + 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.30-amd64-ubuntu-22.04.yaml b/e2e/configs/v1.30-amd64-ubuntu-22.04.yaml new file mode 100644 index 0000000..d0af894 --- /dev/null +++ b/e2e/configs/v1.30-amd64-ubuntu-22.04.yaml @@ -0,0 +1,12 @@ +# Kubernetes v1.30 in Europe (ARM64 architecture) +ipRange: "10.0.0.0/16" +masterCount: 3 +serverComponents: + ubuntu: + version: ubuntu-22.04 + kubernetes: + version: 1.30.5 + 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.30-amd64-us-east-ash.yaml b/e2e/configs/v1.30-amd64-us-east-ash.yaml new file mode 100644 index 0000000..f2a4cc5 --- /dev/null +++ b/e2e/configs/v1.30-amd64-us-east-ash.yaml @@ -0,0 +1,20 @@ +# Kubernetes v1.30 in US East +ipRange: "10.0.0.0/16" +masterCount: 3 +networkZone: us-east +location: ash +datacenter: ash-dc1 +masterServers: + servertype: cpx21 +serverComponents: + kubernetes: + version: 1.30.5 + docker: + version: 5:24.0.6-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs) + containerd: + version: 1.6.24-1 +cluster-autoscaler: + autoscalingGroups: + - name: CPX51:ASH:cpx51-ash + minSize: 1 + maxSize: 20 \ No newline at end of file diff --git a/e2e/configs/v1.30-arm64-ubuntu-22.04.yaml b/e2e/configs/v1.30-arm64-ubuntu-22.04.yaml new file mode 100644 index 0000000..7b16a7f --- /dev/null +++ b/e2e/configs/v1.30-arm64-ubuntu-22.04.yaml @@ -0,0 +1,20 @@ +# Kubernetes v1.30 in Europe (ARM64 architecture) +ipRange: "10.0.0.0/16" +masterCount: 3 +serverComponents: + ubuntu: + version: ubuntu-22.04 + architecture: arm + kubernetes: + version: 1.30.5 + 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: CAX41:FSN1:cax-fsn1 + minSize: 1 + maxSize: 20 diff --git a/e2e/configs/v1.30-arm64.yaml b/e2e/configs/v1.30-arm64.yaml new file mode 100644 index 0000000..26053c7 --- /dev/null +++ b/e2e/configs/v1.30-arm64.yaml @@ -0,0 +1,19 @@ +# Kubernetes v1.30 in Europe (ARM64 architecture) +ipRange: "10.0.0.0/16" +masterCount: 3 +serverComponents: + ubuntu: + architecture: arm + kubernetes: + version: 1.30.5 + 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: CAX41:FSN1:cax-fsn1 + minSize: 1 + maxSize: 20 \ No newline at end of file diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go index 09a6d42..89e1079 100644 --- a/e2e/e2e_test.go +++ b/e2e/e2e_test.go @@ -40,7 +40,16 @@ func Test(t *testing.T) { //nolint:funlen,paralleltest,cyclop log.SetLevel(log.WarnLevel) - tests, err := filepath.Glob("./configs/*.yaml") + if os.Getenv("DEBUG") == "true" { + log.SetLevel(log.DebugLevel) + } + + nameGlob := os.Getenv("E2E_FILE_NAME") + if nameGlob == "" { + nameGlob = "*" + } + + tests, err := filepath.Glob("./configs/" + nameGlob + ".yaml") if err != nil { t.Fatal(err) } diff --git a/scripts/common-install.sh b/scripts/common-install.sh index 89f54d2..55a05b5 100755 --- a/scripts/common-install.sh +++ b/scripts/common-install.sh @@ -117,6 +117,9 @@ 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/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 d392c08..c87ccfb 100755 --- a/scripts/ubuntu-versions.sh +++ b/scripts/ubuntu-versions.sh @@ -37,6 +37,9 @@ 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/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