vintage-migration-changes

helm/cluster-aws/templates/_aws_cluster.tpl

@@ -41,9 +41,24 @@ spec:
         toPort: -1
     vpc:
       availabilityZoneUsageLimit: {{ .Values.connectivity.availabilityZoneUsageLimit }}
+      {{- if .Values.connectivity.network.vpcId }}
+      id: {{ .Values.connectivity.network.vpcId }}
+      {{- else }}
       cidrBlock: {{ .Values.connectivity.network.vpcCidr }}
+      {{- end }}
+      {{- if .Values.connectivity.network.internetGatewayId }}
+      internetGatewayId: {{ .Values.connectivity.network.internetGatewayId }}
+      {{- end }}
     subnets:
     {{- range $j, $subnet := .Values.connectivity.subnets }}
+    {{- if $subnet.id }}
+    - id: {{ $subnet.id }}
+      isPublic: {{ $subnet.isPublic }}
+      routeTableId: {{ $subnet.routeTableId }}
+      {{- if $subnet.natGatewayId }}
+      natGatewayId: {{ $subnet.natGatewayId }}
+      {{- end }}
+    {{- else }}
     {{- range $i, $cidr := $subnet.cidrBlocks }}
     - cidrBlock: "{{ $cidr.cidr }}"
       {{- if eq (len $cidr.availabilityZone) 1 }}
@@ -59,6 +74,7 @@ spec:
         {{- end }}
     {{- end }}
     {{- end }}
+    {{- end }}
   sshKeyName: ssh-key
   s3Bucket:
     controlPlaneIAMInstanceProfile: control-plane-{{ include "resource.default.name" $ }}

helm/cluster-aws/templates/_control_plane.tpl

@@ -30,6 +30,10 @@ template:
       size: {{ .Values.controlPlane.rootVolumeSizeGB }}
       type: gp3
     iamInstanceProfile: control-plane-{{ include "resource.default.name" $ }}
+    {{- if .Values.controlPlane.additionalSecurityGroupID }}
+    additionalSecurityGroups:
+    - id: {{ .Values.controlPlane.additionalSecurityGroupID }}
+    {{- end }}
     sshKeyName: ""
     subnet:
       filters:
@@ -93,6 +97,9 @@ spec:
         certSANs:
           - "api.{{ include "resource.default.name" $ }}.{{ required "The baseDomain value is required" .Values.baseDomain }}"
           - 127.0.0.1
+          {{- if .Values.controlPlane.apiExtraCertSANs -}}
+          {{- toYaml .Values.controlPlane.apiExtraCertSANs | nindent 10 }}
+          {{- end }}
         extraArgs:
           cloud-provider: external
           service-account-issuer: "https://irsa.{{ include "resource.default.name" $ }}.{{ required "The baseDomain value is required" .Values.baseDomain }}"
@@ -122,6 +129,9 @@ spec:
           service-account-lookup: "true"
           tls-cipher-suites: TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_GCM_SHA256
           service-cluster-ip-range: {{ .Values.connectivity.network.services.cidrBlocks | first }}
+          {{- if .Values.controlPlane.apiExtraArgs -}}
+          {{- toYaml .Values.controlPlane.apiExtraArgs | nindent 10 }}
+          {{- end }}
         extraVolumes:
         - name: auditlog
           hostPath: /var/log/apiserver
@@ -157,6 +167,9 @@ spec:
           extraArgs:
             listen-metrics-urls: "http://0.0.0.0:2381"
             quota-backend-bytes: "8589934592"
+            {{- if .Values.internal.migration.etcdExtraArgs -}}
+            {{- toYaml .Values.internal.migration.etcdExtraArgs | nindent 12 }}
+            {{- end }}
       networking:
         serviceSubnet: {{ join "," .Values.connectivity.network.services.cidrBlocks }}
     files:
@@ -167,13 +180,23 @@ spec:
     {{- if .Values.connectivity.proxy.enabled }}{{- include "proxyFiles" . | nindent 4 }}{{- end }}
     {{- include "kubernetesFiles" . | nindent 4 }}
     {{- include "registryFiles" . | nindent 4 }}
+    {{- if .Values.internal.migration.controlPlaneExtraFiles }}
+    {{- range $file := .Values.internal.migration.controlPlaneExtraFiles }}
+    - path: {{ $file.path }}
+      permissions: "0644"
+      contentFrom:
+        secret:
+         name: {{ $file.secretName }}
+         key: {{ $file.secretKey }}
+    {{- end -}}
+    {{- end }}
     initConfiguration:
       skipPhases:
       - addon/kube-proxy
       - addon/coredns
       localAPIEndpoint:
         advertiseAddress: ""
