Skip to content

Prefix rke-machines with cluster name #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Prefix rke-machines with cluster name #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions charts/templates/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ spec:
{{- else if eq $.Values.cloudprovider "azure" }}
kind: AzureConfig
{{- end}}
name: {{ $nodepool.name }}
name: {{ $.Values.cluster.name }}-{{ $nodepool.name }}
paused: {{ $nodepool.paused }}
displayName: {{ $nodepool.displayName }}
{{- if $nodepool.rollingUpdate }}
Expand Down Expand Up @@ -80,7 +80,7 @@ spec:
{{- else if eq $.Values.cloudprovider "azure" }}
kind: AzureConfig
{{- end}}
name: {{ $nodepool.name }}
name: {{ $.Values.cluster.name }}-{{ $nodepool.name }}
paused: {{ $nodepool.paused }}
displayName: {{ $nodepool.displayName }}
{{- if $nodepool.rollingUpdate }}
Expand Down
8 changes: 4 additions & 4 deletions charts/templates/nodeconfig-aws.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
apiVersion: rke-machine-config.cattle.io/v1
kind: Amazonec2Config
metadata:
name: {{ $nodepool.name }}
name: {{ $.Values.cluster.name }}-{{ $nodepool.name }}
namespace: fleet-default
{{- if $nodepool.ami }}
ami: {{ $nodepool.ami }}
Expand Down Expand Up @@ -45,7 +45,7 @@ keypairName: {{ $nodepool.keypairName }}
monitoring: {{ $nodepool.monitoring }}
{{- end }}
{{- if $nodepool.openPort}}
openPort:
openPort:
{{- range $i, $port := $nodepool.openPort }}
- {{ $port }}
{{- end }}
Expand Down Expand Up @@ -117,7 +117,7 @@ zone: {{ $nodepool.zone }}
apiVersion: rke-machine-config.cattle.io/v1
kind: Amazonec2Config
metadata:
name: {{ $nodepool.name }}
name: {{ $.Values.cluster.name }}-{{ $nodepool.name }}
namespace: fleet-default
{{- if $nodepool.ami }}
ami: {{ $nodepool.ami }}
Expand Down Expand Up @@ -159,7 +159,7 @@ keypairName: {{ $nodepool.keypairName }}
monitoring: {{ $nodepool.monitoring }}
{{- end }}
{{- if $nodepool.openPort}}
openPort:
openPort:
{{- range $i, $port := $nodepool.openPort }}
- {{ $port }}
{{- end }}
Expand Down
8 changes: 4 additions & 4 deletions charts/templates/nodeconfig-azure.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
apiVersion: rke-machine-config.cattle.io/v1
kind: AzureConfig
metadata:
name: {{ $nodepool.name }}
name: {{ $.Values.cluster.name }}-{{ $nodepool.name }}
namespace: fleet-default
common:
{{- if $nodepool.labels }}
Expand All @@ -26,7 +26,7 @@ location: {{ $nodepool.location }}
managedDisks: {{ $nodepool.managedDisks }}
noPublicIp: {{ $nodepool.noPublicIp }}
{{- if $nodepool.openPort}}
openPort:
openPort:
{{- range $i, $port := $nodepool.openPort }}
- {{ $port }}
{{- end }}
Expand All @@ -50,7 +50,7 @@ vnet: {{ $nodepool.vnet }}
apiVersion: rke-machine-config.cattle.io/v1
kind: AzureConfig
metadata:
name: {{ $nodepool.name }}
name: {{ $.Values.cluster.name }}-{{ $nodepool.name }}
namespace: fleet-default
common:
{{- if $nodepool.labels }}
Expand All @@ -73,7 +73,7 @@ location: {{ $nodepool.location }}
managedDisks: {{ $nodepool.managedDisks }}
noPublicIp: {{ $nodepool.noPublicIp }}
{{- if $nodepool.openPort}}
openPort:
openPort:
{{- range $i, $port := $nodepool.openPort }}
- {{ $port }}
{{- end }}
Expand Down
4 changes: 2 additions & 2 deletions charts/templates/nodeconfig-do.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
apiVersion: rke-machine-config.cattle.io/v1
kind: DigitaloceanConfig
metadata:
name: {{ $nodepool.name }}
name: {{ $.Values.cluster.name }}-{{ $nodepool.name }}
namespace: fleet-default
common:
{{- if $nodepool.labels }}
Expand Down Expand Up @@ -34,7 +34,7 @@ userdata: {{ $nodepool.userdata }}
apiVersion: rke-machine-config.cattle.io/v1
kind: DigitaloceanConfig
metadata:
name: {{ $nodepool.name }}
name: {{ $.Values.cluster.name }}-{{ $nodepool.name }}
namespace: fleet-default
common:
{{- if $nodepool.labels }}
Expand Down
4 changes: 2 additions & 2 deletions charts/templates/nodeconfig-harvester.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
apiVersion: rke-machine-config.cattle.io/v1
kind: HarvesterConfig
metadata:
name: {{ $nodepool.name }}
name: {{ $.Values.cluster.name }}-{{ $nodepool.name }}
namespace: fleet-default
common:
{{- if $nodepool.labels }}
Expand All @@ -29,7 +29,7 @@ sshUser: {{ $nodepool.sshUser }}
apiVersion: rke-machine-config.cattle.io/v1
kind: HarvesterConfig
metadata:
name: {{ $nodepool.name }}
name: {{ $.Values.cluster.name }}-{{ $nodepool.name }}
namespace: fleet-default
common:
{{- if $nodepool.labels }}
Expand Down
4 changes: 2 additions & 2 deletions charts/templates/nodeconfig-vsphere.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
apiVersion: rke-machine-config.cattle.io/v1
kind: VmwarevsphereConfig
metadata:
name: {{ $nodepool.name }}
name: {{ $.Values.cluster.name }}-{{ $nodepool.name }}
namespace: fleet-default
common:
{{- if $nodepool.labels }}
Expand Down Expand Up @@ -50,7 +50,7 @@ vcenterPort: {{ $nodepool.vcenterPort }}
apiVersion: rke-machine-config.cattle.io/v1
kind: VmwarevsphereConfig
metadata:
name: {{ $nodepool.name }}
name: {{ $.Values.cluster.name }}-{{ $nodepool.name }}
namespace: fleet-default
common:
{{- if $nodepool.labels }}
Expand Down