added support for harvester and formatted chart

rancherfederal · Dec 24, 2023 · 80c0f9e · 80c0f9e
1 parent 371973d
commit 80c0f9e
Show file tree

Hide file tree

Showing 16 changed files with 645 additions and 167 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.3.2
-appVersion: 0.3.2
+version: 0.4.0
+appVersion: 0.4.0
 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,24 +2,24 @@
 
 |    Type     | Chart Version | App Version |
 | :---------: | :-----------: | :---------: |
-| application |   `v0.3.2`    |  `v0.3.2`   |
+| application |   `v0.4.0`    |  `v0.4.0`   |
 
 ⚠️ This project is still in active development. As we continued to develop it, there will be breaking changes. ⚠️
 
 ## Supported Providers
 
 ### Currently Available
 
-- AWS Commercial
-- AWS GovCloud
-- Custom
+* AWS Commercial
+* AWS GovCloud
+* Harvester
+* Custom
 
 ### Pending Development
 
-- Harvester
-- Microsoft Azure
-- Digital Ocean
-- VMWare vSphere
+* VMWare vSphere
+* Microsoft Azure
+* Digital Ocean
 
 ## Installing the Chart
 
@@ -46,30 +46,37 @@ helm delete cluster -n fleet-default
 
 ## Example Configurations
 
-- [Amazon EC2](https://github.com/rancherfederal/rancher-cluster-templates/blob/main/charts/cluster-templates/values-aws.yaml)
-  - [Example Values](https://github.com/rancherfederal/rancher-cluster-templates/blob/main/examples/aws/values-aws.yaml)
-  - [Example Values with Temporary Credentials](https://github.com/rancherfederal/rancher-cluster-templates/blob/main/examples/aws/values-aws-sts.yaml)
-- [Custom](https://github.com/rancherfederal/rancher-cluster-templates/blob/main/charts/cluster-templates/values-custom.yaml)
-  - [Example Values](https://github.com/rancherfederal/rancher-cluster-templates/blob/main/examples/custom/values-custom.yaml)
-- [Harvester (TBD)](https://github.com/rancherfederal/rancher-cluster-templates/blob/main/charts/cluster-templates/values-harvester.yaml)
-- [Microsoft Azure (TBD)](https://github.com/rancherfederal/rancher-cluster-templates/blob/main/charts/cluster-templates/values-azure.yaml)
-- [Digital Ocean (TBD)](https://github.com/rancherfederal/rancher-cluster-templates/blob/main/charts/cluster-templates/values-digitalocean.yaml)
-- [VMWare vSphere (TBD)](https://github.com/rancherfederal/rancher-cluster-templates/blob/main/charts/cluster-templates/values-vsphere.yaml)
+* [Amazon EC2](https://github.com/rancherfederal/rancher-cluster-templates/blob/main/charts/cluster-templates/values-aws.yaml)
+  * [Example Values](https://github.com/rancherfederal/rancher-cluster-templates/blob/main/examples/aws/values-aws.yaml)
+  * [Example Values with Temporary Credentials](https://github.com/rancherfederal/rancher-cluster-templates/blob/main/examples/aws/values-aws-sts.yaml)
+* [Custom](https://github.com/rancherfederal/rancher-cluster-templates/blob/main/charts/cluster-templates/values-custom.yaml)
+  * [Example Values](https://github.com/rancherfederal/rancher-cluster-templates/blob/main/examples/custom/values-custom.yaml)
+* [Harvester](https://github.com/rancherfederal/rancher-cluster-templates/blob/main/charts/cluster-templates/values-harvester.yaml)
+  * [Example Values](https://github.com/rancherfederal/rancher-cluster-templates/blob/main/examples/harvester/values-harvester.yaml)
+* VMWare vSphere (TBD)
+* Microsoft Azure (TBD)
+* Digital Ocean (TBD)
 
 ## Chart/Cluster Secrets Management
 
 ### Cloud Credentials
 
 If you do not have Cloud Credentials created in the Rancher Manager, you can create them via `kubectl` with the command below.
 
-- **Note:** You are able to specific an accessKey, secretKey, or sessionToken in the `values.yaml`
+#### For AWS Credentials
 
 ```bash
 kubectl create secret -n cattle-global-data generic aws-creds --from-literal=amazonec2credentialConfig-defaultRegion=REGION --from-literal=amazonec2credentialConfig-accessKey=ACCESSKEY --from-literal=amazonec2credentialConfig-secretKey=SECRETKEY
 
 kubectl annotate secret -n cattle-global-data aws-creds provisioning.cattle.io/driver=aws
 ```
 
+#### For Harvester Credentials
+
+```bash
+coming soon...
+```
+
 ### Registry Credentials
 
 If you are configuring an authenticated registry and do not have Registry Credentials created in the Rancher Manager, you can create them via `kubectl` with the command below:

diff --git a/charts/cluster-templates/app-readme.md b/charts/cluster-templates/app-readme.md
@@ -2,24 +2,24 @@
 
 |    Type     | Chart Version | App Version |
 | :---------: | :-----------: | :---------: |
-| application |   `v0.3.2`    |  `v0.3.2`   |
+| application |   `v0.4.0`    |  `v0.4.0`   |
 
 ⚠️ This project is still in active development. As we continued to develop it, there will be breaking changes. ⚠️
 
 ## Supported Providers
 
 ### Currently Available
 
-- AWS Commercial
-- AWS GovCloud
-- Custom
+* AWS Commercial
+* AWS GovCloud
+* Harvester
+* Custom
 
 ### Pending Development
 
-- Harvester
-- Microsoft Azure
-- Digital Ocean
-- VMWare vSphere
+* VMWare vSphere
+* Microsoft Azure
+* Digital Ocean
 
 ## Installing the Chart
 
@@ -46,30 +46,37 @@ helm delete cluster -n fleet-default
 
 ## Example Configurations
 
-- [Amazon EC2](https://github.com/rancherfederal/rancher-cluster-templates/blob/main/charts/cluster-templates/values-aws.yaml)
-  - [Example Values](https://github.com/rancherfederal/rancher-cluster-templates/blob/main/examples/aws/values-aws.yaml)
-  - [Example Values with Temporary Credentials](https://github.com/rancherfederal/rancher-cluster-templates/blob/main/examples/aws/values-aws-sts.yaml)
-- [Custom](https://github.com/rancherfederal/rancher-cluster-templates/blob/main/charts/cluster-templates/values-custom.yaml)
-  - [Example Values](https://github.com/rancherfederal/rancher-cluster-templates/blob/main/examples/custom/values-custom.yaml)
-- [Harvester (TBD)](https://github.com/rancherfederal/rancher-cluster-templates/blob/main/charts/cluster-templates/values-harvester.yaml)
-- [Microsoft Azure (TBD)](https://github.com/rancherfederal/rancher-cluster-templates/blob/main/charts/cluster-templates/values-azure.yaml)
-- [Digital Ocean (TBD)](https://github.com/rancherfederal/rancher-cluster-templates/blob/main/charts/cluster-templates/values-digitalocean.yaml)
-- [VMWare vSphere (TBD)](https://github.com/rancherfederal/rancher-cluster-templates/blob/main/charts/cluster-templates/values-vsphere.yaml)
+* [Amazon EC2](https://github.com/rancherfederal/rancher-cluster-templates/blob/main/charts/cluster-templates/values-aws.yaml)
+  * [Example Values](https://github.com/rancherfederal/rancher-cluster-templates/blob/main/examples/aws/values-aws.yaml)
+  * [Example Values with Temporary Credentials](https://github.com/rancherfederal/rancher-cluster-templates/blob/main/examples/aws/values-aws-sts.yaml)
+* [Custom](https://github.com/rancherfederal/rancher-cluster-templates/blob/main/charts/cluster-templates/values-custom.yaml)
+  * [Example Values](https://github.com/rancherfederal/rancher-cluster-templates/blob/main/examples/custom/values-custom.yaml)
+* [Harvester](https://github.com/rancherfederal/rancher-cluster-templates/blob/main/charts/cluster-templates/values-harvester.yaml)
+  * [Example Values](https://github.com/rancherfederal/rancher-cluster-templates/blob/main/examples/harvester/values-harvester.yaml)
+* VMWare vSphere (TBD)
+* Microsoft Azure (TBD)
+* Digital Ocean (TBD)
 
 ## Chart/Cluster Secrets Management
 
 ### Cloud Credentials
 
 If you do not have Cloud Credentials created in the Rancher Manager, you can create them via `kubectl` with the command below.
 
-- **Note:** You are able to specific an accessKey, secretKey, or sessionToken in the `values.yaml`
+#### For AWS Credentials
 
 ```bash
 kubectl create secret -n cattle-global-data generic aws-creds --from-literal=amazonec2credentialConfig-defaultRegion=REGION --from-literal=amazonec2credentialConfig-accessKey=ACCESSKEY --from-literal=amazonec2credentialConfig-secretKey=SECRETKEY
 
 kubectl annotate secret -n cattle-global-data aws-creds provisioning.cattle.io/driver=aws
 ```
 
+#### For Harvester Credentials
+
+```bash
+coming soon...
+```
+
 ### Registry Credentials
 
 If you are configuring an authenticated registry and do not have Registry Credentials created in the Rancher Manager, you can create them via `kubectl` with the command below:

diff --git a/charts/cluster-templates/templates/cluster.yaml b/charts/cluster-templates/templates/cluster.yaml
@@ -45,7 +45,9 @@ spec:
     chartValues:
       harvester-cloud-provider:
         cloudConfigPath: /var/lib/rancher/rke2/etc/config-files/cloud-provider-config
-        clusterName: {{ .Values.cluster.name }}
+        global:
+          cattle:
+            clusterName: {{ .Values.cluster.name }}
     {{- else if eq $.Values.cloudprovider "vsphere" }}
     chartValues:
       rke2-calico: {}
@@ -180,30 +182,6 @@ spec:
 {{ toYaml $nodepool.machineDeploymentAnnotations | indent 8 }}
       {{- end }}
     {{- end }}
-    {{- if eq $.Values.cloudprovider "harvester" }}
-    machineSelectorConfig:
-    - config:
-        cloud-provider-config: {{ .Values.cluster.config.cloud_provider_config | default "secret://harvester" }}
-        cloud-provider-name: {{ .Values.cluster.config.cloud_provider_config | default "harvester" }}
-        {{- if .Values.cluster.config.systemDefaultRegistry }}
-        system-default-registry: {{ .Values.cluster.config.systemDefaultRegistry }}
-        {{- end }}
-        protect-kernel-defaults: {{ .Values.cluster.config.protect_kernel_defaults }}
-        selinux: {{ .Values.cluster.config.selinux }}
-    {{- else if eq $.Values.cloudprovider "vsphere" }}
-    machineSelectorConfig:
-    - config:
-        {{- if .Values.cluster.config.cloud_provider_config }}
-        cloud-provider-config: {{ .Values.cluster.config.cloud_provider_config }}
-        {{- end }}
-        cloud-provider-name: {{ .Values.cluster.config.cloud_provider_config | default "vsphere" }}
-        {{- if .Values.cluster.config.systemDefaultRegistry }}
-        system-default-registry: {{ .Values.cluster.config.systemDefaultRegistry }}
-        {{- end }}
-        docker: {{ .Values.cluster.config.docker }}
-        protect-kernel-defaults: {{ .Values.cluster.config.protect_kernel_defaults }}
-        selinux: {{ .Values.cluster.config.selinux }}
-    {{- else }}
     machineSelectorConfig:
     - config:
         {{- if .Values.cluster.config.cloud_provider_config }}
@@ -217,7 +195,6 @@ spec:
         protect-kernel-defaults: {{ .Values.cluster.config.protect_kernel_defaults }}
         selinux: {{ .Values.cluster.config.selinux }}
     {{- end }}
-    {{- end }}
     # machineSelectorFiles:
     # provisionGeneration:
     {{- if and .Values.cluster.config.registries (eq .Values.cluster.config.registries.enabled true) }}

diff --git a/charts/cluster-templates/templates/nodeconfig-aws.yaml b/charts/cluster-templates/templates/nodeconfig-aws.yaml
@@ -125,6 +125,15 @@ kind: Amazonec2Config
 metadata:
   name: {{ $nodepool.name }}
   namespace: fleet-default
+common:
+{{- if $nodepool.labels }}
+  labels:
+{{ toYaml $nodepool.labels | indent 4 }}
+{{- end }}
+{{- if $nodepool.taints }}
+  taints:
+{{ toYaml $nodepool.taints | indent 4 }}
+{{- end }}
 {{- if $nodepool.accessKey }}
 accessKey: {{ $nodepool.accessKey }}
 {{- end }}
@@ -137,15 +146,6 @@ blockDurationMinutes: {{ $nodepool.blockDurationMinutes }}
 {{- if $nodepool.deviceName }}
 deviceName: {{ $nodepool.deviceName }}
 {{- end }}
-common:
-{{- if $nodepool.labels }}
-  labels:
-{{ toYaml $nodepool.labels | indent 4 }}
-{{- end }}
-{{- if $nodepool.taints }}
-  taints:
-{{ toYaml $nodepool.taints | indent 4 }}
-{{- end }}
 {{- if $nodepool.encryptEbsVolume }}
 encryptEbsVolume: {{ $nodepool.encryptEbsVolume }}
 {{- end }}