Fix typo in Rancher Cluster Template for Azure

charts/rancher-cluster-templates/CONTRIBUTING.md

@@ -33,5 +33,5 @@ helm uninstall rke2-azure-cluster01 -n fleet-default
 
 ## How to troubleshoot
 
-* Follow the steps from the start by looking at the machine-provision job (in fleet-default namespace)
+* Follow the steps from the start by looking at the machine-provision job (in `fleet-default` namespace)
 * In case of issue with remaining Kubernetes resources even after helm uninstall, force delete the machine

charts/rancher-cluster-templates/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: rancher-cluster-templates
 description: Helm chart for managing Rancher cluster templates
 type: application
-version: "0.1.0"
+version: "0.1.1"
 appVersion: "0.1.0"
 annotations:
   catalog.cattle.io/type: cluster-template

charts/rancher-cluster-templates/README.md

@@ -1,4 +1,4 @@
-# Helm chart for Kratos
+# Helm chart for Rancher cluster templates
 
 This Helm chart will create a Kubernetes cluster from Rancher through [Cluster Templates](https://ranchermanager.docs.rancher.com/how-to-guides/new-user-guides/manage-clusters/manage-cluster-templates).
 
@@ -25,32 +25,35 @@ helm uninstall my-cluster -n fleet-default
 
 ### Infrastructure providers
 
-Provider                              | Examples                                                 | Templates                                               | Node Driver
---------------------------------------|----------------------------------------------------------|---------------------------------------------------------|----------------
-**Amazon Web Services (AWS)**         | [values_aws](examples/values_aws.yaml)                   | [amazonec2config](templates/amazonec2config.yaml)       | `Amazon EC2`
-**Azure**                             | [values_azure](examples/values_azure.yaml)               | [azureconfig](templates/azureconfig.yaml)               | `Azure`
-**CloudScale**                        | [values_cloudscale](examples/values_cloudscale.yaml)     | [cloudscaleconfig](templates/cloudscaleconfig.yaml)     | `Cloudscale`
-**Digitial Ocean**                    | [values_digitalocean](examples/values_digitalocean.yaml) | [digitaloceanconfig](templates/digitaloceanconfig.yaml) | `DigitalOcean`
-**Exoscale**                          | [values_digitalocean](examples/values_digitalocean.yaml) | [digitaloceanconfig](templates/digitaloceanconfig.yaml) | `Exoscale`
-**Equinix Metal (previously Packet)** | [values_equinix](examples/values_equinix.yaml)           | [packetconfig](templates/packetconfig.yaml)             | `Equinix Metal`
-**Harvester**                         | [values_harvester](examples/values_harvester.yaml)       | [harvesterconfig](templates/harvesterconfig.yaml)       | `Harvester`
-**Linode**                            | [values_linode](examples/values_linode.yaml)             | [linodeconfig](templates/linodeconfig.yaml)             | `Linode`
-**Nutanix**                           | [values_nutanix](examples/values_nutanix.yaml)           | [nutanixconfig](templates/nutanixconfig.yaml)           | `Nutanix`
-**OpenStack**                         | [values_openstack](examples/values_openstack.yaml)       | [openstackconfig](templates/openstackconfig.yaml)       | `OpenStack`
-**Outscale**                          | [values_aws](examples/values_outscale.yaml)              | [outscaleconfig](templates/outscaleconfig.yaml)         | `Outscale`
-**VMware vSphere**                    | [values_vsphere](examples/values_vsphere.yaml)           | [vsphereconfig](templates/vsphereconfig.yaml)           | `vSphere`
+💡 Node driver must be enabled in Rancher prior to Helm chart installation
+
+Provider                         | Example                                                  | Template                                                | Node Driver
+---------------------------------|----------------------------------------------------------|---------------------------------------------------------|----------------
+**Amazon Web Services (AWS)**    | [values_aws](examples/values_aws.yaml)                   | [amazonec2config](templates/amazonec2config.yaml)       | `Amazon EC2`
+**Azure**                        | [values_azure](examples/values_azure.yaml)               | [azureconfig](templates/azureconfig.yaml)               | `Azure`
+**CloudScale**                   | [values_cloudscale](examples/values_cloudscale.yaml)     | [cloudscaleconfig](templates/cloudscaleconfig.yaml)     | `Cloudscale`
+**Digitial Ocean**               | [values_digitalocean](examples/values_digitalocean.yaml) | [digitaloceanconfig](templates/digitaloceanconfig.yaml) | `DigitalOcean`
+**Exoscale**                     | [values_digitalocean](examples/values_digitalocean.yaml) | [digitaloceanconfig](templates/digitaloceanconfig.yaml) | `Exoscale`
+**Equinix Metal (prev. Packet)** | [values_equinix](examples/values_equinix.yaml)           | [packetconfig](templates/packetconfig.yaml)             | `Equinix Metal`
+**Harvester**                    | [values_harvester](examples/values_harvester.yaml)       | [harvesterconfig](templates/harvesterconfig.yaml)       | `Harvester`
+**Linode**                       | [values_linode](examples/values_linode.yaml)             | [linodeconfig](templates/linodeconfig.yaml)             | `Linode`
+**Nutanix**                      | [values_nutanix](examples/values_nutanix.yaml)           | [nutanixconfig](templates/nutanixconfig.yaml)           | `Nutanix`
+**OpenStack**                    | [values_openstack](examples/values_openstack.yaml)       | [openstackconfig](templates/openstackconfig.yaml)       | `OpenStack`
+**Outscale**                     | [values_aws](examples/values_outscale.yaml)              | [outscaleconfig](templates/outscaleconfig.yaml)         | `Outscale`
+**VMware vSphere**               | [values_vsphere](examples/values_vsphere.yaml)           | [vsphereconfig](templates/vsphereconfig.yaml)           | `vSphere`
 
 ## Contributing
 
 Follow the [guide](CONTRIBUTING.md).
 
 ### Going further
 
-* [Azure](docs/azure.md)
-* GitOps approach
+* Infrastructure providers
+  * [Azure](docs/azure.md)
+* Chart installation
   * [ArgoCD](https://github.com/devpro/helm-charts#from-argocd)
   * [Fleet](https://github.com/devpro/helm-charts#from-fleet)
-* [Rancher Apps](https://github.com/devpro/helm-charts#from-rancher)
+  * [Rancher Apps](https://github.com/devpro/helm-charts#from-rancher)
 
 ## Inspirations
 

charts/rancher-cluster-templates/examples/values_aws.yaml

@@ -1,37 +1,40 @@
+cluster:
+  name: CLUSTER_NAME
+
 cloudprovider: aws
 
-cloudCredentialSecretName: aws
+cloudCredentialSecretName: CLOUD_CREDENTIAL_SECRET
 
 nodepools:
-- etcd: true
-  controlplane: true
-  worker: true
-  labels: {}
-  taints: {}
-  quantity: 1
-  paused: false
-  name: nodepool-1
-  deviceName: "/dev/sda1"
-  encryptEbsVolume: false
-  endpoint: ""
-  iamInstanceProfile: ""
-  insecureTransport: false
-  instanceType: t3a.medium
-  region: us-west-2
-  createSecurityGroup: true
-  keypairName: ""
-  securityGroupReadonly: false
-  sshKeyContents: ""
-  subnetId: ""
-  monitoring: false
-  privateAddressOnly: false
-  requestSpotInstance: false
-  retries: 5
-  rootSize: 16
-  spotPrice: 0.5
-  sshUser: ubuntu
-  volumeType: gp2
-  useEbsOptimizedInstance: false
-  usePrivateAddress: false
-  userdata: ""
-  zone: a
+  - etcd: true
+    controlplane: true
+    worker: true
+    labels: {}
+    taints: {}
+    quantity: 1
+    paused: false
+    name: nodepool-1
+    deviceName: "/dev/sda1"
+    encryptEbsVolume: false
+    endpoint: ""
+    iamInstanceProfile: ""
+    insecureTransport: false
+    instanceType: t3a.medium
+    region: us-west-2
+    createSecurityGroup: true
+    keypairName: ""
+    securityGroupReadonly: false
+    sshKeyContents: ""
+    subnetId: ""
+    monitoring: false
+    privateAddressOnly: false
+    requestSpotInstance: false
+    retries: 5
+    rootSize: 16
+    spotPrice: 0.5
+    sshUser: ubuntu
+    storageType: gp2
+    useEbsOptimizedInstance: false
+    usePrivateAddress: false
+    userdata: ""
+    zone: a

charts/rancher-cluster-templates/examples/values_azure.yaml

@@ -2,43 +2,33 @@ cluster:
   name: CLUSTER_NAME
 
 cloudprovider: azure
-cloudCredentialSecretName: CLOUD_CREDENTIAL_SECRET  # Cloud Credential for Azure (example: cattle-global-data:<secret-id>)
-# agentEnvs: []
 
-# clusterMembers:
-# - principalName: "local://u-z8zl5"
-#   roleTemplateName: "cluster-member"
+cloudCredentialSecretName: CLOUD_CREDENTIAL_SECRET  # Azure Cloud Credential (example: cattle-global-data:<secret-id>)
 
 nodepools:
-- etcd: true
-  controlplane: true
-  worker: true
-  labels: {}
-  annotations: {}
-  quantity: 1
-  paused: false
-  name: nodepool-1
-  # displayName: ""
-  # rollingUpdate:
-  #   maxUnavailable: "5"
-  #   maxSurge: "1"
-  # machineDeploymentLabels: {}
-  # machineDeploymentAnnotations: {}
-  availabilitySet: "avs-AZURE_PREFIX"
-  environment: AzurePublicCloud
-  image: "Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202307240"
-  managedDisks: true
-  nsg: "nsg-AZURE_PREFIX"
-  region: westus
-  openPort:
-    - 6443/tcp    # Kubernetes API
-    - 2379/tcp    # etcd client port
-    - 2380/tcp    # etcd peer port
-    - 10250/tcp   # kubelet
-  resourceGroup: "rg-AZURE_PREFIX"
-  size: Standard_DS2_v2
-  sshUser: azureuser
-  storageType: Standard_LRS
-  subnet: rke2
-  subnetPrefix: "192.168.0.0/16"
-  vnet: "vnet-AZURE_PREFIX"
+  - etcd: true
+    controlplane: true
+    worker: true
+    annotations: {}
+    labels: {}
+    quantity: 1
+    paused: false
+    name: nodepool-1
+    region: westus
+    machineImage: "Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202307240"
+    instanceType: Standard_DS2_v2
+    storageType: Standard_LRS
+    sshUser: azureuser
+    openPorts:
+      - 6443/tcp    # Kubernetes API
+      - 2379/tcp    # etcd client port
+      - 2380/tcp    # etcd peer port
+      - 10250/tcp   # kubelet
+    availabilitySet: "avs-AZURE_PREFIX"
+    azureEnvironment: AzurePublicCloud
+    managedDisks: true
+    networkSecurityGroup: "nsg-AZURE_PREFIX"
+    resourceGroup: "rg-AZURE_PREFIX"
+    subnet: rke2
+    subnetPrefix: "192.168.0.0/16"
+    virtualNetwork: "vnet-AZURE_PREFIX"

charts/rancher-cluster-templates/examples/values_cloudscale.yaml

@@ -1,13 +1,16 @@
+cluster:
+  name: CLUSTER_NAME
+
 cloudprovider: cloudscale
 
-cloudCredentialSecretName: cloudscale
+cloudCredentialSecretName: CLOUD_CREDENTIAL_SECRET
 
 nodepools:
-- etcd: true
-  controlplane: true
-  worker: true
-  labels: {}
-  taints: {}
-  quantity: 1
-  paused: false
-  name: nodepool-1
+  - etcd: true
+    controlplane: true
+    worker: true
+    labels: {}
+    taints: {}
+    quantity: 1
+    paused: false
+    name: nodepool-1

charts/rancher-cluster-templates/examples/values_digitalocean.yaml

@@ -1,20 +1,23 @@
+cluster:
+  name: CLUSTER_NAME
+
 cloudprovider: digitalocean
 
-cloudCredentialSecretName: digitalocean
+cloudCredentialSecretName: CLOUD_CREDENTIAL_SECRET
 
 nodepools:
-- etcd: true
-  controlplane: true
-  worker: true
-  labels: {}
-  taints: {}
-  quantity: 1
-  name: nodepool-1
-  image: ubuntu-20-04-x64
-  ipv6: false
-  monitoring: false
-  privateNetworking: false
-  region: sfo3
-  size: s-4vcpu-8gb
-  sshPort: 22
-  sshUser: root
+  - etcd: true
+    controlplane: true
+    worker: true
+    labels: {}
+    taints: {}
+    quantity: 1
+    name: nodepool-1
+    image: ubuntu-20-04-x64
+    ipv6: false
+    monitoring: false
+    privateNetworking: false
+    region: sfo3
+    size: s-4vcpu-8gb
+    sshPort: 22
+    sshUser: root

charts/rancher-cluster-templates/examples/values_equinix.yaml

@@ -1,12 +1,15 @@
+cluster:
+  name: CLUSTER_NAME
+
 cloudprovider: equinix
 
-cloudCredentialSecretName: equinix
+cloudCredentialSecretName: CLOUD_CREDENTIAL_SECRET
 
 nodepools:
-- etcd: true
-  controlplane: true
-  worker: true
-  labels: {}
-  taints: {}
-  quantity: 1
-  name: nodepool-1
+  - etcd: true
+    controlplane: true
+    worker: true
+    labels: {}
+    taints: {}
+    quantity: 1
+    name: nodepool-1

charts/rancher-cluster-templates/examples/values_exoscale.yaml

@@ -1,12 +1,15 @@
+cluster:
+  name: CLUSTER_NAME
+
 cloudprovider: exoscale
 
-cloudCredentialSecretName: exoscale
+cloudCredentialSecretName: CLOUD_CREDENTIAL_SECRET
 
 nodepools:
-- etcd: true
-  controlplane: true
-  worker: true
-  labels: {}
-  taints: {}
-  quantity: 1
-  name: nodepool-1
+  - etcd: true
+    controlplane: true
+    worker: true
+    labels: {}
+    taints: {}
+    quantity: 1
+    name: nodepool-1

charts/rancher-cluster-templates/examples/values_harvester.yaml

@@ -1,20 +1,23 @@
+cluster:
+  name: CLUSTER_NAME
+
 cloudprovider: harvester
 
-cloudCredentialSecretName: harvester
+cloudCredentialSecretName: CLOUD_CREDENTIAL_SECRET
 
 nodepools:
-- etcd: true
-  controlplane: true
-  worker: true
-  labels: {}
-  taints: {}
-  quantity: 1
-  name: harvester-nodepool-1
-  diskSize: 40
-  diskBus: virtio
-  cpuCount: 4
-  memorySize: 8
-  networkName: default/network-name-1
-  imageName: default/image-rand
-  vmNamespace: default
-  sshUser: ubuntu
+  - etcd: true
+    controlplane: true
+    worker: true
+    labels: {}
+    taints: {}
+    quantity: 1
+    name: harvester-nodepool-1
+    diskSize: 40
+    diskBus: virtio
+    cpuCount: 4
+    memorySize: 8
+    networkName: default/network-name-1
+    imageName: default/image-rand
+    vmNamespace: default
+    sshUser: ubuntu

charts/rancher-cluster-templates/examples/values_linode.yaml

@@ -1,12 +1,15 @@
+cluster:
+  name: CLUSTER_NAME
+
 cloudprovider: linode
 
-cloudCredentialSecretName: linode
+cloudCredentialSecretName: CLOUD_CREDENTIAL_SECRET
 
 nodepools:
-- etcd: true
-  controlplane: true
-  worker: true
-  labels: {}
-  taints: {}
-  quantity: 1
-  name: nodepool-1
+  - etcd: true
+    controlplane: true
+    worker: true
+    labels: {}
+    taints: {}
+    quantity: 1
+    name: nodepool-1