updated/fixed chart variable parsing

rancherfederal · Dec 27, 2023 · c927ab9 · c927ab9
1 parent dcebd63
commit c927ab9
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 22 deletions.
diff --git a/charts/cluster-templates/Chart.yaml b/charts/cluster-templates/Chart.yaml
@@ -3,8 +3,8 @@ name: rancher-cluster-templates
 description: Hardened Rancher Cluster Templates by Rancher Government Solutions
 icon: https://raw.githubusercontent.com/rancherfederal/carbide-docs/main/static/img/carbide-logo.svg
 type: application
-version: 0.4.1
-appVersion: 0.4.1
+version: 0.4.2
+appVersion: 0.4.2
 annotations:
   catalog.cattle.io/type: cluster-template
   catalog.cattle.io/namespace: fleet-default
diff --git a/charts/cluster-templates/README.md b/charts/cluster-templates/README.md
@@ -2,7 +2,7 @@
 
 |    Type     | Chart Version | App Version |
 | :---------: | :-----------: | :---------: |
-| application |   `v0.4.1`    |  `v0.4.1`   |
+| application |   `v0.4.2`    |  `v0.4.2`   |
 
 ⚠️ This project is still in active development. As we continued to develop it, there will be breaking changes. ⚠️
 

diff --git a/charts/cluster-templates/app-readme.md b/charts/cluster-templates/app-readme.md
@@ -2,7 +2,7 @@
 
 |    Type     | Chart Version | App Version |
 | :---------: | :-----------: | :---------: |
-| application |   `v0.4.1`    |  `v0.4.1`   |
+| application |   `v0.4.2`    |  `v0.4.2`   |
 
 ⚠️ This project is still in active development. As we continued to develop it, there will be breaking changes. ⚠️
 

diff --git a/charts/cluster-templates/templates/nodeconfig-aws.yaml b/charts/cluster-templates/templates/nodeconfig-aws.yaml
@@ -104,8 +104,8 @@ useEbsOptimizedInstance: {{ $nodepool.useEbsOptimizedInstance }}
 {{- if $nodepool.usePrivateAddress }}
 usePrivateAddress: {{ $nodepool.usePrivateAddress }}
 {{- end }}
-{{- if $nodepool.userdata }}
-userdata: {{- $nodepool.userdata | toYaml | indent 1 }}
+{{- if $nodepool.userData }}
+userdata: {{- $nodepool.userData | toYaml | indent 1 }}
 {{- end }}
 {{- if $nodepool.volumeType }}
 volumeType: {{ $nodepool.volumeType }}
@@ -234,8 +234,8 @@ useEbsOptimizedInstance: {{ $nodepool.useEbsOptimizedInstance }}
 {{- if $nodepool.usePrivateAddress }}
 usePrivateAddress: {{ $nodepool.usePrivateAddress }}
 {{- end }}
-{{- if $nodepool.userdata }}
-userdata: {{- $nodepool.userdata | toYaml | indent 1 }}
+{{- if $nodepool.userData }}
+userdata: {{- $nodepool.userData | toYaml | indent 1 }}
 {{- end }}
 {{- if $nodepool.volumeType }}
 volumeType: {{ $nodepool.volumeType }}

diff --git a/charts/cluster-templates/templates/nodeconfig-do.yaml b/charts/cluster-templates/templates/nodeconfig-do.yaml
@@ -44,8 +44,8 @@ sshUser: {{ $nodepool.sshUser }}
 {{- if $nodepool.tags }}
 tags: {{ $nodepool.tags }}
 {{- end }}
-{{- if $nodepool.userdata }}
-userdata: {{- $nodepool.userdata | toYaml | indent 1 }}
+{{- if $nodepool.userData }}
+userdata: {{- $nodepool.userData | toYaml | indent 1 }}
 {{- end }}
 ---
 {{- end }}
@@ -95,8 +95,8 @@ sshUser: {{ $nodepool.sshUser }}
 {{- if $nodepool.tags }}
 tags: {{ $nodepool.tags }}
 {{- end }}
