From edeb0f89c42b448d63c05ecc25cd1a7c7d3d31f7 Mon Sep 17 00:00:00 2001 From: j9k <25725336+pknomad@users.noreply.github.com> Date: Fri, 17 Jan 2025 14:13:18 -0500 Subject: [PATCH] added cni options and vappProperty cluster variables (#45) * 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 --- charts/cluster-templates/templates/cluster.yaml | 6 ++++++ charts/cluster-templates/values-aws.yaml | 2 ++ charts/cluster-templates/values-custom.yaml | 2 ++ charts/cluster-templates/values-digitalocean.yaml | 2 ++ charts/cluster-templates/values-elemental.yaml | 2 ++ charts/cluster-templates/values-harvester.yaml | 2 ++ charts/cluster-templates/values-vsphere.yaml | 14 ++++++++++++++ charts/cluster-templates/values.yaml | 2 ++ 8 files changed, 32 insertions(+) diff --git a/charts/cluster-templates/templates/cluster.yaml b/charts/cluster-templates/templates/cluster.yaml index e448683..54ee9fc 100644 --- a/charts/cluster-templates/templates/cluster.yaml +++ b/charts/cluster-templates/templates/cluster.yaml @@ -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 }} diff --git a/charts/cluster-templates/values-aws.yaml b/charts/cluster-templates/values-aws.yaml index d892b40..0c10966 100644 --- a/charts/cluster-templates/values-aws.yaml +++ b/charts/cluster-templates/values-aws.yaml @@ -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: diff --git a/charts/cluster-templates/values-custom.yaml b/charts/cluster-templates/values-custom.yaml index b73941a..32de7d0 100644 --- a/charts/cluster-templates/values-custom.yaml +++ b/charts/cluster-templates/values-custom.yaml @@ -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: diff --git a/charts/cluster-templates/values-digitalocean.yaml b/charts/cluster-templates/values-digitalocean.yaml index 4884e74..bede102 100644 --- a/charts/cluster-templates/values-digitalocean.yaml +++ b/charts/cluster-templates/values-digitalocean.yaml @@ -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: diff --git a/charts/cluster-templates/values-elemental.yaml b/charts/cluster-templates/values-elemental.yaml index 7be532e..8fb39e5 100644 --- a/charts/cluster-templates/values-elemental.yaml +++ b/charts/cluster-templates/values-elemental.yaml @@ -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: diff --git a/charts/cluster-templates/values-harvester.yaml b/charts/cluster-templates/values-harvester.yaml index ef28468..01c73c1 100644 --- a/charts/cluster-templates/values-harvester.yaml +++ b/charts/cluster-templates/values-harvester.yaml @@ -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: diff --git a/charts/cluster-templates/values-vsphere.yaml b/charts/cluster-templates/values-vsphere.yaml index 0c6faf1..42d2495 100644 --- a/charts/cluster-templates/values-vsphere.yaml +++ b/charts/cluster-templates/values-vsphere.yaml @@ -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: @@ -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 @@ -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 diff --git a/charts/cluster-templates/values.yaml b/charts/cluster-templates/values.yaml index 117015d..ca55531 100644 --- a/charts/cluster-templates/values.yaml +++ b/charts/cluster-templates/values.yaml @@ -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: