updated/fixed helm chart repo

rancherfederal · Dec 15, 2023 · 09322ed · 09322ed
1 parent 8b5419d
commit 09322ed
Show file tree

Hide file tree

Showing 28 changed files with 659 additions and 354 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Rancher Cluster Templates
 
-> ⚠️ This project is still in active development. As we continued to develop it, there will be breaking changes.
+⚠️ This project is still in active development. As we continued to develop it, there will be breaking changes. ⚠️
 
 This project contains the Helm Chart for Rancher Cluster Templates, which provide declaritive manifests to deploy clusters with the [Rancher Multi-Cluster Manager](https://ranchergovernment.com/products/mcm). Please start with the Helm Chart [README](/charts/cluster-templates/README.md)!
 

diff --git a/charts/cluster-templates/Chart.yaml b/charts/cluster-templates/Chart.yaml
@@ -3,8 +3,8 @@ name: rancher-cluster-templates
 description: RGS - Hardened Rancher Cluster Templates
 icon: https://raw.githubusercontent.com/rancherfederal/carbide-docs/main/static/img/carbide-logo.svg
 type: application
-version: 0.2.0
-appVersion: 0.2.0
+version: 0.3.1
+appVersion: 0.3.1
 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
@@ -1,24 +1,25 @@
 # Rancher Cluster Templates Helm Chart
 
-|  Type   | Chart Version | App Version |
-| :-----: | :-----------: | :---------: |
-| library |   `v0.2.0`    |  `v0.2.0`   |
+|    Type     | Chart Version | App Version |
+| :---------: | :-----------: | :---------: |
+| application |   `v0.3.1`    |  `v0.3.1`   |
 
-## Important Notes
+⚠️ This project is still in active development. As we continued to develop it, there will be breaking changes. ⚠️
 
-### Actively Maintained Providers
+## Supported Providers
+
+### Currently Available
 
 - AWS Commercial
 - AWS GovCloud
 - Custom
 
-### Verified/Tested Providers:
+### Pending Development
 
-- AWS Commercial
-- AWS GovCloud
-- Rancher Harvester
+- Harvester
+- Microsoft Azure
+- Digital Ocean
 - VMWare vSphere
-- Custom
 
 ## Installing the Chart
 
@@ -39,9 +40,34 @@ helm delete cluster -n fleet-default
 
 ## Example Configurations
 
-- [Amazon EC2](values-aws.yaml)
-  - [Example](../../examples/aws/values-aws.yaml)
-- [Microsoft Azure](values-azure.yaml)
-- [Digital Ocean](values-do.yaml)
-- [Rancher Harvester](values-harvester.yaml)
-- [VMWare vSphere](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 (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)
+
+## 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`
+
+```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
+```
+
+### 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:
+
+```bash
+kubectl create secret -n fleet-default generic --type kubernetes.io/basic-auth registry-creds --from-literal=username=USERNAME --from-literal=password=PASSWORD
+```
diff --git a/charts/cluster-templates/app-readme.md b/charts/cluster-templates/app-readme.md
@@ -1,24 +1,25 @@
 # Rancher Cluster Templates Helm Chart
 
-|  Type   | Chart Version | App Version |
-| :-----: | :-----------: | :---------: |
-| library |   `v0.2.0`    |  `v0.2.0`   |
+|    Type     | Chart Version | App Version |
+| :---------: | :-----------: | :---------: |
+| application |   `v0.3.1`    |  `v0.3.1`   |
 
-## Important Notes
+⚠️ This project is still in active development. As we continued to develop it, there will be breaking changes. ⚠️
 
-### Actively Maintained Providers
+## Supported Providers
+
+### Currently Available
 
 - AWS Commercial
 - AWS GovCloud
 - Custom
 
-### Verified/Tested Providers:
+### Pending Development
 
-- AWS Commercial
-- AWS GovCloud
-- Rancher Harvester
+- Harvester
+- Microsoft Azure
+- Digital Ocean
 - VMWare vSphere
-- Custom
 
 ## Installing the Chart
 
@@ -39,9 +40,34 @@ helm delete cluster -n fleet-default
 
 ## Example Configurations
 
-- [Amazon EC2](values-aws.yaml)
-  - [Example](../../examples/aws/values-aws.yaml)
-- [Microsoft Azure](values-azure.yaml)
-- [Digital Ocean](values-do.yaml)
-- [Rancher Harvester](values-harvester.yaml)
-- [VMWare vSphere](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 (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)
+
+## 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`
+
+```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
+```
+
+### 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:
+
+```bash
+kubectl create secret -n fleet-default generic --type kubernetes.io/basic-auth registry-creds --from-literal=username=USERNAME --from-literal=password=PASSWORD
+```
diff --git a/charts/cluster-templates/templates/cloudcredentials-aws.yaml b/charts/cluster-templates/templates/cloudcredentials-aws.yaml
diff --git a/charts/cluster-templates/templates/cloudcredentials-azure.yaml b/charts/cluster-templates/templates/cloudcredentials-azure.yaml
diff --git a/charts/cluster-templates/templates/cloudcredentials-digitalocean.yaml b/charts/cluster-templates/templates/cloudcredentials-digitalocean.yaml
diff --git a/charts/cluster-templates/templates/cloudcredentials-harvester.yaml b/charts/cluster-templates/templates/cloudcredentials-harvester.yaml
diff --git a/charts/cluster-templates/templates/cloudcredentials-vsphere.yaml b/charts/cluster-templates/templates/cloudcredentials-vsphere.yaml
diff --git a/charts/cluster-templates/templates/cluster.yaml b/charts/cluster-templates/templates/cluster.yaml
@@ -183,8 +183,8 @@ spec:
     {{- if eq $.Values.cloudprovider "harvester" }}
     machineSelectorConfig:
     - config:
-        cloud-provider-config: {{ .Values.cloudProviderConfigSecretName }}
-        cloud-provider-name: harvester
+        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 }}
@@ -193,7 +193,10 @@ spec:
     {{- else if eq $.Values.cloudprovider "vsphere" }}
     machineSelectorConfig:
     - config:
-        cloud-provider-name: "rancher-vsphere"
+        {{- 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 }}
@@ -203,11 +206,10 @@ spec:
     {{- else }}
     machineSelectorConfig:
     - config:
-        {{- if .Values.cluster.config.cloud_provider_name }}
-        cloud-provider-name: {{ .Values.cluster.config.cloud_provider_name | quote }}
-        {{- else }}
-        cloud-provider-name: ""
+        {{- 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_name }}
         {{- if .Values.cluster.config.systemDefaultRegistry }}
         system-default-registry: {{ .Values.cluster.config.systemDefaultRegistry }}
         {{- end }}
@@ -228,16 +230,16 @@ spec:
           insecureSkipVerify: {{ .insecureSkipVerify }}
           tlsSecretName: {{ .tlsSecretName }}
         {{- end }}
+      {{- if .Values.cluster.config.registries.mirrors }}
       mirrors:
         {{- range .Values.cluster.config.registries.mirrors }}
         {{ .name }}:
-          {{- if .endpoints }}
-          endpoints:
-            {{- range .endpoints }}
+          endpoint:
+            {{- range .endpoint }}
             - {{ . }}
             {{- end }}
-          {{- end }}
         {{- end }}
+      {{- end }}
     {{- end }}
     # rotateCertificates:
     # rotateEncryptionKeys:

diff --git a/charts/cluster-templates/templates/registry-credentials.yaml b/charts/cluster-templates/templates/registry-credentials.yaml