Skip to content

Commit

Permalink
added support for disabling components
Browse files Browse the repository at this point in the history
  • Loading branch information
zackbradys committed Apr 25, 2024
1 parent 58e6625 commit ee6cd70
Show file tree
Hide file tree
Showing 14 changed files with 66 additions and 9 deletions.
2 changes: 1 addition & 1 deletion charts/cluster-templates/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@ Create the name of the service account to use
{{- else }}
{{- default "default" .Values.serviceAccount.name }}
{{- end }}
{{- end }}
{{- end }}
29 changes: 28 additions & 1 deletion charts/cluster-templates/templates/cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,15 @@ spec:
{{- if .Values.cluster.config.globalConfig.cni }}
cni: {{ .Values.cluster.config.globalConfig.cni }}
{{- end }}
{{- if .Values.cluster.config.globalConfig.disable }}
disable: {{ .Values.cluster.config.globalConfig.disable | toRawJson }}
{{- end }}
{{- if .Values.cluster.config.globalConfig.disable_scheduler }}
disable-scheduler: {{ .Values.cluster.config.globalConfig.disable_scheduler }}
{{- end }}
{{- if .Values.cluster.config.globalConfig.disable_cloud_controller }}
disable-cloud-controller: {{ .Values.cluster.config.globalConfig.disable_cloud_controller }}
{{- end }}
{{- if .Values.cluster.config.globalConfig.disable_kube_proxy }}
disable-kube-proxy: {{ .Values.cluster.config.globalConfig.disable_kube_proxy }}
{{- end }}
Expand Down Expand Up @@ -246,6 +255,15 @@ spec:
{{- if .Values.cluster.config.controlPlaneConfig.cni }}
cni: {{ .Values.cluster.config.controlPlaneConfig.cni }}
{{- end }}
{{- if .Values.cluster.config.globalConfig.disable }}
disable: {{ .Values.cluster.config.globalConfig.disable | toRawJson }}
{{- end }}
{{- if .Values.cluster.config.globalConfig.disable_scheduler }}
disable-scheduler: {{ .Values.cluster.config.globalConfig.disable_scheduler }}
{{- end }}
{{- if .Values.cluster.config.globalConfig.disable_cloud_controller }}
disable-cloud-controller: {{ .Values.cluster.config.globalConfig.disable_cloud_controller }}
{{- end }}
{{- if .Values.cluster.config.controlPlaneConfig.disable_kube_proxy }}
disable-kube-proxy: {{ .Values.cluster.config.controlPlaneConfig.disable_kube_proxy }}
{{- end }}
Expand Down Expand Up @@ -306,6 +324,15 @@ spec:
{{- if .Values.cluster.config.workerConfig.cni }}
cni: {{ .Values.cluster.config.workerConfig.cni }}
{{- end }}
{{- if .Values.cluster.config.globalConfig.disable }}
disable: {{ .Values.cluster.config.globalConfig.disable | toRawJson }}
{{- end }}
{{- if .Values.cluster.config.globalConfig.disable_scheduler }}
disable-scheduler: {{ .Values.cluster.config.globalConfig.disable_scheduler }}
{{- end }}
{{- if .Values.cluster.config.globalConfig.disable_cloud_controller }}
disable-cloud-controller: {{ .Values.cluster.config.globalConfig.disable_cloud_controller }}
{{- end }}
{{- if .Values.cluster.config.workerConfig.disable_kube_proxy }}
disable-kube-proxy: {{ .Values.cluster.config.workerConfig.disable_kube_proxy }}
{{- end }}
Expand Down Expand Up @@ -428,4 +455,4 @@ spec:
workerDrainOptions:
enabled: {{ .Values.cluster.config.upgradeStrategy.workerDrainOptions.enabled }}
{{- end }}
{{- end }}
{{- end }}
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ metadata:
namespace: c-m-{{ trunc 8 (sha256sum (printf "%s/%s" $root.Release.Namespace $root.Values.cluster.name)) }}
roleTemplateName: {{ $member.roleTemplateName }}
userPrincipalName: {{ $member.principalName }}
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion charts/cluster-templates/templates/managedcharts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -158,4 +158,4 @@ spec:
- clusterName: {{ .Values.cluster.name }}
---
{{- end }}
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion charts/cluster-templates/templates/nodeconfig-aws.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -247,4 +247,4 @@ vpcId: {{ $nodepool.vpcId }}
zone: {{ $nodepool.zone }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion charts/cluster-templates/templates/nodeconfig-azure.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,4 @@ updateDomainCount: {{ $nodepool.updateDomainCount }}
usePrivateIp: {{ $nodepool.usePrivateIp }}
vnet: {{ $nodepool.vnet }}
{{- end }}
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion charts/cluster-templates/templates/nodeconfig-do.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,4 @@ tags: {{ $nodepool.tags }}
userdata: {{- $nodepool.userData | toYaml | indent 1 }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
Original file line number Diff line number Diff line change
Expand Up @@ -162,4 +162,4 @@ vmAffinity: {{ $nodepool.vmAffinity }}
vmNamespace: {{ $nodepool.vmNamespace }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion charts/cluster-templates/templates/nodeconfig-vsphere.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,4 @@ vappTransport: {{ $nodepool.vappTransport }}
vcenter: {{ $nodepool.vcenter }}
vcenterPort: {{ $nodepool.vcenterPort | squote }}
{{- end }}
{{- end }}
{{- end }}
6 changes: 6 additions & 0 deletions charts/cluster-templates/values-aws.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ cluster:
systemDefaultRegistry: docker.io # default registry
cni: canal # canal, calico, cilium, multus,canal, multus,calico, multus,cilium
docker: false
# disable:
# - rke2-coredns
# - rke2-ingress-nginx
# - rke2-metrics-server
disable_scheduler: false
disable_cloud_controller: false
disable_kube_proxy: false
etcd_expose_metrics: false
profile: '' # cis-1.6, cis-1.23
Expand Down
6 changes: 6 additions & 0 deletions charts/cluster-templates/values-custom.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ cluster:
systemDefaultRegistry: docker.io # default registry
cni: canal # canal, calico, cilium, multus,canal, multus,calico, multus,cilium
docker: false
# disable:
# - rke2-coredns
# - rke2-ingress-nginx
# - rke2-metrics-server
disable_scheduler: false
disable_cloud_controller: false
disable_kube_proxy: false
etcd_expose_metrics: false
profile: '' # cis-1.6, cis-1.23
Expand Down
6 changes: 6 additions & 0 deletions charts/cluster-templates/values-digitalocean.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ cluster:
systemDefaultRegistry: docker.io # default registry
cni: canal # canal, calico, cilium, multus,canal, multus,calico, multus,cilium
docker: false
# disable:
# - rke2-coredns
# - rke2-ingress-nginx
# - rke2-metrics-server
disable_scheduler: false
disable_cloud_controller: false
disable_kube_proxy: false
etcd_expose_metrics: false
profile: '' # cis-1.6, cis-1.23
Expand Down
6 changes: 6 additions & 0 deletions charts/cluster-templates/values-harvester.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ cluster:
systemDefaultRegistry: docker.io # default registry
cni: canal # canal, calico, cilium, multus,canal, multus,calico, multus,cilium
docker: false
# disable:
# - rke2-coredns
# - rke2-ingress-nginx
# - rke2-metrics-server
disable_scheduler: false
disable_cloud_controller: false
disable_kube_proxy: false
etcd_expose_metrics: false
profile: '' # cis-1.6, cis-1.23
Expand Down
6 changes: 6 additions & 0 deletions charts/cluster-templates/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ cluster:
systemDefaultRegistry: docker.io # default registry
cni: canal # canal, calico, cilium, multus,canal, multus,calico, multus,cilium
docker: false
# disable:
# - rke2-coredns
# - rke2-ingress-nginx
# - rke2-metrics-server
disable_scheduler: false
disable_cloud_controller: false
disable_kube_proxy: false
etcd_expose_metrics: false
profile: '' # cis-1.6, cis-1.23
Expand Down

0 comments on commit ee6cd70

Please sign in to comment.