Add architecture to the extension

charts/internal/machineclass/templates/machineclass.yaml

@@ -24,6 +24,7 @@ providerSpec:
   cluster: {{ $machineClass.cluster }}
   zone: {{ $machineClass.zone }}
   serverType: {{ $machineClass.machineType }}
+  architecture: {{ $machineClass.architecture }}
   imageName: {{ $machineClass.imageName }}
   sshFingerprint: {{ $machineClass.sshFingerprint }}
   placementGroupID: {{ $machineClass.placementGroupID | quote }}

charts/internal/machineclass/values.yaml

@@ -3,6 +3,7 @@ machineClasses:
   cluster: shoot--foobar--hcloud
   zone: hel1-dc2
   machineType: cx11
+  architecture: amd64
   imageName: ubuntu-20.04
   sshFingerprint: "00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff"
   placementGroupID: ""

example/00-componentconfig.yaml

@@ -8,7 +8,7 @@ clientConnection:
   burst: 130
 machineImages:
 - name: ubuntu
-  version: "18.04"
+  version: "22.04"
   id: d61c3912-8422-4daf-835e-854efa0062e4
 etcd:
   storage:

example/20-crd-cluster.yaml

@@ -9,15 +9,17 @@ spec:
   - name: v1alpha1
     served: true
     storage: true
-  version: v1alpha1
+    additionalPrinterColumns:
+    - name: Age
+      type: date
+      jsonPath: .metadata.creationTimestamp
+    schema:
+      openAPIV3Schema:
+        type: object
+    subresources:
+      status: {}
   scope: Cluster
   names:
     plural: clusters
     singular: cluster
     kind: Cluster
-  additionalPrinterColumns:
-  - name: Age
-    type: date
-    JSONPath: .metadata.creationTimestamp
-  subresources:
-    status: {}

example/20-crd-controlplane.yaml

@@ -9,24 +9,26 @@ spec:
   - name: v1alpha1
     served: true
     storage: true
-  version: v1alpha1
+    additionalPrinterColumns:
+    - name: Type
+      type: string
+      description: The control plane type.
+      jsonPath: .spec.type
+    - name: State
+      type: string
+      jsonPath: .status.lastOperation.state
+    - name: Age
+      type: date
+      jsonPath: .metadata.creationTimestamp
+    schema:
+      openAPIV3Schema:
+        type: object
+    subresources:
+      status: {}
   scope: Namespaced
   names:
     plural: controlplanes
     singular: controlplane
     kind: ControlPlane
     shortNames:
     - cp
-  additionalPrinterColumns:
-  - name: Type
-    type: string
-    description: The control plane type.
-    JSONPath: .spec.type
-  - name: State
-    type: string
-    JSONPath: .status.lastOperation.state
-  - name: Age
-    type: date
-    JSONPath: .metadata.creationTimestamp
-  subresources:
-    status: {}

example/20-crd-infrastructure.yaml

@@ -9,28 +9,30 @@ spec:
   - name: v1alpha1
     served: true
     storage: true
-  version: v1alpha1
+    additionalPrinterColumns:
+    - name: Type
+      type: string
+      description: The type of the cloud provider for this resource.
+      jsonPath: .spec.type
+    - name: Region
+      type: string
+      description: The region into which the infrastructure should be deployed.
+      jsonPath: .spec.region
+    - name: State
+      type: string
+      jsonPath: .status.lastOperation.state
+    - name: Age
+      type: date
+      jsonPath: .metadata.creationTimestamp
+    schema:
+      openAPIV3Schema:
+        type: object
+    subresources:
+      status: {}
   scope: Namespaced
   names:
     plural: infrastructures
     singular: infrastructure
     kind: Infrastructure
     shortNames:
     - infra
-  additionalPrinterColumns:
-  - name: Type
-    type: string
-    description: The type of the cloud provider for this resource.
-    JSONPath: .spec.type
-  - name: Region
-    type: string
-    description: The region into which the infrastructure should be deployed.
-    JSONPath: .spec.region
-  - name: State
-    type: string
-    JSONPath: .status.lastOperation.state
-  - name: Age
-    type: date
-    JSONPath: .metadata.creationTimestamp
-  subresources:
-    status: {}

example/20-crd-managedresource.yaml

@@ -9,20 +9,22 @@ spec:
   - name: v1alpha1
     served: true
     storage: true
-  version: v1alpha1
+    additionalPrinterColumns:
+    - name: Class
+      type: string
+      jsonPath: .spec.class
+    - name: Age
+      type: date
+      jsonPath: .metadata.creationTimestamp
+    schema:
+      openAPIV3Schema:
+        type: object
+    subresources:
+      status: {}
   scope: Namespaced
   names:
     plural: managedresources
     singular: managedresource
     kind: ManagedResource
     shortNames:
     - mr
-  additionalPrinterColumns:
-  - name: Class
-    type: string
-    JSONPath: .spec.class
-  - name: Age
-    type: date
-    JSONPath: .metadata.creationTimestamp
-  subresources:
-    status: {}

