Merge pull request #15 from clastix/releases/v0.0.4

feat: disable kamaji addons

Author: bsctl

charts/capi-kamaji-proxmox/Chart.yaml

@@ -1,5 +1,5 @@
 name: capi-kamaji-proxmox
-version: 0.0.3
+version: 0.0.4
 appVersion: 1.31.4
 description: A Helm chart for deploying a Kamaji Tenant Cluster on Proxmox VE using Cluster API
   and Kamaji.

charts/capi-kamaji-proxmox/README.md

@@ -1,6 +1,6 @@
 # capi-kamaji-proxmox
 
-![Version: 0.0.3](https://img.shields.io/badge/Version-0.0.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.31.4](https://img.shields.io/badge/AppVersion-1.31.4-informational?style=flat-square)
+![Version: 0.0.4](https://img.shields.io/badge/Version-0.0.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.31.4](https://img.shields.io/badge/AppVersion-1.31.4-informational?style=flat-square)
 
 A Helm chart for deploying a Kamaji Tenant Cluster on Proxmox VE using Cluster API and Kamaji.
 
@@ -25,9 +25,10 @@ A Helm chart for deploying a Kamaji Tenant Cluster on Proxmox VE using Cluster A
 | cluster.clusterNetwork.pods.cidrBlocks | list | `["10.93.0.0/16"]` | CIDR range for pods |
 | cluster.clusterNetwork.serviceDomain | string | `"cluster.local"` | Service Domain for cluster DNS |
 | cluster.clusterNetwork.services.cidrBlocks | list | `["10.96.0.0/16"]` | CIDR range for services |
-| cluster.controlPlane.addons.coreDNS | object | `{}` | KamajiControlPlane coreDNS configuration. Set to {} for default configuration, or specify custom config. Remove entirely to disable. |
-| cluster.controlPlane.addons.konnectivity | object | `{}` | KamajiControlPlane konnectivity configuration. Set to {} for default configuration, or specify custom config. Remove entirely to disable. |
-| cluster.controlPlane.addons.kubeProxy | object | `{}` | KamajiControlPlane kube-proxy configuration. Set to {} for default configuration, or specify custom config. Remove entirely to disable. |
+| cluster.controlPlane.addons | object | `{"coreDNS":{},"konnectivity":{},"kubeProxy":{}}` | Configure addons for the control plane |
+| cluster.controlPlane.addons.coreDNS | object | `{}` | CoreDNS addon configuration |
+| cluster.controlPlane.addons.konnectivity | object | `{}` | Konnectivity addon configuration |
+| cluster.controlPlane.addons.kubeProxy | object | `{}` | Kube-proxy addon configuration |
 | cluster.controlPlane.dataStoreName | string | `"default"` | KamajiControlPlane dataStoreName |
 | cluster.controlPlane.deployment | object | `{"additionalMetadata":{"annotations":{},"labels":{}},"affinity":{},"nodeSelector":{"kubernetes.io/os":"linux"},"podAdditionalMetadata":{"annotations":{},"labels":{}},"tolerations":[],"topologySpreadConstraints":[]}` | Configure how KamajiControlPlane deployment should be done |
 | cluster.controlPlane.deployment.additionalMetadata | object | `{"annotations":{},"labels":{}}` | Additional metadata as labels and annotations |

charts/capi-kamaji-proxmox/templates/kamaji-control-plane.yaml

@@ -10,18 +10,21 @@ metadata:
     {{- end }}
 spec:
   dataStoreName: {{ .Values.cluster.controlPlane.dataStoreName | quote }}
+  {{- with .Values.cluster.controlPlane.addons }}
   addons:
-    {{- with .Values.cluster.controlPlane.addons }}
-    coreDNS: {{ if gt (len .coreDNS) 0 }}
+    {{- if hasKey . "coreDNS" }}
+    coreDNS:
       {{- toYaml .coreDNS | nindent 6 }}
-    {{- else }}{}{{ end }}
-    kubeProxy: {{ if gt (len .kubeProxy) 0 }}
+    {{- end }}
+    {{- if hasKey . "kubeProxy" }}
+    kubeProxy:
       {{- toYaml .kubeProxy | nindent 6 }}
-    {{- else }}{}{{ end }}
-    konnectivity: {{ if gt (len .konnectivity) 0 }}
+    {{- end }}
+    {{- if hasKey . "konnectivity" }}
+    konnectivity:
       {{- toYaml .konnectivity | nindent 6 }}
-    {{- else }}{}{{ end }}
     {{- end }}
+  {{- end }}
   deployment:
     additionalMetadata:
       labels:

charts/capi-kamaji-proxmox/values.yaml

@@ -39,12 +39,18 @@ cluster:
     replicas: 2
     # -- KamajiControlPlane dataStoreName
     dataStoreName: default
+    # Set to null or remove the key entirely to disable the addon
+    # addons:
+    #   coreDNS: {}
+    #   kubeProxy: {}
+    #   konnectivity: null
+    # -- Configure addons for the control plane
     addons:
-      # -- KamajiControlPlane coreDNS configuration. Set to {} for default configuration, or specify custom config. Remove entirely to disable.
+      # -- CoreDNS addon configuration
       coreDNS: {}
-      # -- KamajiControlPlane kube-proxy configuration. Set to {} for default configuration, or specify custom config. Remove entirely to disable.
+      # -- Kube-proxy addon configuration
       kubeProxy: {}
-      # -- KamajiControlPlane konnectivity configuration. Set to {} for default configuration, or specify custom config. Remove entirely to disable.
+      # -- Konnectivity addon configuration
       konnectivity: {}
     # -- Configure how KamajiControlPlane deployment should be done
     deployment: