-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(t8s-cluster/management-cluster): add support for gpu nodes (#499)
- Loading branch information
Showing
18 changed files
with
175 additions
and
66 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
workers: | ||
test: | ||
replicas: 1 | ||
availabilityZone: Zone1 | ||
flavor: standard-gpu.2.1905 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 27 additions & 5 deletions
32
.../t8s-cluster/templates/management-cluster/clusterClass/kubeadmConfigTemplate/_helpers.tpl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
...tes/management-cluster/clusterClass/kubeadmConfigTemplate/_kubeadmConfigTemplateSpec.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
{{- define "t8s-cluster.clusterClass.kubeadmConfigTemplate.spec" -}} | ||
{{- $_ := set . "Values" .context.Values -}} | ||
joinConfiguration: | ||
nodeRegistration: | ||
kubeletExtraArgs: {{- include "t8s-cluster.clusterClass.kubeletExtraArgs" .context | nindent 6 }} | ||
name: '{{ `{{ local_hostname }}` }}' | ||
patches: | ||
directory: /etc/kubernetes/patches | ||
files: {{- include "t8s-cluster.patches.kubelet.patches" .context | nindent 2 }} | ||
{{- if .Values.containerRegistryProxy.proxyRegistryEndpoint }} | ||
{{- include "t8s-cluster.clusterClass.containerdConfig.containerRegistryProxyConfigs" (dict "context" .context) | nindent 2 }} | ||
{{- end }} | ||
- content: |- {{- include "t8s-cluster.clusterClass.containerdConfig.plugins" (dict "context" .context "gpu" .gpu) | nindent 6 }} | ||
path: /etc/containerd/conf.d/plugins.toml | ||
{{- if .Values.global.injectedCertificateAuthorities }} | ||
- content: |- {{- .Values.global.injectedCertificateAuthorities | nindent 6 }} | ||
path: /usr/local/share/ca-certificates/injected-ca-certs.crt | ||
{{- end }} | ||
{{ if .Values.global.injectedCertificateAuthorities }} | ||
preKubeadmCommands: | ||
- update-ca-certificates | ||
{{- end }} | ||
postKubeadmCommands: {{- include "t8s-cluster.clusterClass.postKubeadmCommands" (dict) | nindent 2 }} | ||
{{- end -}} |
11 changes: 11 additions & 0 deletions
11
...s/management-cluster/clusterClass/kubeadmConfigTemplate/_workerKubeadmConfigTemplate.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
{{- define "t8s-cluster.clusterClass.kubeadmConfigTemplate" -}} | ||
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 | ||
kind: KubeadmConfigTemplate | ||
metadata: | ||
name: {{ printf "%s-%s-worker" .context.Release.Name (.gpu | ternary "gpu" "standard") }} | ||
namespace: {{ .context.Release.Namespace }} | ||
labels: {{- include "common.labels.standard" .context | nindent 4 }} | ||
spec: | ||
template: | ||
spec: {{- include "t8s-cluster.clusterClass.kubeadmConfigTemplate.spec" (dict "gpu" .gpu "context" .context) | nindent 6 }} | ||
{{- end -}} |
3 changes: 3 additions & 0 deletions
3
...management-cluster/clusterClass/kubeadmConfigTemplate/gpuWorkerKubeadmConfigTemplate.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{{- if eq (include "t8s-cluster.hasGPUNodes" .) "true" }} | ||
{{- include "t8s-cluster.clusterClass.kubeadmConfigTemplate" (dict "gpu" true "context" $) -}} | ||
{{- end }} |
28 changes: 0 additions & 28 deletions
28
...emplates/management-cluster/clusterClass/kubeadmConfigTemplate/kubeadmConfigTemplate.yaml
This file was deleted.
Oops, something went wrong.
9 changes: 9 additions & 0 deletions
9
...ement-cluster/clusterClass/kubeadmConfigTemplate/standardWorkerKubeadmConfigTemplate.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
{{- $hasStandardFlavor := false -}} | ||
{{- range $name, $machineDeploymentClass := .Values.workers }} | ||
{{- if not (contains "gpu" (lower $machineDeploymentClass.flavor)) -}} | ||
{{- $hasStandardFlavor = true -}} | ||
{{- end -}} | ||
{{- end }} | ||
{{- if $hasStandardFlavor }} | ||
{{- include "t8s-cluster.clusterClass.kubeadmConfigTemplate" (dict "gpu" false "context" $) -}} | ||
{{- end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 0 additions & 9 deletions
9
charts/t8s-cluster/templates/management-cluster/repositories/cetic.yaml
This file was deleted.
Oops, something went wrong.
9 changes: 0 additions & 9 deletions
9
charts/t8s-cluster/templates/management-cluster/repositories/cloud-provider-openstack.yaml
This file was deleted.
Oops, something went wrong.
11 changes: 0 additions & 11 deletions
11
charts/t8s-cluster/templates/management-cluster/repositories/cni-cilium.yaml
This file was deleted.
Oops, something went wrong.
21 changes: 21 additions & 0 deletions
21
charts/t8s-cluster/templates/management-cluster/repositories/helmRepositories.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
{{- range $name, $config := .Values.global.helmRepositories }} | ||
{{- $create := true -}} | ||
{{- if $config.condition -}} | ||
{{- $create = eq (include "common.tplvalues.render" (dict "value" $config.condition "context" (deepCopy $))) "true" -}} | ||
{{- end -}} | ||
{{- if $create -}} | ||
apiVersion: source.toolkit.fluxcd.io/v1beta2 | ||
kind: HelmRepository | ||
metadata: | ||
name: {{ printf "%s-%s" $.Release.Name $name | quote }} | ||
namespace: {{ $.Release.Namespace }} | ||
labels: {{- include "common.labels.standard" $ | nindent 4 }} | ||
spec: | ||
interval: 5m | ||
url: {{ $config.url }} | ||
{{- if $config.url | hasPrefix "oci://" }} | ||
type: oci | ||
{{- end }} | ||
--- | ||
{{ end -}} | ||
{{- end }} |
38 changes: 38 additions & 0 deletions
38
charts/t8s-cluster/templates/workload-cluster/gpu-operator.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
{{- if eq (include "t8s-cluster.hasGPUNodes" .) "true" }} | ||
apiVersion: helm.toolkit.fluxcd.io/v2beta1 | ||
kind: HelmRelease | ||
metadata: | ||
name: {{ printf "%s-gpu-operator" .Release.Name }} | ||
namespace: {{ .Release.Namespace}} | ||
labels: {{- include "common.labels.standard" . | nindent 4 }} | ||
spec: | ||
chart: | ||
spec: {{- include "t8s-cluster.helm.chartSpec" (dict "repo" "nvidia" "chart" "gpu-operator" "context" $) | nindent 6 }} | ||
interval: 1h | ||
kubeConfig: | ||
secretRef: | ||
name: {{ .Release.Name }}-kubeconfig | ||
install: | ||
remediation: | ||
retries: -1 | ||
storageNamespace: kube-system | ||
targetNamespace: kube-system | ||
releaseName: gpu-operator | ||
values: | ||
node-feature-discovery: | ||
topologyUpdater: | ||
affinity: | ||
nodeAffinity: | ||
requiredDuringSchedulingIgnoredDuringExecution: | ||
nodeSelectorTerms: | ||
- matchExpressions: | ||
- key: node.kubernetes.io/instance-type | ||
operator: In | ||
{{- $gpuFlavours := list }} | ||
{{- range $_, $machineDeploymentClass := .Values.workers -}} | ||
{{- if contains "gpu" (lower $machineDeploymentClass.flavor) -}} | ||
{{- $gpuFlavours = append $gpuFlavours $machineDeploymentClass.flavor -}} | ||
{{- end -}} | ||
{{- end }} | ||
values: {{- $gpuFlavours | toYaml | nindent 24 }} | ||
{{- end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters