refactor: remove kube-vip template from Nutanix's KCP

This will be moved into the handler so that it can be reused.

Author: dkoshkin

charts/cluster-api-runtime-extensions-nutanix/README.md

@@ -59,6 +59,8 @@ A Helm chart for cluster-api-runtime-extensions-nutanix
 | hooks.cni.cilium.helmAddonStrategy.defaultValueTemplateConfigMap.name | string | `"default-cilium-cni-helm-values-template"` |  |
 | hooks.csi.nutanix.helmAddonStrategy.defaultValueTemplateConfigMap.create | bool | `true` |  |
 | hooks.csi.nutanix.helmAddonStrategy.defaultValueTemplateConfigMap.name | string | `"default-nutanix-csi-helm-values-template"` |  |
+| hooks.kubeVip.defaultTemplateConfigMap.create | bool | `true` |  |
+| hooks.kubeVip.defaultTemplateConfigMap.name | string | `"default-kube-vip-template"` |  |
 | hooks.nfd.crsStrategy.defaultInstallationConfigMap.name | string | `"node-feature-discovery"` |  |
 | hooks.nfd.helmAddonStrategy.defaultValueTemplateConfigMap.create | bool | `true` |  |
 | hooks.nfd.helmAddonStrategy.defaultValueTemplateConfigMap.name | string | `"default-nfd-helm-values-template"` |  |

charts/cluster-api-runtime-extensions-nutanix/defaultclusterclasses/nutanix-cluster-class.yaml

@@ -132,72 +132,7 @@ spec:
           scheduler:
             extraArgs:
               tls-cipher-suites: TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
-        files:
-        - content: |
-            apiVersion: v1
-            kind: Pod
-            metadata:
-              name: kube-vip
-              namespace: kube-system
-            spec:
-              containers:
-                - name: kube-vip
-                  image: ghcr.io/kube-vip/kube-vip:v0.6.4
-                  imagePullPolicy: IfNotPresent
-                  args:
-                    - manager
-                  env:
-                    - name: vip_arp
-                      value: "true"
-                    - name: address
-                      value: "control_plane_endpoint_ip"
-                    - name: port
-                      value: "control_plane_endpoint_port"
-                    - name: vip_cidr
-                      value: "32"
-                    - name: cp_enable
-                      value: "true"
-                    - name: cp_namespace
-                      value: kube-system
-                    - name: vip_ddns
-                      value: "false"
-                    - name: vip_leaderelection
-                      value: "true"
-                    - name: vip_leaseduration
-                      value: "15"
-                    - name: vip_renewdeadline
-                      value: "10"
-                    - name: vip_retryperiod
-                      value: "2"
-                    - name: svc_enable
-                      value: "false"
-                    - name: lb_enable
-                      value: "false"
-                    - name: enableServicesElection
-                      value: "false"
-                  securityContext:
-                    capabilities:
-                      add:
-                        - NET_ADMIN
-                        - SYS_TIME
-                        - NET_RAW
-                  volumeMounts:
-                    - mountPath: /etc/kubernetes/admin.conf
-                      name: kubeconfig
-                  resources: {}
-              hostNetwork: true
-              hostAliases:
-                - hostnames:
-                    - kubernetes
-                  ip: 127.0.0.1
-              volumes:
-                - name: kubeconfig
-                  hostPath:
-                    type: FileOrCreate
-                    path: /etc/kubernetes/admin.conf
-            status: {}
-          owner: root:root
-          path: /etc/kubernetes/manifests/kube-vip.yaml
+        files: []
         initConfiguration:
           nodeRegistration:
             kubeletExtraArgs:

charts/cluster-api-runtime-extensions-nutanix/templates/kube-vip/manifests/kube-vip-configmap.yaml

@@ -0,0 +1,74 @@
+# Copyright 2023 D2iQ, Inc. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+{{- if .Values.hooks.kubeVip.defaultTemplateConfigMap.create }}
+apiVersion: v1
+data:
+  kube-vip.yaml: |
+    apiVersion: v1
+    kind: Pod
+    metadata:
+      name: kube-vip
+      namespace: kube-system
+    spec:
+      containers:
+        - name: kube-vip
+          image: ghcr.io/kube-vip/kube-vip:v0.6.4
+          imagePullPolicy: IfNotPresent
+          args:
+            - manager
+          env:
+            - name: vip_arp
+              value: "true"
+            - name: address
+              value: "{{ `{{ .ControlPlaneEndpoint.Host }}` }}"
+            - name: port
+              value: "{{ `{{ .ControlPlaneEndpoint.Port }}` }}"
+            - name: vip_cidr
+              value: "32"
+            - name: cp_enable
+              value: "true"
+            - name: cp_namespace
+              value: kube-system
+            - name: vip_ddns
+              value: "false"
+            - name: vip_leaderelection
+              value: "true"
+            - name: vip_leaseduration
+              value: "15"
+            - name: vip_renewdeadline
+              value: "10"
+            - name: vip_retryperiod
+              value: "2"
+            - name: svc_enable
+              value: "false"
+            - name: lb_enable
+              value: "false"
+            - name: enableServicesElection
+              value: "false"
+          securityContext:
+            capabilities:
+              add:
+                - NET_ADMIN
+                - SYS_TIME
+                - NET_RAW
+          volumeMounts:
+            - mountPath: /etc/kubernetes/admin.conf
+              name: kubeconfig
+          resources: { }
+      hostNetwork: true
+      hostAliases:
+        - hostnames:
+            - kubernetes
+          ip: 127.0.0.1
+      volumes:
+        - name: kubeconfig
+          hostPath:
+            type: FileOrCreate
+            path: /etc/kubernetes/admin.conf
+    status: {}
+kind: ConfigMap
+metadata:
+  creationTimestamp: null
+  name: '{{ .Values.hooks.kubeVip.defaultTemplateConfigMap.name }}'
+{{- end -}}

charts/cluster-api-runtime-extensions-nutanix/values.yaml

@@ -71,6 +71,10 @@ hooks:
       defaultValueTemplateConfigMap:
         create: true
         name: default-cluster-autoscaler-helm-values-template
+  kubeVip:
+    defaultTemplateConfigMap:
+      create: true
+      name: default-kube-vip-template
 
 helmAddonsConfigMap: default-helm-addons-config
 

hack/examples/bases/nutanix/clusterclass/kustomization.yaml.tmpl

@@ -30,12 +30,25 @@ patches:
     - op: "remove"
       path: "/spec/variables"
 
+# Delete the certSANs from the template
+# They will be added by the handler.
 - target:
     kind: KubeadmControlPlaneTemplate
   patch: |-
     - op: "remove"
       path: "/spec/template/spec/kubeadmConfigSpec/clusterConfiguration/apiServer/certSANs"
 
+# Delete the kube-vip file.
+# Will be templated and added back in the handler.
+- target:
+    kind: KubeadmControlPlaneTemplate
+  patch: |-
+    - op: test
+      path: /spec/template/spec/kubeadmConfigSpec/files/0/path
+      value: "/etc/kubernetes/manifests/kube-vip.yaml"
+    - op: "remove"
+      path: "/spec/template/spec/kubeadmConfigSpec/files/0"
+
 # FIXME: Debug why some of the patches are needed.
 # When the handler runs, it sends back multiple patches for individual fields.
 # But CAPI fails applying them because of missing value.