migrate to new instances (#118)

Signed-off-by: Maksim Paskal <[email protected]>
maksim-paskal · Jun 24, 2024 · b0100b6 · b0100b6
1 parent 3c9ab4d
commit b0100b6
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/e2e/configs/full.yaml b/e2e/configs/full.yaml
@@ -1,7 +1,7 @@
 clusterName: k8s
 serverComponents:
   ubuntu:
-    version: ubuntu-22.04
+    version: ubuntu-24.04
     username: hcloud-user
     architecture: x86
   kubernetes:
@@ -20,7 +20,7 @@ datacenter: fsn1-dc14
 masterServers:
   namepattern: master-%d
   placementgroupname: master-placement-group
-  servertype: cx21
+  servertype: cx22
   labels:
     role: master
   waittimeinretry: 3s
@@ -50,73 +50,73 @@ preStartScript: ""
 postStartScript: ""
 cluster-autoscaler:
   autoscalingGroups:
-    - name: CX21:FSN1:cx21-fsn1
+    - name: CX22:FSN1:cx22-fsn1
       minSize: 0
       maxSize: 20
     - name: CPX21:FSN1:cpx21-fsn1
       minSize: 0
       maxSize: 20
-    - name: CX31:FSN1:cx31-fsn1
+    - name: CX32:FSN1:cx32-fsn1
       minSize: 0
       maxSize: 20
     - name: CPX31:FSN1:cpx31-fsn1
       minSize: 0
       maxSize: 20
-    - name: CX41:FSN1:cx41-fsn1
+    - name: CX42:FSN1:cx42-fsn1
       minSize: 0
       maxSize: 20
     - name: CPX41:FSN1:cpx41-fsn1
       minSize: 0
       maxSize: 20
-    - name: CX51:FSN1:cx51-fsn1
+    - name: CX52:FSN1:cx52-fsn1
       minSize: 0
       maxSize: 20
     - name: CPX51:FSN1:cpx51-fsn1
       minSize: 0
       maxSize: 20
-    - name: CX21:NBG1:cx21-nbg1
+    - name: CX22:NBG1:cx22-nbg1
       minSize: 0
       maxSize: 20
     - name: CPX21:NBG1:cpx21-nbg1
       minSize: 0
       maxSize: 20
-    - name: CX31:NBG1:cx31-nbg1
+    - name: CX32:NBG1:cx32-nbg1
       minSize: 0
       maxSize: 20
     - name: CPX31:NBG1:cpx31-nbg1
       minSize: 0
       maxSize: 20
-    - name: CX41:NBG1:cx41-nbg1
+    - name: CX42:NBG1:cx42-nbg1
       minSize: 0
       maxSize: 20
     - name: CPX41:NBG1:cpx41-nbg1
       minSize: 0
       maxSize: 20
-    - name: CX51:NBG1:cx51-nbg1
+    - name: CX52:NBG1:cx52-nbg1
       minSize: 0
       maxSize: 20
     - name: CPX51:NBG1:cpx51-nbg1
       minSize: 0
       maxSize: 20
-    - name: CX21:HEL1:cx21-hel1
+    - name: CX22:HEL1:cx22-hel1
       minSize: 0
       maxSize: 20
     - name: CPX21:HEL1:cpx21-hel1
       minSize: 0
       maxSize: 20
-    - name: CX31:HEL1:cx31-hel1
+    - name: CX32:HEL1:cx32-hel1
       minSize: 0
       maxSize: 20
     - name: CPX31:HEL1:cpx31-hel1
       minSize: 0
       maxSize: 20
-    - name: CX41:HEL1:cx41-hel1
+    - name: CX42:HEL1:cx42-hel1
       minSize: 0
       maxSize: 20
     - name: CPX41:HEL1:cpx41-hel1
       minSize: 0
       maxSize: 20
-    - name: CX51:HEL1:cx51-hel1
+    - name: CX52:HEL1:cx52-hel1
       minSize: 0
       maxSize: 20
     - name: CPX51:HEL1:cpx51-hel1

diff --git a/examples/charts/test/templates/test-deployment.yaml b/examples/charts/test/templates/test-deployment.yaml
@@ -28,7 +28,7 @@ spec:
     spec:
       nodeSelector:
         topology.kubernetes.io/region: {{ $location }}
-        node.kubernetes.io/instance-type: cx21
+        node.kubernetes.io/instance-type: cx22
       volumes:
       - name: my-csi-volume
         persistentVolumeClaim:

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -228,7 +228,7 @@ func defaultConfig() Type {
 		MasterServers: masterServers{
 			NamePattern:        "master-%d",
 			PlacementGroupName: "master-placement-group",
-			ServerType:         "cx21",
+			ServerType:         "cx22",
 			Labels:             serverLabels,
 			WaitTimeInRetry:    waitTimeInRetry,
 			RetryTimeLimit:     retryTimeLimit,

diff --git a/pkg/config/const.go b/pkg/config/const.go
@@ -23,7 +23,7 @@ const (
 	secretString                = "<secret>"
 	defaultLocation             = hcloudLocationEUFalkenstein
 	defaultDatacenter           = hcloudLocationEUFalkenstein + "-dc14"
-	defaultAutoscalerInstances  = "cx21,cpx21,cx31,cpx31,cx41,cpx41,cx51,cpx51"
+	defaultAutoscalerInstances  = "cx22,cpx21,cx32,cpx31,cx42,cpx41,cx52,cpx51"
 	hcloudLocationEUFalkenstein = "fsn1"
 	hcloudLocationEUNuremberg   = "nbg1"
 	hcloudLocationEUHelsinki    = "hel1"