From a54108d1d60bf63512b865ad0999460728ada3b2 Mon Sep 17 00:00:00 2001 From: Chris Werner Rau Date: Mon, 11 Sep 2023 15:13:41 +0200 Subject: [PATCH] fix(t8s-cluster/workload-cluster): dependency on cni helmrelease (#550) --- .../templates/workload-cluster/cinder-csi-plugin.yaml | 2 ++ .../templates/workload-cluster/cloud-controller-manager.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/charts/t8s-cluster/templates/workload-cluster/cinder-csi-plugin.yaml b/charts/t8s-cluster/templates/workload-cluster/cinder-csi-plugin.yaml index e776a3afe..b2fd5c47f 100644 --- a/charts/t8s-cluster/templates/workload-cluster/cinder-csi-plugin.yaml +++ b/charts/t8s-cluster/templates/workload-cluster/cinder-csi-plugin.yaml @@ -14,9 +14,11 @@ spec: namespace: {{ .Release.Namespace }} version: {{ printf "2.%d.x" (.Values.version.minor | int) }} interval: 1h + {{- if eq .Values.cni "cilium" }} dependsOn: - name: {{ printf "%s-cni" .Release.Name }} namespace: {{ .Release.Namespace }} + {{- end }} kubeConfig: secretRef: name: {{ .Release.Name }}-kubeconfig diff --git a/charts/t8s-cluster/templates/workload-cluster/cloud-controller-manager.yaml b/charts/t8s-cluster/templates/workload-cluster/cloud-controller-manager.yaml index 5eb40cf93..aa7ebfa65 100644 --- a/charts/t8s-cluster/templates/workload-cluster/cloud-controller-manager.yaml +++ b/charts/t8s-cluster/templates/workload-cluster/cloud-controller-manager.yaml @@ -14,9 +14,11 @@ spec: namespace: {{ .Release.Namespace }} version: {{ printf "2.%d.x" (.Values.version.minor | int) }} interval: 1h + {{- if eq .Values.cni "cilium" }} dependsOn: - name: {{ printf "%s-cni" .Release.Name }} namespace: {{ .Release.Namespace }} + {{- end }} kubeConfig: secretRef: name: {{ .Release.Name }}-kubeconfig