change vcluster plugin order

loft-sh · Oct 26, 2023 · a7d992d · a7d992d
1 parent 97b4074
commit a7d992d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/charts/eks/templates/_helpers.tpl b/charts/eks/templates/_helpers.tpl
@@ -189,9 +189,6 @@ Corefile: |-
       health
       ready
       rewrite name regex .*\.nodes\.vcluster\.com kubernetes.default.svc.cluster.local
-      {{- if and .Values.coredns.integrated .Values.coredns.plugin.enabled }}
-      vcluster {{ toYaml .Values.coredns.plugin.config | b64enc }}
-      {{- end }}
       kubernetes cluster.local in-addr.arpa ip6.arpa {
           {{- if .Values.pro }}
           {{- if .Values.coredns.integrated }}
@@ -205,6 +202,9 @@ Corefile: |-
           fallthrough in-addr.arpa ip6.arpa
           {{- end }}
       }
+      {{- if and .Values.coredns.integrated .Values.coredns.plugin.enabled }}
+      vcluster {{ toYaml .Values.coredns.plugin.config | b64enc }}
+      {{- end }}
       hosts /etc/NodeHosts {
           ttl 60
           reload 15s

diff --git a/charts/k0s/templates/_helpers.tpl b/charts/k0s/templates/_helpers.tpl
@@ -189,9 +189,6 @@ Corefile: |-
       health
       ready
       rewrite name regex .*\.nodes\.vcluster\.com kubernetes.default.svc.cluster.local
-      {{- if and .Values.coredns.integrated .Values.coredns.plugin.enabled }}
-      vcluster {{ toYaml .Values.coredns.plugin.config | b64enc }}
-      {{- end }}
       kubernetes cluster.local in-addr.arpa ip6.arpa {
           {{- if .Values.pro }}
           {{- if .Values.coredns.integrated }}
@@ -205,6 +202,9 @@ Corefile: |-
           fallthrough in-addr.arpa ip6.arpa
           {{- end }}
       }
+      {{- if and .Values.coredns.integrated .Values.coredns.plugin.enabled }}
+      vcluster {{ toYaml .Values.coredns.plugin.config | b64enc }}
+      {{- end }}
       hosts /etc/NodeHosts {
           ttl 60
           reload 15s

diff --git a/charts/k3s/templates/_helpers.tpl b/charts/k3s/templates/_helpers.tpl
@@ -189,22 +189,22 @@ Corefile: |-
       health
       ready
       rewrite name regex .*\.nodes\.vcluster\.com kubernetes.default.svc.cluster.local
-      {{- if and .Values.coredns.integrated .Values.coredns.plugin.enabled }}
-      vcluster {{ toYaml .Values.coredns.plugin.config | b64enc }}
-      {{- end }}
       kubernetes cluster.local in-addr.arpa ip6.arpa {
           {{- if .Values.pro }}
           {{- if .Values.coredns.integrated }}
           kubeconfig /data/k3s-config/kube-config.yaml
           {{- end }}
           {{- end }}
           pods insecure
-          {{- if .Values.fallbackHostDns }}
-          fallthrough cluster.local in-addr.arpa ip6.arpa
+          {{- if or (.Values.fallbackHostDns) (and .Values.coredns.integrated .Values.coredns.plugin.enabled) }}
+          fallthrough cluster.local in-addr.arpa ip6.arpa 
           {{- else }}
           fallthrough in-addr.arpa ip6.arpa
           {{- end }}
       }
+      {{- if and .Values.coredns.integrated .Values.coredns.plugin.enabled }}
+      vcluster {{ toYaml .Values.coredns.plugin.config | b64enc }}
+      {{- end }}
       hosts /etc/NodeHosts {
           ttl 60
           reload 15s

diff --git a/charts/k8s/templates/_helpers.tpl b/charts/k8s/templates/_helpers.tpl
@@ -189,9 +189,6 @@ Corefile: |-
       health
       ready
       rewrite name regex .*\.nodes\.vcluster\.com kubernetes.default.svc.cluster.local
-      {{- if and .Values.coredns.integrated .Values.coredns.plugin.enabled }}
-      vcluster {{ toYaml .Values.coredns.plugin.config | b64enc }}
-      {{- end }}
       kubernetes cluster.local in-addr.arpa ip6.arpa {
           {{- if .Values.pro }}
           {{- if .Values.coredns.integrated }}
@@ -205,6 +202,9 @@ Corefile: |-
           fallthrough in-addr.arpa ip6.arpa
           {{- end }}
       }
+      {{- if and .Values.coredns.integrated .Values.coredns.plugin.enabled }}
+      vcluster {{ toYaml .Values.coredns.plugin.config | b64enc }}
+      {{- end }}
       hosts /etc/NodeHosts {
           ttl 60
           reload 15s