-{{- if $nodepool.userdata }}
-userdata: {{- $nodepool.userdata | toYaml | indent 1 }}
+{{- if $nodepool.userData }}
+userdata: {{- $nodepool.userData | toYaml | indent 1 }}
 {{- end }}
 {{- end }}
 {{- end }}
diff --git a/charts/cluster-templates/values-aws.yaml b/charts/cluster-templates/values-aws.yaml
@@ -130,7 +130,7 @@ nodepools:
     volumeType: gp3
     vpcId: # required (example: vpc-123456789)
     useEbsOptimizedInstance: false
-    # userdata: |
+    # userData: |
       #cloud-config
 
   - name: worker-nodes
@@ -180,7 +180,7 @@ nodepools:
     volumeType: gp3
     vpcId: # required (example: vpc-123456789)
     useEbsOptimizedInstance: false
-    # userdata: |
+    # userData: |
       #cloud-config
 
 # addons values

diff --git a/charts/cluster-templates/values-digitalocean.yaml b/charts/cluster-templates/values-digitalocean.yaml
@@ -104,7 +104,7 @@ nodepools:
     # sshPort: 22
     sshUser: # required (example: rocky)
     # tags: ''
-    # userdata: |
+    # userData: |
       #cloud-config
 
   - name: worker-nodes
@@ -130,7 +130,7 @@ nodepools:
     # sshPort: 22
     sshUser: # required (example: rocky)
     # tags: ''
-    # userdata: |
+    # userData: |
       #cloud-config
 
 # addons values

diff --git a/examples/aws/fleet.yaml b/examples/aws/fleet.yaml
@@ -2,7 +2,7 @@ defaultNamespace: fleet-default
 helm:
   repo: https://rancherfederal.github.io/rancher-cluster-templates
   chart: rancher-cluster-templates
-  version: 0.4.1
+  version: 0.4.2
   releaseName: aws-cluster
   valuesFiles:
     - values-aws.yaml
diff --git a/examples/aws/values-aws.yaml b/examples/aws/values-aws.yaml
@@ -144,7 +144,7 @@ nodepools:
     volumeType: gp3
     vpcId: vpc-0934dc8778cdf65db # required (example: vpc-123456789)
     useEbsOptimizedInstance: false
-    userdata: |
+    userData: |
       #cloud-config
       package_update: true
       packages:
@@ -317,7 +317,7 @@ nodepools:
     volumeType: gp3
     vpcId: vpc-0934dc8778cdf65db # required (example: vpc-123456789)
     useEbsOptimizedInstance: false
-    userdata: |
+    userData: |
       #cloud-config
       package_update: true
       packages:

diff --git a/examples/custom/fleet.yaml b/examples/custom/fleet.yaml
@@ -2,7 +2,7 @@ defaultNamespace: fleet-default
 helm:
   repo: https://rancherfederal.github.io/rancher-cluster-templates
   chart: rancher-cluster-templates
-  version: 0.4.1
+  version: 0.4.2
   releaseName: custom-cluster
   valuesFiles:
     - values-custom.yaml
diff --git a/examples/digitalocean/fleet.yaml b/examples/digitalocean/fleet.yaml
@@ -2,7 +2,7 @@ defaultNamespace: fleet-default
 helm:
   repo: https://rancherfederal.github.io/rancher-cluster-templates
   chart: rancher-cluster-templates
-  version: 0.4.1
+  version: 0.4.2
   releaseName: digitalocean-cluster
   valuesFiles:
     - values-digitalocean.yaml
diff --git a/examples/harvester/fleet.yaml b/examples/harvester/fleet.yaml
@@ -2,7 +2,7 @@ defaultNamespace: fleet-default
 helm:
   repo: https://rancherfederal.github.io/rancher-cluster-templates
   chart: rancher-cluster-templates
-  version: 0.4.1
+  version: 0.4.2
   releaseName: harvester-cluster
   valuesFiles:
     - values-harvester.yaml