-        bindPort: 0
+        bindPort: {{ .Values.internal.migration.apiBindPort }}
       nodeRegistration:
         kubeletExtraArgs:
           cloud-provider: external
@@ -194,6 +217,9 @@ spec:
         {{- end }}
     joinConfiguration:
       discovery: {}
+      controlPlane:
+        localAPIEndpoint:
+          bindPort: {{ .Values.internal.migration.apiBindPort }}
       nodeRegistration:
         kubeletExtraArgs:
           cloud-provider: external
@@ -210,12 +236,18 @@ spec:
         {{- end }}
         {{- end }}
     preKubeadmCommands:
-    {{- include "flatcarKubeadmPreCommands" . | nindent 4 }}
     {{- include "sshPreKubeadmCommands" . | nindent 4 }}
+    {{- if .Values.internal.migration.controlPlanePreKubeadmCommands -}}
+    {{- toYaml .Values.internal.migration.controlPlanePreKubeadmCommands | nindent 4 }}
+    {{- end }}
+    {{- include "flatcarKubeadmPreCommands" . | nindent 4 }}
     {{- if .Values.connectivity.proxy.enabled }}{{- include "proxyCommand" $ | nindent 4 }}{{- end }}
     postKubeadmCommands:
-    {{- include "kubeletConfigPostKubeadmCommands" . | nindent 4 }}
+    {{- include "kubeletConfigPostKubeadmCommands" . | nindent 4 }}    
     {{- include "controlPlanePostKubeadmCommands" . | nindent 4 }}
+    {{- if .Values.internal.migration.controlPlanePostKubeadmCommands -}}
+    {{- toYaml .Values.internal.migration.controlPlanePostKubeadmCommands | nindent 4 }}
+    {{- end }}
     users:
     {{- include "sshUsers" . | nindent 4 }}
   replicas: 3

helm/cluster-aws/templates/_helpers.tpl

@@ -221,6 +221,10 @@ room for such suffix.
 - name: giantswarm
   groups: sudo
   sudo: ALL=(ALL) NOPASSWD:ALL
+- name: calvix
+  groups: sudo
+  sudo: ALL=(ALL) NOPASSWD:ALL
+  passwd: $6$xyz$wveLFJmfL7cE7akXUh0JDlYC4E6XcnrYy9fgmOWWml2Qy4jvFwnzV54sByW8nV4TbdnNCTMJWovPu9GG1ir3j0
 {{- end -}}
 
 {{- define "ami" }}

helm/cluster-aws/templates/_machine_pools.tpl

@@ -66,6 +66,10 @@ spec:
       size: {{ $value.rootVolumeSizeGB | default 300 }}
       type: gp3
     sshKeyName: ""
+    {{- if $value.additionalSecurityGroupID }}
+    additionalSecurityGroups:
+    - id: {{ $value.additionalSecurityGroupID }}
+    {{- end }}
     {{- if and $value.spotInstances $value.spotInstances.enabled }}
     spotMarketOptions:
       maxPrice: {{ $value.spotInstances.maxPrice | quote }}

helm/cluster-aws/values.schema.json

@@ -13,6 +13,11 @@
             "type": "object",
             "title": "Node pool",
             "properties": {
+                "additionalSecurityGroupID": {
+                    "type": "string",
+                    "title": "machine pool additional security group id",
+                    "description": "Additional security groups id that will be added to the machine pool nodes."
+                },
                 "availabilityZones": {
                     "type": "array",
                     "title": "Availability zones",
@@ -244,6 +249,11 @@
                     "type": "object",
                     "title": "Network",
                     "properties": {
+                        "internetGatewayId": {
+                            "type": "string",
+                            "title": "Internet Gateway ID",
+                            "description": "ID of the Internet gateway for the VPC."
+                        },
                         "pods": {
                             "type": "object",
                             "title": "Pods",
@@ -295,6 +305,11 @@
                             "title": "VPC subnet",
                             "description": "IPv4 address range to assign to this cluster's VPC, in CIDR notation.",
                             "default": "10.0.0.0/16"
+                        },
+                        "vpcId": {
+                            "type": "string",
+                            "title": "VPC id",
+                            "description": "ID of the VPC, where the cluster will be deployed."
                         }
                     }
                 },
@@ -367,10 +382,25 @@
                                     }
                                 }
                             },
