Skip to content

Commit

Permalink
added cni options and vappProperty cluster variables (#45)
Browse files Browse the repository at this point in the history 
* Update cluster.yaml

Updated cluster.yaml to include settings for cluster and service CIDR for pod communication via CNI.

* Update values.yaml

Update values.yaml to ingest cluster and service cidr settings into cluster.yaml. The default values are using rancher defaults: https://ranchermanager.docs.rancher.com/reference-guides/cluster-configuration/rancher-server-configuration/gke-cluster-configuration#container-address-range

* Update values-vsphere.yaml

Re-added network and pool settings for vsphere nodes and added vapp settings (vappIpallocationpolicy, vappIpprotocol, vappTransport, and vappProperty).

vappProperty settings in comments sets ip, gateway, dns if all 3 options are needed

* Update values.yaml

Updated cluster-cidr and service-cidr to include rancher documentation link

* added new values to each example

---------

Co-authored-by: Zack Brady <zackbrady123@gmail.com>
  • Loading branch information
@pknomad @zackbradys
pknomad and zackbradys authored Jan 17, 2025
1 parent 6d7fe27 commit edeb0f8
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 0 deletions.
6 changes: 6 additions & 0 deletions charts/cluster-templates/templates/cluster.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@ spec:
{{- if .Values.cluster.config.globalConfig.cni }}
cni: {{ .Values.cluster.config.globalConfig.cni }}
{{- end }}
{{- if .Values.cluster.config.globalConfig.cluster_cidr }}
cluster-cidr: {{ .Values.cluster.config.globalConfig.cluster_cidr }}
{{- end }}
{{- if .Values.cluster.config.globalConfig.service_cidr }}
service-cidr: {{ .Values.cluster.config.globalConfig.service_cidr }}
{{- end }}
{{- if .Values.cluster.config.globalConfig.docker }}
docker: {{ .Values.cluster.config.globalConfig.docker }}
{{- end }}
Expand Down
2 changes: 2 additions & 0 deletions charts/cluster-templates/values-aws.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ cluster:
globalConfig:
systemDefaultRegistry: docker.io # default registry
cni: canal # canal, calico, cilium, multus,canal, multus,calico, multus,cilium
# cluster-cidr: 10.42.0.0/16 # https://docs.rke2.io/networking/basic_network_options
# service-cidr: 10.43.0.0/16 # https://docs.rke2.io/networking/basic_network_options
docker: false
# token: ''
# tls-san:
Expand Down
2 changes: 2 additions & 0 deletions charts/cluster-templates/values-custom.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ cluster:
globalConfig:
systemDefaultRegistry: docker.io # default registry
cni: canal # canal, calico, cilium, multus,canal, multus,calico, multus,cilium
# cluster-cidr: 10.42.0.0/16 # https://docs.rke2.io/networking/basic_network_options
# service-cidr: 10.43.0.0/16 # https://docs.rke2.io/networking/basic_network_options
docker: false
# token: ''
# tls-san:
Expand Down
2 changes: 2 additions & 0 deletions charts/cluster-templates/values-digitalocean.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ cluster:
globalConfig:
systemDefaultRegistry: docker.io # default registry
cni: canal # canal, calico, cilium, multus,canal, multus,calico, multus,cilium
# cluster-cidr: 10.42.0.0/16 # https://docs.rke2.io/networking/basic_network_options
# service-cidr: 10.43.0.0/16 # https://docs.rke2.io/networking/basic_network_options
docker: false
# token: ''
# tls-san:
Expand Down
2 changes: 2 additions & 0 deletions charts/cluster-templates/values-elemental.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ cluster:
globalConfig:
systemDefaultRegistry: docker.io # default registry
cni: canal # canal, calico, cilium, multus,canal, multus,calico, multus,cilium
# cluster-cidr: 10.42.0.0/16 # https://docs.rke2.io/networking/basic_network_options
# service-cidr: 10.43.0.0/16 # https://docs.rke2.io/networking/basic_network_options
docker: false
# token: ''
# tls-san:
Expand Down
2 changes: 2 additions & 0 deletions charts/cluster-templates/values-harvester.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ cluster:
globalConfig:
systemDefaultRegistry: docker.io # default registry
cni: canal # canal, calico, cilium, multus,canal, multus,calico, multus,cilium
# cluster-cidr: 10.42.0.0/16 # https://docs.rke2.io/networking/basic_network_options
# service-cidr: 10.43.0.0/16 # https://docs.rke2.io/networking/basic_network_options
docker: false
# token: ''
# tls-san:
Expand Down
14 changes: 14 additions & 0 deletions charts/cluster-templates/values-vsphere.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ cluster:
globalConfig:
systemDefaultRegistry: docker.io # default registry
cni: canal # canal, calico, cilium, multus,canal, multus,calico, multus,cilium
# cluster-cidr: 10.42.0.0/16 # https://docs.rke2.io/networking/basic_network_options
# service-cidr: 10.43.0.0/16 # https://docs.rke2.io/networking/basic_network_options
docker: false
# token: ''
# tls-san:
Expand Down Expand Up @@ -160,6 +162,12 @@ nodepools:
cpuCount: 4
memorySize: 8192
diskSize: 20000
# network:
# pool:
# vappIpallocationpolicy: 'fixedAllocated'
# vappIpprotocol: 'IPv4'
# vappProperty: '["ipaddress=ip#SETIPAADDRESSVAPPPROPERTY:","gateway=${gateway:#SETGATEWAYVAPPPROPERTY}","dns=${dns:#SETDNSVAPPPROPERTY}",]'
# vappTransport: 'com.vmware.guestInfo'
# cloudConfig: |
#cloud-config

Expand Down Expand Up @@ -193,6 +201,12 @@ nodepools:
cpuCount: 4
memorySize: 8192
diskSize: 20000
# network:
# pool:
# vappIpallocationpolicy: 'fixedAllocated'
# vappIpprotocol: 'IPv4'
# vappProperty: '["ipaddress=ip#SETIPAADDRESSVAPPPROPERTY:","gateway=${gateway:#SETGATEWAYVAPPPROPERTY}","dns=${dns:#SETDNSVAPPPROPERTY}",]'
# vappTransport: 'com.vmware.guestInfo'
# cloudConfig: |
#cloud-config

Expand Down
2 changes: 2 additions & 0 deletions charts/cluster-templates/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ cluster:
globalConfig:
systemDefaultRegistry: docker.io # default registry
cni: canal # canal, calico, cilium, multus,canal, multus,calico, multus,cilium
# cluster-cidr: 10.42.0.0/16 # https://docs.rke2.io/networking/basic_network_options
# service-cidr: 10.43.0.0/16 # https://docs.rke2.io/networking/basic_network_options
docker: false
# token: ''
# tls-san:
Expand Down

0 comments on commit edeb0f8

Please sign in to comment.