merge pull request #34 from andrew-morris-rgs/main

feat: conforms machine refs to match the $clustername-$nodepool scheme
rancherfederal · Dec 5, 2024 · 87009fb · 87009fb
2 parents ffd94c6 + 4c2708c
commit 87009fb
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 12 deletions.
diff --git a/charts/cluster-templates/templates/cluster.yaml b/charts/cluster-templates/templates/cluster.yaml
@@ -1,3 +1,4 @@
+{{- $clustername := .Values.cluster.name -}}
 apiVersion: provisioning.cattle.io/v1
 kind: Cluster
 metadata:
@@ -154,7 +155,7 @@ spec:
         apiVersion: elemental.cattle.io/v1beta1
         kind: MachineInventorySelectorTemplate
         {{- end}}
-        name: {{ $nodepool.name }}
+        name: {{ $clustername }}-{{ $nodepool.name }}
       displayName: {{ $nodepool.displayName | default $nodepool.name }}
       {{- if $nodepool.drainBeforeDelete }}
       drainBeforeDelete: {{ $nodepool.drainBeforeDelete }}

diff --git a/charts/cluster-templates/templates/nodeconfig-aws.yaml b/charts/cluster-templates/templates/nodeconfig-aws.yaml
@@ -1,9 +1,10 @@
+{{- $clustername := .Values.cluster.name -}}
 {{- if eq .Values.cloudprovider "amazonec2" }}
 {{- range $index, $nodepool := .Values.nodepools }}
 apiVersion: rke-machine-config.cattle.io/v1
 kind: Amazonec2Config
 metadata:
-  name: {{ $nodepool.name }}
+  name: {{ $clustername }}-{{ $nodepool.name }}
   namespace: fleet-default
 {{- if $nodepool.accessKey }}
 accessKey: {{ $nodepool.accessKey }}
@@ -123,7 +124,7 @@ zone: {{ $nodepool.zone }}
 apiVersion: rke-machine-config.cattle.io/v1
 kind: Amazonec2Config
 metadata:
-  name: {{ $nodepool.name }}
+  name: {{ $clustername }}-{{ $nodepool.name }}
   namespace: fleet-default
 common:
 {{- if $nodepool.labels }}

diff --git a/charts/cluster-templates/templates/nodeconfig-azure.yaml b/charts/cluster-templates/templates/nodeconfig-azure.yaml
@@ -1,9 +1,10 @@
+{{- $clustername := .Values.cluster.name -}}
 {{- if eq .Values.cloudprovider "azure" }}
 {{- range $index, $nodepool := .Values.nodepools }}
 apiVersion: rke-machine-config.cattle.io/v1
 kind: AzureConfig
 metadata:
-  name: {{ $nodepool.name }}
+  name: {{ $clustername }}-{{ $nodepool.name }}
   namespace: fleet-default
 common:
 {{- if $nodepool.labels }}
@@ -50,7 +51,7 @@ vnet: {{ $nodepool.vnet }}
 apiVersion: rke-machine-config.cattle.io/v1
 kind: AzureConfig
 metadata:
-  name: {{ $nodepool.name }}
+  name: {{ $clustername }}-{{ $nodepool.name }}
   namespace: fleet-default
 common:
 {{- if $nodepool.labels }}

diff --git a/charts/cluster-templates/templates/nodeconfig-do.yaml b/charts/cluster-templates/templates/nodeconfig-do.yaml
@@ -1,9 +1,10 @@
+{{- $clustername := .Values.cluster.name -}}
 {{- if eq .Values.cloudprovider "digitalocean" }}
 {{- range $index, $nodepool := .Values.nodepools }}
 apiVersion: rke-machine-config.cattle.io/v1
 kind: DigitaloceanConfig
 metadata:
-  name: {{ $nodepool.name }}
+  name: {{ $clustername }}-{{ $nodepool.name }}
   namespace: fleet-default
 {{- if $nodepool.accessToken }}
 accessToken: {{ $nodepool.accessToken }}
@@ -54,7 +55,7 @@ userdata: {{- $nodepool.userData | toYaml | indent 1 }}
 apiVersion: rke-machine-config.cattle.io/v1
 kind: DigitaloceanConfig
 metadata:
-  name: {{ $nodepool.name }}
+  name: {{ $clustername }}-{{ $nodepool.name }}
   namespace: fleet-default
 {{- if $nodepool.accessToken }}
 accessToken: {{ $nodepool.accessToken }}

diff --git a/charts/cluster-templates/templates/nodeconfig-elemental.yaml b/charts/cluster-templates/templates/nodeconfig-elemental.yaml
@@ -1,9 +1,10 @@
+{{- $clustername := .Values.cluster.name -}}
 {{- if eq .Values.cloudprovider "elemental" }}
 {{- range $index, $nodepool := .Values.nodepools }}
 apiVersion: elemental.cattle.io/v1beta1
 kind: MachineInventorySelectorTemplate
 metadata:
-  name: {{ $nodepool.name }}
+  name: {{ $clustername }}-{{ $nodepool.name }}
   namespace: fleet-default
 spec:
   template:

diff --git a/charts/cluster-templates/templates/nodeconfig-harvester.yaml b/charts/cluster-templates/templates/nodeconfig-harvester.yaml
@@ -1,9 +1,10 @@
+{{- $clustername := .Values.cluster.name -}}
 {{- if eq .Values.cloudprovider "harvester" }}
 {{- range $index, $nodepool := .Values.nodepools }}
 apiVersion: rke-machine-config.cattle.io/v1
 kind: HarvesterConfig
 metadata:
-  name: {{ $nodepool.name }}
+  name: {{ $clustername }}-{{ $nodepool.name }}
   namespace: fleet-default
 {{- if $nodepool.cloudConfig }}
 cloudConfig: {{$nodepool.cloudconfig }}
@@ -81,7 +82,7 @@ vmNamespace: {{ $nodepool.vmNamespace }}
 apiVersion: rke-machine-config.cattle.io/v1
 kind: HarvesterConfig
 metadata:
-  name: {{ $nodepool.name }}
+  name: {{ $clustername }}-{{ $nodepool.name }}
   namespace: fleet-default
 common:
 {{- if $nodepool.labels }}

diff --git a/charts/cluster-templates/templates/nodeconfig-vsphere.yaml b/charts/cluster-templates/templates/nodeconfig-vsphere.yaml
@@ -1,9 +1,10 @@
+{{- $clustername := .Values.cluster.name -}}
 {{- if eq .Values.cloudprovider "vsphere" }}
 {{- range $index, $nodepool := .Values.nodepools }}
 apiVersion: rke-machine-config.cattle.io/v1
 kind: VmwarevsphereConfig
 metadata:
-  name: {{ $nodepool.name }}
+  name: {{ $clustername }}-{{ $nodepool.name }}
   namespace: fleet-default
 common:
 {{- if $nodepool.labels }}
@@ -51,7 +52,7 @@ vcenterPort: {{ $nodepool.vcenterPort | squote }}
 apiVersion: rke-machine-config.cattle.io/v1
 kind: VmwarevsphereConfig
 metadata:
-  name: {{ $nodepool.name }}
+  name: {{ $clustername }}-{{ $nodepool.name }}
   namespace: fleet-default
 common:
 {{- if $nodepool.labels }}