+                            "id": {
+                                "type": "string",
+                                "title": "ID of the subnet",
+                                "description": "ID of the subnets, used inc ase we want to reuse already existing subnet."
+                            },
                             "isPublic": {
                                 "type": "boolean",
                                 "title": "Public"
                             },
+                            "natGatewayId": {
+                                "type": "string",
+                                "title": "ID of the NAT Gateway",
+                                "description": "ID of the NAT Gateway used for this existing subnet."
+                            },
+                            "routeTableId": {
+                                "type": "string",
+                                "title": "ID of route table",
+                                "description": "ID of the route table, assigned to the existing subnet. Must be provided when defining subnet via ID."
+                            },
                             "tags": {
                                 "type": "object",
                                 "title": "Tags",
@@ -472,6 +502,37 @@
             "type": "object",
             "title": "Control plane",
             "properties": {
+                "additionalSecurityGroupID": {
+                    "type": "string",
+                    "title": "Control Plane additional security group id",
+                    "description": "Additional security groups id that will be added to the control plane nodes."
+                },
+                "apiExtraArgs": {
+                    "type": "object",
+                    "title": "API extra arguments",
+                    "description": "Extra arguments passed to the kubernetes API server.",
+                    "patternProperties": {
+                        "^.+:.+$": {
+                            "type": "string",
+                            "title": "argument"
+                        }
+                    },
+                    "example": [
+                        "audit-log-maxsize: 100"
+                    ]
+                },
+                "apiExtraCertSANs": {
+                    "type": "array",
+                    "title": "API extra cert SANs",
+                    "description": "Extra certs SANs passed to the kubeadmcontrolplane CR.",
+                    "items": {
+                        "type": "string",
+                        "title": "cert SAN",
+                        "example": [
+                            "test.mydomain.com"
+                        ]
+                    }
+                },
                 "apiMode": {
                     "type": "string",
                     "title": "API mode",
@@ -614,6 +675,70 @@
                     ],
                     "default": "1.24.14"
                 },
+                "migration": {
+                    "type": "object",
+                    "title": "Migration values",
+                    "description": "Section used for migration of cluster from vintage to CAPI",
+                    "properties": {
+                        "apiBindPort": {
+                            "type": "integer",
+                            "title": "Kubernetes API bind port",
+                            "description": "Kubernetes API bind port used for kube api pod",
+                            "default": 6443
+                        },
+                        "controlPlaneExtraFiles": {
+                            "type": "array",
+                            "title": "Control Plane extra files",
+                            "description": "Additional fiels that will be provisioned to control-plane nodes, reference is from secret in the same namespace.",
+                            "items": {
+                                "type": "object",
+                                "title": "file",
+                                "properties": {
+                                    "path": {
+                                        "type": "string",
+                                        "title": "file path"
+                                    },
+                                    "secretKey": {
+                                        "type": "string",
+                                        "title": "secret key for file content"
+                                    },
+                                    "secretName": {
+                                        "type": "string",
+                                        "title": "secret name for file content"
+                                    }
+                                }
+                            }
+                        },
+                        "controlPlanePostKubeadmCommands": {
+                            "type": "array",
+                            "title": "Control Plane Post Kubeadm Commands",
+                            "description": "Additional Post-Kubeadm Commands executed on the control plane node.",
+                            "items": {
+                                "type": "string",
+                                "title": "command"
+                            }
+                        },
+                        "controlPlanePreKubeadmCommands": {
+                            "type": "array",
+                            "title": "Control Plane Pre Kubeadm Commands",
+                            "description": "Additional Pre-Kubeadm Commands executed on the control plane node.",
+                            "items": {
+                                "type": "string",
+                                "title": "command"
+                            }
+                        },
+                        "etcdExtraArgs": {
+                            "type": "object",
+                            "title": "Etcd extra arguments",
+                            "patternProperties": {
+                                "^.+:.+$": {
+                                    "type": "string",
+                                    "title": "argument"
+                                }
+                            }
+                        }
+                    }
+                },
                 "nodePools": {
                     "type": "object",
                     "title": "Default node pool",

helm/cluster-aws/values.yaml

@@ -58,6 +58,8 @@ controlPlane:
   rootVolumeSizeGB: 120
 internal:
   kubernetesVersion: 1.24.14
+  migration:
+    apiBindPort: 6443
   nodePools:
     def00:
       customNodeLabels: