diff --git a/charts/templates/cluster.yaml b/charts/templates/cluster.yaml index ff61276..df9e3ea 100644 --- a/charts/templates/cluster.yaml +++ b/charts/templates/cluster.yaml @@ -43,7 +43,10 @@ spec: {{- else if eq $.Values.cloudprovider "azure" }} kind: AzureConfig {{- end}} - name: {{ $nodepool.name }} + name: nc-{{ $.Values.cluster.name }}-{{ $nodepool.name }} + {{- if $nodepool.os }} + machineOS: {{ $nodepool.os }} + {{- end}} paused: {{ $nodepool.paused }} displayName: {{ $nodepool.displayName }} {{- if $nodepool.rollingUpdate }} @@ -81,6 +84,9 @@ spec: kind: AzureConfig {{- end}} name: {{ $nodepool.name }} + {{- if $nodepool.os }} + machineOS: {{ $nodepool.os }} + {{- end}} paused: {{ $nodepool.paused }} displayName: {{ $nodepool.displayName }} {{- if $nodepool.rollingUpdate }} @@ -137,10 +143,14 @@ spec: # service-cidr: "10.43.0.0/16" # Port range to reserve for services with NodePort visibility (default: "30000-32767") # service-node-port-range: "30000-32767" - # Add additional hostnames or IPv4/IPv6 addresses as Subject Alternative Names on the server TLS cert # tls-san: [] + {{- if .Values.cluster.tlsSan }} + tls-san: +{{ toYaml .Values.cluster.tlsSan | indent 8 }} + {{- end }} - # machineSelectorConfig: + machineSelectorConfig: +{{ toYaml .Values.rke.machineSelectorConfig | indent 6 }} # - config: # Node name # node-name: "" @@ -164,6 +174,10 @@ spec: # cloud-provider-name: "" # Cloud provider configuration file path # cloud-provider-config: "" +{{- if .Values.rke.registries }} + registries: +{{ toYaml .Values.rke.registries | indent 6 }} +{{- end }} {{- if .Values.rke.localClusterAuthEndpoint.enabled }} localClusterAuthEndpoint: enabled: {{ .Values.rke.localClusterAuthEndpoint.enabled }} diff --git a/charts/templates/nodeconfig-vsphere.yaml b/charts/templates/nodeconfig-vsphere.yaml index 8c01bfc..efc7a4d 100644 --- a/charts/templates/nodeconfig-vsphere.yaml +++ b/charts/templates/nodeconfig-vsphere.yaml @@ -3,7 +3,7 @@ apiVersion: rke-machine-config.cattle.io/v1 kind: VmwarevsphereConfig metadata: - name: {{ $nodepool.name }} + name: nc-{{ $.Values.cluster.name }}-{{ $nodepool.name }} namespace: fleet-default common: {{- if $nodepool.labels }} @@ -15,7 +15,8 @@ common: {{ toYaml $nodepool.taints | indent 4 }} {{- end }} {{- if $nodepool.cfgparam }} -cfgparam: {{ $nodepool.cfgparam }} +cfgparam: +{{ toYaml $nodepool.cfgparam | indent 4 }} {{- end }} cloneFrom: {{ $nodepool.cloneFrom }} cloudConfig: | @@ -33,6 +34,7 @@ folder: {{ $nodepool.folder }} hostsystem: {{ $nodepool.hostsystem }} memorySize: {{ $nodepool.memorySize | quote }} network: {{ $nodepool.network }} +os: {{ $nodepool.os | default "linux"}} pool: {{ $nodepool.pool }} sshPort: {{ $nodepool.sshPort | quote }} sshUser: {{ $nodepool.sshUser }} @@ -40,7 +42,8 @@ sshUserGroup: {{ $nodepool.sshUserGroup }} tag: {{ $nodepool.tag }} vappIpallocationpolicy: {{ $nodepool.vappIpallocationpolicy }} vappIpprotocol: {{ $nodepool.vappIpprotocol }} -vappProperty: {{ $nodepool.vappProperty }} +vappProperty: +{{ toYaml $nodepool.vappProperty | indent 4 }} vappTransport: {{ $nodepool.vappTransport }} vcenter: {{ $nodepool.vcenter }} vcenterPort: {{ $nodepool.vcenterPort | quote }} @@ -51,7 +54,7 @@ vcenterPort: {{ $nodepool.vcenterPort | quote }} apiVersion: rke-machine-config.cattle.io/v1 kind: VmwarevsphereConfig metadata: - name: {{ $nodepool.name }} + name: nc-{{ $.Values.cluster.name }}-{{ $nodepool.name }} namespace: fleet-default common: {{- if $nodepool.labels }} @@ -63,7 +66,8 @@ common: {{ toYaml $nodepool.taints | indent 4 }} {{- end }} {{- if $nodepool.cfgparam }} -cfgparam: {{ $nodepool.cfgparam }} +cfgparam: +{{ toYaml $nodepool.cfgparam | indent 4 }} {{- end }} cloneFrom: {{ $nodepool.cloneFrom }} cloudConfig: | @@ -81,6 +85,7 @@ folder: {{ $nodepool.folder }} hostsystem: {{ $nodepool.hostsystem }} memorySize: {{ $nodepool.memorySize | quote }} network: {{ $nodepool.network }} +os: {{ $nodepool.os | default "linux"}} pool: {{ $nodepool.pool }} sshPort: {{ $nodepool.sshPort | quote }} sshUser: {{ $nodepool.sshUser }} @@ -88,7 +93,8 @@ sshUserGroup: {{ $nodepool.sshUserGroup }} tag: {{ $nodepool.tag }} vappIpallocationpolicy: {{ $nodepool.vappIpallocationpolicy }} vappIpprotocol: {{ $nodepool.vappIpprotocol }} -vappProperty: {{ $nodepool.vappProperty }} +vappProperty: +{{ toYaml $nodepool.vappProperty | indent 4 }} vappTransport: {{ $nodepool.vappTransport }} vcenter: {{ $nodepool.vcenter }} vcenterPort: {{ $nodepool.vcenterPort }} diff --git a/charts/values-vsphere.yaml b/charts/values-vsphere.yaml index a6e94d4..653bf2c 100644 --- a/charts/values-vsphere.yaml +++ b/charts/values-vsphere.yaml @@ -17,6 +17,9 @@ nodepools: # specify nodepool size quantity: 1 + # specify nodepool os (linux, windows) + os: linux + # Pause node pool paused: false @@ -64,7 +67,7 @@ nodepools: # vSphere vm configuration parameters (used for guestinfo) # cfgparam: [] - + # - disk.enableUUID=TRUE # If you choose creation type clone a name of what you want to clone is required # cloneFrom: "" @@ -132,6 +135,9 @@ nodepools: # vSphere vApp properties # vappProperty: [] + # - guestinfo.interface.0.ip.0.address=ip:vLan100_K8S + # - guestinfo.interface.0.ip.0.netmask=${netmask:vLan100_K8S} + # - guestinfo.interface.0.route.0.gateway=${gateway:vLan100_K8S} # 'vSphere OVF environment transports to use for properties. Supported values are: iso and com.vmware.guestInfo' # vappTransport: "" diff --git a/charts/values.yaml b/charts/values.yaml index 81db0ef..e1cc9b8 100644 --- a/charts/values.yaml +++ b/charts/values.yaml @@ -9,6 +9,11 @@ cluster: # specify cluster annotations annotations: {} + # Add additional hostnames or IPv4/IPv6 addresses as Subject Alternative Names on the server TLS cert + # tlsSan: + # - 10.10.10.10 + # - kube-api.example.com + # specify cloud credential secret name, do not need to be provided if using custom driver cloudCredentialSecretName: "" @@ -22,6 +27,9 @@ rke: # enable local auth endpoint localClusterAuthEndpoint: enabled: false + machineSelectorConfig: + # - config: + # system-default-registry: registry.example.com # specify fqdn of local access endpoint # fqdn: foo.bar.example # specify cacert of local access endpoint @@ -31,6 +39,17 @@ rke: # clusterMembers: # - principalName: "local://u-z8zl5" # roleTemplateName: "cluster-member" + registries: + # configs: + # {} + # authConfigSecretName: string + # caBundle: string + # insecureSkipVerify: boolean + # tlsSecretName: string + # mirrors: + # '*': + # endpoint: + # - https://registry.example.com # enable monitoring monitoring: diff --git a/cluster-template-0.0.1.tgz b/cluster-template-0.0.1.tgz index 8435ccc..2c28b89 100644 Binary files a/cluster-template-0.0.1.tgz and b/cluster-template-0.0.1.tgz differ