fix: remove custom eks cilium configuration from eks examples

Author: supershal

charts/cluster-api-runtime-extensions-nutanix/addons/cni/cilium/values-template.yaml

@@ -45,8 +45,8 @@ kubeProxyReplacement: true
 {{- end }}
 
 {{- if eq $capiProvider "eks" }}
-k8sServiceHost: "{{ trimPrefix "https://" .Cluster.spec.controlPlaneEndpoint.host }}"
-k8sServicePort: "{{ .Cluster.spec.controlPlaneEndpoint.port }}"
+k8sServiceHost: "{{ trimPrefix .Cluster.Spec.ControlPlaneEndpoint.Host "https://" }}"
+k8sServicePort: "{{ .Cluster.Spec.ControlPlaneEndpoint.Port }}"
 {{- else }}
 k8sServiceHost: auto
 {{- end }}

examples/capi-quick-start/eks-cluster.yaml

@@ -1,56 +1,3 @@
-apiVersion: v1
-data:
-  values.yaml: |-
-    cni:
-      exclusive: false
-    hubble:
-      enabled: true
-      tls:
-        auto:
-          enabled: true               # enable automatic TLS certificate generation
-          method: cronJob             # auto generate certificates using cronJob method
-          certValidityDuration: 60    # certificates validity duration in days (default 2 months)
-          schedule: "0 0 1 * *"       # schedule on the 1st day regeneration of each month
-      relay:
-        enabled: true
-        tls:
-          server:
-            enabled: true
-            mtls: true
-        image:
-          useDigest: false
-        priorityClassName: system-cluster-critical
-    image:
-      useDigest: false
-    operator:
-      image:
-        useDigest: false
-    certgen:
-      image:
-        useDigest: false
-    socketLB:
-      hostNamespaceOnly: true
-    envoy:
-      image:
-        useDigest: false
-    kubeProxyReplacement: true
-    k8sServiceHost: "{{ trimPrefix "https://" .Cluster.spec.controlPlaneEndpoint.host }}"
-    k8sServicePort: "{{ .Cluster.spec.controlPlaneEndpoint.port }}"
-    ipam:
-      mode: eni
-    enableIPv4Masquerade: false
-    eni:
-      enabled: true
-      awsReleaseExcessIPs: true
-    routingMode: native
-    endpointRoutes:
-      enabled: true
-kind: ConfigMap
-metadata:
-  labels:
-    cluster.x-k8s.io/provider: eks
-  name: ${CLUSTER_NAME}-cilium-cni-helm-values-template
----
 apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
@@ -70,10 +17,6 @@ spec:
           clusterAutoscaler: {}
           cni:
             provider: Cilium
-            values:
-              sourceRef:
-                kind: ConfigMap
-                name: ${CLUSTER_NAME}-cilium-cni-helm-values-template
           csi:
             defaultStorage:
               provider: aws-ebs

hack/examples/additional-resources/eks/cilium-configmap.yaml

@@ -5,17 +5,12 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-- ../../../additional-resources/eks/cilium-configmap.yaml
 - ../../../bases/eks/cluster
 
 sortOptions:
   order: fifo
 
 patches:
-  # TODO: Replace with generic cilium patch and dynamically generate the correct EKS values
-  - target:
-      kind: Cluster
-    path: ../../../patches/eks/cilium-with-custom-values.yaml
   - target:
       kind: Cluster
     path: ../../../patches/skip-kube-proxy.yaml

hack/examples/overlays/clusters/eks/kustomization.yaml.tmpl

@@ -11,7 +11,3 @@
           nfd: {}
           cni:
             provider: Cilium
-            values:
-              sourceRef:
-                name: ${CLUSTER_NAME}-cilium-cni-helm-values-template
-                kind: ConfigMap