Merge branch 'main' into vijayr/109585-k8sagent-addon-2

Author: vijayaraghavanr31

.github/workflows/codeql-analysis.yml

@@ -30,7 +30,7 @@ jobs:
       uses: actions/checkout@v5
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
 
@@ -43,4 +43,4 @@ jobs:
       run: devbox run -- make build-snapshot
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4

.pre-commit-config.yaml

@@ -62,6 +62,12 @@ repos:
     language: system
     files: "hack/addons/helm-chart-bundler/repos.yaml"
     pass_filenames: false
+  - id: check-list-images
+    name: check-list-images
+    entry: make --no-print-directory list-images
+    language: system
+    files: "^(charts/cluster-api-runtime-extensions-nutanix/|hack/tools/fetch-images/main.go$)"
+    pass_filenames: false
   - id: check-devbox-lock
     name: check-devbox-lock
     entry: devbox install

api/external/sigs.k8s.io/cluster-api-provider-aws/v2/bootstrap/eks/api/v1beta2/nodeadmconfig_types.go

@@ -23,7 +23,7 @@ type NodeadmConfigSpec struct {
 
 	// PreNodeadmCommands specifies extra commands to run before bootstrapping nodes.
 	// +optional
-	PreNodeadmCommands []string `json:"PreNodeadmCommands,omitempty"`
+	PreNodeadmCommands []string `json:"preNodeadmCommands,omitempty"`
 
 	// Files specifies extra files to be passed to user_data upon creation.
 	// +optional

api/v1alpha1/addon_types.go

@@ -29,6 +29,8 @@ const (
 
 	RegistryProviderCNCFDistribution = "CNCF Distribution"
 
+	IngressProviderAWSLoadBalancerController = "aws-lb-controller"
+
 	AddonStrategyClusterResourceSet AddonStrategy = "ClusterResourceSet"
 	AddonStrategyHelmAddon          AddonStrategy = "HelmAddon"
 
@@ -65,6 +67,9 @@ type AWSAddons struct {
 
 	// +kubebuilder:validation:Optional
 	CSI *AWSCSI `json:"csi,omitempty"`
+
+	// +kubebuilder:validation:Optional
+	Ingress *Ingress `json:"ingress,omitempty"`
 }
 
 type DockerAddons struct {
@@ -363,6 +368,13 @@ type RegistryAddon struct {
 	Provider string `json:"provider"`
 }
 
+type Ingress struct {
+	// The Ingress provider to deploy.
+	// +kubebuilder:validation:Required
+	// +kubebuilder:validation:Enum="aws-lb-controller"
+	Provider string `json:"provider"`
+}
+
 type NutanixKonnectorAgent struct {
 	// A reference to the Secret for credential information for the target Prism Central instance
 	// +kubebuilder:validation:Optional
@@ -378,5 +390,5 @@ type NutanixKonnectorAgent struct {
 type NutanixKonnectorAgentCredentials struct {
 	// A reference to the Secret containing the credentials used by the Konnector agent.
 	// +kubebuilder:validation:Required
-	SecretRef LocalObjectReference `json:"secretRef"`
+	SecretRef LocalObjectReference `json:"secretRef"
 }

api/v1alpha1/crds/caren.nutanix.com_awsclusterconfigs.yaml

@@ -226,6 +226,16 @@ spec:
                         - defaultStorage
                         - providers
                       type: object
+                    ingress:
+                      properties:
+                        provider:
+                          description: The Ingress provider to deploy.
+                          enum:
+                            - aws-lb-controller
+                          type: string
+                      required:
+                        - provider
+                      type: object
                     nfd:
                       description: NFD tells us to enable or disable the node feature discovery addon.
                       properties:

api/v1alpha1/crds/caren.nutanix.com_eksclusterconfigs.yaml

@@ -228,6 +228,16 @@ spec:
                         - defaultStorage
                         - providers
                       type: object
+                    ingress:
+                      properties:
+                        provider:
+                          description: The Ingress provider to deploy.
+                          enum:
+                            - aws-lb-controller
+                          type: string
+                      required:
+                        - provider
+                      type: object
                     nfd:
                       description: NFD tells us to enable or disable the node feature discovery addon.
                       properties:

api/v1alpha1/zz_generated.deepcopy.go

@@ -66,6 +66,8 @@ type Addons struct {
 	CSI *CSI `json:"csi,omitempty"`
 
 	COSI *COSI `json:"cosi,omitempty"`
+  
+  Ingress *Ingress `json:"ingress,omitempty"`
 
 	NutanixKonnectorAgent *NutanixKonnectorAgent `json:"konnectorAgent,omitempty"`
 }
@@ -83,3 +85,7 @@ type CSI struct {
 type COSI struct {
 	carenv1.GenericCOSI `json:",inline"`
 }
+
+type Ingress struct {
+	carenv1.Ingress `json:",inline"`
+}

api/variables/aggregate_types.go

@@ -48,10 +48,11 @@ A Helm chart for cluster-api-runtime-extensions-nutanix
 | helmRepository.securityContext.runAsUser | int | `65532` |  |
 | hooks.ccm.aws.helmAddonStrategy.defaultValueTemplateConfigMap.create | bool | `true` |  |
 | hooks.ccm.aws.helmAddonStrategy.defaultValueTemplateConfigMap.name | string | `"default-aws-ccm-helm-values-template"` |  |
-| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.30" | string | `"v1.30.8"` |  |
-| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.31" | string | `"v1.31.5"` |  |
-| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.32" | string | `"v1.32.1"` |  |
+| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.30" | string | `"v1.30.9"` |  |
+| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.31" | string | `"v1.31.7"` |  |
+| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.32" | string | `"v1.32.3"` |  |
 | hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.33" | string | `"v1.33.0"` |  |
+| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.34" | string | `"v1.34.0"` |  |
 | hooks.ccm.nutanix.helmAddonStrategy.defaultValueTemplateConfigMap.create | bool | `true` |  |
 | hooks.ccm.nutanix.helmAddonStrategy.defaultValueTemplateConfigMap.name | string | `"default-nutanix-ccm-helm-values-template"` |  |
 | hooks.clusterAutoscaler.crsStrategy.defaultInstallationConfigMap.name | string | `"cluster-autoscaler"` |  |
@@ -87,6 +88,8 @@ A Helm chart for cluster-api-runtime-extensions-nutanix
 | hooks.csi.nutanix.helmAddonStrategy.defaultValueTemplateConfigMap.name | string | `"default-nutanix-csi-helm-values-template"` |  |
 | hooks.csi.snapshot-controller.helmAddonStrategy.defaultValueTemplateConfigMap.create | bool | `true` |  |
 | hooks.csi.snapshot-controller.helmAddonStrategy.defaultValueTemplateConfigMap.name | string | `"default-snapshot-controller-helm-values-template"` |  |
+| hooks.ingress.awsLoadBalancerController.defaultValueTemplateConfigMap.create | bool | `true` |  |
+| hooks.ingress.awsLoadBalancerController.defaultValueTemplateConfigMap.name | string | `"default-aws-load-balancer-controller-helm-values-template"` |  |
 | hooks.konnectorAgent.helmAddonStrategy.defaultValueTemplateConfigMap.create | bool | `true` |  |
 | hooks.konnectorAgent.helmAddonStrategy.defaultValueTemplateConfigMap.name | string | `"default-konnector-agent-helm-values-template"` |  |
 | hooks.nfd.crsStrategy.defaultInstallationConfigMap.name | string | `"node-feature-discovery"` |  |

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

@@ -0,0 +1,11 @@
+# The clusterName refers the kubernetes.io/cluster/ tag on AWS resources.
+# For EKS clusters, the name will be based on the cluster's namespace + a random suffix.
+# For AWS clusters, the name will just be based on the cluster name.
+{{- $capiProvider := index .Cluster.metadata.labels "cluster.x-k8s.io/provider" }}
+{{- if eq $capiProvider "eks" }}
+clusterName: "{{ .ControlPlane.spec.eksClusterName }}"
+{{- else }}
+clusterName: "{{ .Cluster.metadata.name }}"
+{{- end }}
+# Set this value to avoid stutter in the resource names.
+fullnameOverride: aws-load-balancer-controller