use default ubuntu 22.04 (#120)

Signed-off-by: Maksim Paskal <[email protected]>
maksim-paskal · Jun 28, 2024 · 471b5bb · 471b5bb
1 parent 049781d
commit 471b5bb
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -65,4 +65,4 @@ install:
 	sudo mv /tmp/hcloud-k8s-ctl /usr/local/bin/hcloud-k8s-ctl
 
 ubuntu-versions:
-	docker run -v `pwd`:/app -it ubuntu:20.04 /app/scripts/ubuntu-versions.sh
+	docker run -v `pwd`:/app -it ubuntu:22.04 /app/scripts/ubuntu-versions.sh
diff --git a/config.yaml b/config.yaml
@@ -2,7 +2,7 @@ ipRange: "10.0.0.0/16"
 masterCount: 3
 serverComponents:
   ubuntu:
-    version: ubuntu-24.04
+    version: ubuntu-22.04
 # files for custom install
 # masterServers:
 #   serversinitparams:

diff --git a/e2e/configs/full.yaml b/e2e/configs/full.yaml
@@ -1,7 +1,7 @@
 clusterName: k8s
 serverComponents:
   ubuntu:
-    version: ubuntu-24.04
+    version: ubuntu-20.04
     username: hcloud-user
     architecture: x86
   kubernetes:

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -199,7 +199,7 @@ func defaultConfig() Type {
 		HetznerToken: os.Getenv("HCLOUD_TOKEN"),
 		ServerComponents: serverComponents{
 			Ubuntu: serverComponentUbuntu{
-				Version:      "ubuntu-20.04",
+				Version:      "ubuntu-22.04",
 				UserName:     "hcloud-user",
 				Architecture: hcloud.ArchitectureX86, // x86 or arm
 			},

diff --git a/scripts/common-install.sh b/scripts/common-install.sh
@@ -77,7 +77,7 @@ EOF
 
 # restart sshd to apply new config
 sshd -t
-systemctl restart sshd.service
+systemctl restart ssh.service
 
 # disable swap
 swapoff -a