example/20-crd-operatingsystemconfig.yaml

@@ -9,24 +9,26 @@ spec:
   - name: v1alpha1
     served: true
     storage: true
-  version: v1alpha1
+    additionalPrinterColumns:
+    - name: Type
+      type: string
+      description: The type of the operating system configuration.
+      jsonPath: .spec.type
+    - name: State
+      type: string
+      jsonPath: .status.lastOperation.state
+    - name: Age
+      type: date
+      jsonPath: .metadata.creationTimestamp
+    schema:
+      openAPIV3Schema:
+        type: object
+    subresources:
+      status: {}
   scope: Namespaced
   names:
     plural: operatingsystemconfigs
     singular: operatingsystemconfig
     kind: OperatingSystemConfig
     shortNames:
     - osc
-  additionalPrinterColumns:
-  - name: Type
-    type: string
-    description: The type of the operating system configuration.
-    JSONPath: .spec.type
-  - name: State
-    type: string
-    JSONPath: .status.lastOperation.state
-  - name: Age
-    type: date
-    JSONPath: .metadata.creationTimestamp
-  subresources:
-    status: {}

example/20-crd-vpa.yaml

@@ -11,31 +11,32 @@ spec:
     kind: VerticalPodAutoscaler
     shortNames:
     - vpa
-  version: v1beta1
   versions:
   - name: v1beta1
     served: true
     storage: false
+    schema:
+      openAPIV3Schema:
+        properties:
+          spec:
+            required: []
+            properties:
+              targetRef:
+                type: object
+              updatePolicy:
+                properties:
+                  updateMode:
+                    type: string
+              resourcePolicy:
+                properties:
+                  containerPolicies:
+                    type: array
   - name: v1beta2
     served: true
     storage: true
-  validation:
-    # openAPIV3Schema is the schema for validating custom objects.
-    openAPIV3Schema:
-      properties:
-        spec:
-          required: []
-          properties:
-            targetRef:
-              type: object
-            updatePolicy:
-              properties:
-                updateMode:
-                  type: string
-            resourcePolicy:
-              properties:
-                containerPolicies:
-                  type: array
+    schema:
+      openAPIV3Schema:
+        type: object
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -50,11 +51,16 @@ spec:
     kind: VerticalPodAutoscalerCheckpoint
     shortNames:
     - vpacheckpoint
-  version: v1beta1
   versions:
   - name: v1beta1
     served: true
     storage: false
+    schema:
+      openAPIV3Schema:
+        type: object
   - name: v1beta2
     served: true
     storage: true
+    schema:
+      openAPIV3Schema:
+        type: object

example/20-crd-worker.yaml

@@ -9,19 +9,21 @@ spec:
   - name: v1alpha1
     served: true
     storage: true
-  version: v1alpha1
+    additionalPrinterColumns:
+    - name: Type
+      type: string
+      description: The worker type.
+      jsonPath: .spec.type
+    - name: Age
+      type: date
+      jsonPath: .metadata.creationTimestamp
+    schema:
+      openAPIV3Schema:
+        type: object
+    subresources:
+      status: {}
   scope: Namespaced
   names:
     plural: workers
     singular: worker
     kind: Worker
-  additionalPrinterColumns:
-  - name: Type
-    type: string
-    description: The worker type.
-    JSONPath: .spec.type
-  - name: Age
-    type: date
-    JSONPath: .metadata.creationTimestamp
-  subresources:
-    status: {}

example/30-controlplane.yaml

@@ -15,7 +15,7 @@ metadata:
   namespace: shoot--foobar--hcloud
 type: Opaque
 data:
-  hcloudToken: base64token
+  hcloudToken: token
 ---
 apiVersion: extensions.gardener.cloud/v1alpha1
 kind: Cluster
@@ -51,7 +51,7 @@ spec:
           networks:
             pods: 10.250.0.0/19
       kubernetes:
-        version: 1.15.4
+        version: 1.29.9
       hibernation:
         enabled: false
     status:

hack/ci/misc/test-shoot.yaml

@@ -16,22 +16,38 @@ spec:
       kind: ControlPlaneConfig
       zone: fsn1-dc14
     workers:
-      - name: worker-eeost
+      - name: worker-x86
         minimum: 1
         maximum: 2
         maxSurge: 1
         machine:
           type: cpx31
           image:
             name: ubuntu
-            version: 22.4.20231020
+            version: 22.4.20241008
           architecture: amd64
         zones:
           - fsn1-dc14
         cri:
           name: containerd
         volume:
           size: 50Gi
+      - name: worker-arm
+        minimum: 1
+        maximum: 2
+        maxSurge: 1
+        machine:
+          type: cax21
+          image:
+            name: ubuntu
+            version: 22.4.20241008
+          architecture: arm64
+        zones:
+          - fsn1-dc14
+        cri:
+          name: containerd
+        volume:
+          size: 50Gi
   networking:
     nodes: 10.251.0.0/16
     pods: 100.64.0.0/16