kubernetes 1.30

Signed-off-by: Maksim Paskal <[email protected]>
maksim-paskal · Oct 3, 2024 · b1c9aaf · b1c9aaf
1 parent 922d375
commit b1c9aaf
Show file tree

Hide file tree

Showing 21 changed files with 397 additions and 81 deletions.
diff --git 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 }}
+        HCLOUD_TOKEN: ${{ github.event.inputs.hcloud_token }}
+        E2E_FILE_NAME: ${{ github.event.inputs.e2e_file_name }}
+        DEBUG: ${{ github.event.inputs.debug }}
diff --git a/Makefile b/Makefile
@@ -13,19 +13,19 @@ test:
 	CONFIG=config_test.yaml go test -race -coverprofile coverage.out ./cmd/... ./pkg/...
 .PHONY: e2e
 e2e:
-	GIT_BRANCH=$(branch) go test -v -count=1 -timeout=4h ./e2e/e2e_test.go
+	HCLOUD_CTL_BRANCH=$(branch) go test -v -count=1 -timeout=4h ./e2e/e2e_test.go
 update-readme:
 	go run ./utils/main.go
 coverage:
 	go tool cover -html=coverage.out
 create-cluster:
 	make test
 	make delete-cluster
-	go run -race ./cmd -config=$(config) -action=create -log.level=DEBUG
+	HCLOUD_CTL_BRANCH=$(branch) go run -race ./cmd -config=$(config) -action=create -log.level=DEBUG
 delete-cluster:
 	go run -race ./cmd -config=$(config) -action=delete -log.level=DEBUG
 patch-cluster:
-	make run action=patch-cluster
+	HCLOUD_CTL_BRANCH=$(branch) make run action=patch-cluster
 list-configurations:
 	make run action=list-configurations
 upgrade-controlplane:

diff --git a/README.md b/README.md
@@ -153,9 +153,11 @@ serverComponents:
     version: 1.6.24-1
 cluster-autoscaler:
   autoscalingGroups:
-  - name: CPX51:ASH:cpx51-ash
+  - name: cpx51-ash
     minSize: 1
     maxSize: 20
+    instanceType: cpx51
+    region: ash
 ```
 </details>
 <details><summary>Kubernetes: v1.28, Arch: arm64, Ubuntu: 20.04, Region: eu</summary>
@@ -176,9 +178,11 @@ masterServers:
   servertype: cax11
 cluster-autoscaler:
   autoscalingGroups:
-  - name: CAX41:FSN1:cax-fsn1
+  - name: cax-fsn1
     minSize: 1
     maxSize: 20
+    instanceType: cax41
+    region: fsn1
 
 ```
 </details>
@@ -200,9 +204,11 @@ masterServers:
   servertype: cax11
 cluster-autoscaler:
   autoscalingGroups:
-  - name: CAX41:FSN1:cax-fsn1
+  - name: cax-fsn1
     minSize: 1
     maxSize: 20
+    instanceType: cax41
+    region: fsn1
 ```
 </details>
 <details><summary>Kubernetes: v1.29, Arch: amd64, Ubuntu: 20.04, Region: eu</summary>
@@ -260,9 +266,11 @@ serverComponents:
     version: 1.6.24-1
 cluster-autoscaler:
   autoscalingGroups:
-  - name: CPX51:ASH:cpx51-ash
+  - name: cpx51-ash
     minSize: 1
     maxSize: 20
+    instanceType: cpx51
+    region: ash
 ```
 </details>
 <details><summary>Kubernetes: v1.29, Arch: arm64, Ubuntu: 20.04, Region: eu</summary>
@@ -283,9 +291,11 @@ masterServers:
   servertype: cax11
 cluster-autoscaler:
   autoscalingGroups:
-  - name: CAX41:FSN1:cax-fsn1
+  - name: cax-fsn1
     minSize: 1
     maxSize: 20
+    instanceType: cax41
+    region: fsn1
 
 ```
 </details>
@@ -307,9 +317,129 @@ masterServers:
   servertype: cax11
 cluster-autoscaler:
   autoscalingGroups:
-  - name: CAX41:FSN1:cax-fsn1
+  - name: cax-fsn1
     minSize: 1
     maxSize: 20
+    instanceType: cax41
+    region: fsn1
+```
+</details>
+<details><summary>Kubernetes: v1.30, Arch: amd64, Ubuntu: 20.04, Region: eu</summary>
+
+```yaml
+ipRange: "10.0.0.0/16"
+masterCount: 3
+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
+
+```
+</details>
+<details><summary>Kubernetes: v1.30, Arch: amd64, Ubuntu: 20.04, Region: us</summary>
+
+```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
+cluster-autoscaler:
+  autoscalingGroups:
+  - name: cpx51-ash
+    minSize: 1
+    maxSize: 20
+    instanceType: cpx51
+    region: ash
+```
+</details>
+<details><summary>Kubernetes: v1.30, Arch: amd64, Ubuntu: 22.04, Region: eu</summary>
+
+```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
+
+```
+</details>
+<details><summary>Kubernetes: v1.30, Arch: arm64, Ubuntu: 20.04, Region: eu</summary>
+
+```yaml
+ipRange: "10.0.0.0/16"
+masterCount: 3
+serverComponents:
+  ubuntu:
+    version: ubuntu-20.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
+masterServers:
+  servertype: cax11
+cluster-autoscaler:
+  autoscalingGroups:
+  - name: cax-fsn1
+    minSize: 1
+    maxSize: 20
+    instanceType: cax41
+    region: fsn1
+```
+</details>
+<details><summary>Kubernetes: v1.30, Arch: arm64, Ubuntu: 22.04, Region: eu</summary>
+
+```yaml
+ipRange: "10.0.0.0/16"
+masterCount: 3
+serverComponents:
+  ubuntu:
+    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
+masterServers:
+  servertype: cax11
+cluster-autoscaler:
+  autoscalingGroups:
+  - name: cax-fsn1
+    minSize: 1
+    maxSize: 20
+    instanceType: cax41
+    region: fsn1
+
 ```
 </details>