diff --git a/charts/capi-cloudstack/Chart.yaml b/charts/capi-cloudstack/Chart.yaml index ee7ef36..b2a8ad7 100644 --- a/charts/capi-cloudstack/Chart.yaml +++ b/charts/capi-cloudstack/Chart.yaml @@ -7,7 +7,7 @@ keywords: - bootstrapping - kubernetes - cloudstack -version: 0.3.0 +version: 1.0.0 home: https://cluster-api.sigs.k8s.io/ sources: - https://cluster-api.sigs.k8s.io/ diff --git a/charts/capi-cloudstack/templates/machine-deployment.yaml b/charts/capi-cloudstack/templates/machine-deployment.yaml index 142e8e8..d0bdc6c 100644 --- a/charts/capi-cloudstack/templates/machine-deployment.yaml +++ b/charts/capi-cloudstack/templates/machine-deployment.yaml @@ -1,5 +1,6 @@ {{- range $index, $md := .Values.machineDeployments }} {{- $object := dict "MachineDeployment" $md "Index" $index "Context" $ -}} +{{- $kadmconfig := merge (default dict $md.kubeadm) $.Values.kubeadm }} --- apiVersion: cluster.x-k8s.io/{{ $.Values.clusterapiVersion }} kind: MachineDeployment @@ -34,18 +35,18 @@ metadata: spec: template: spec: - {{ if $.Values.kubeadm.users }} - users: {{ toYaml $.Values.kubeadm.users | nindent 8 }} + {{ if $kadmconfig.users }} + users: {{ toYaml $kadmconfig.users | nindent 8 }} {{ end }} joinConfiguration: {{- toYaml (required ".Values.kubeadm.joinConfiguration" - $.Values.kubeadm.joinConfiguration ) | nindent 8 }} - {{ if $.Values.kubeadm.files }} + $kadmconfig.joinConfiguration ) | nindent 8 }} + {{ if $kadmconfig.files }} files: - {{- toYaml $.Values.kubeadm.files | nindent 8 }} + {{- toYaml $kadmconfig.files | nindent 8 }} {{ end -}} - {{ if $.Values.kubeadm.preKubeadmCommands }} + {{ if $kadmconfig.preKubeadmCommands }} preKubeadmCommands: - {{- toYaml $.Values.kubeadm.preKubeadmCommands | nindent 8 }} + {{- toYaml $kadmconfig.preKubeadmCommands | nindent 8 }} {{ end }} {{ end }} diff --git a/charts/capi-cloudstack/values.yaml b/charts/capi-cloudstack/values.yaml index 3fbd68b..b0c5ad6 100644 --- a/charts/capi-cloudstack/values.yaml +++ b/charts/capi-cloudstack/values.yaml @@ -92,6 +92,10 @@ machineTemplates: [] # - name: production # templateName: prodTemplate # replicas: 3 +# kubeadm: +# preKubeadmCommands: +# - swapoff -a +# - sudo apt update # - name: develop # templateName: smallTemplate # replicas: 2