Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(t8s-cluster/workload-cluster): latch onto legacy cni when used #1039

Merged
merged 1 commit into from
Jul 18, 2024
Merged

feat(t8s-cluster/workload-cluster): latch onto legacy cni when used #1039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions charts/t8s-cluster/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,15 @@
{{- end -}}
{{- $hasGPUFlavor | ternary true "" -}}
{{- end -}}

{{- define "t8s-cluster.cni" -}}
{{- if eq .Values.cni "auto" -}}
{{- if lookup "kustomize.toolkit.fluxcd.io/v1" "Kustomization" .Release.Namespace (printf "%s-cni" .Release.Name) -}}
calico
{{- else -}}
cilium
{{- end -}}
{{- else -}}
{{- .Values.cni -}}
{{- end -}}
{{- end -}}
2 changes: 1 addition & 1 deletion charts/t8s-cluster/templates/management-cluster/repositories/cni-calico.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if eq .Values.cni "calico" }}
{{- if eq (include "t8s-cluster.cni" .) "calico" }}
apiVersion: source.toolkit.fluxcd.io/v1
kind: GitRepository
metadata:
Expand Down
2 changes: 1 addition & 1 deletion charts/t8s-cluster/templates/workload-cluster/cinder-csi-plugin.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
interval: 1h
driftDetection:
mode: enabled
{{- if eq .Values.cni "cilium" }}
{{- if eq (include "t8s-cluster.cni" .) "cilium" }}
dependsOn:
- name: {{ printf "%s-cni" .Release.Name }}
namespace: {{ .Release.Namespace }}
Expand Down
2 changes: 1 addition & 1 deletion charts/t8s-cluster/templates/workload-cluster/cloud-controller-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
interval: 1h
driftDetection:
mode: enabled
{{- if eq .Values.cni "cilium" }}
{{- if eq (include "t8s-cluster.cni" .) "cilium" }}
dependsOn:
- name: {{ printf "%s-cni" .Release.Name }}
namespace: {{ .Release.Namespace }}
Expand Down
2 changes: 1 addition & 1 deletion charts/t8s-cluster/templates/workload-cluster/cni-calico.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if eq .Values.cni "calico" }}
{{- if eq (include "t8s-cluster.cni" .) "calico" }}
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
Expand Down
2 changes: 1 addition & 1 deletion charts/t8s-cluster/templates/workload-cluster/cni-cilium.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if eq .Values.cni "cilium" }}
{{- if eq (include "t8s-cluster.cni" .) "cilium" }}
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
Expand Down
2 changes: 1 addition & 1 deletion charts/t8s-cluster/templates/workload-cluster/pre-install/uninstall-cni.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{{- if eq .Values.cni "cilium" -}}
{{- if eq (include "t8s-cluster.cni" .) "cilium" -}}
{{ include "t8s-cluster.workload.uninstall-job" (dict "name" "cni" "context" . "clusterResourceSet" "cni") }}
{{- end -}}
2 changes: 2 additions & 0 deletions charts/t8s-cluster/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,10 @@
},
"cni": {
"type": "string",
"description": "The CNI plugin to use. `auto` means to keep the current one or use cilium for a new cluster.",
"enum": [
"cilium",
"auto",
"calico"
]
},
Expand Down
2 changes: 1 addition & 1 deletion charts/t8s-cluster/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,6 @@ containerRegistryMirror:

sshKeyName: null

cni: cilium
cni: auto

openstackImageNamePrefix: ""