(chore) kustomize cleanup - network

aisling136 · Apr 17, 2024 · 49d217d · 49d217d
1 parent 7f187cf
commit 49d217d
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 11 deletions.
diff --git a/cluster/network/cert-manager/values.yaml → cluster/network/cert-manager/helmvalues.yaml b/cluster/network/cert-manager/values.yaml → cluster/network/cert-manager/helmvalues.yaml
diff --git a/cluster/network/cert-manager/kustomization.yaml b/cluster/network/cert-manager/kustomization.yaml
@@ -5,7 +5,7 @@ helmCharts:
   repo: https://charts.jetstack.io
   version: v1.14.4
   releaseName: cert-manager
-  valuesFile: values.yaml
+  valuesFile: helmvalues.yaml
   namespace: network
 resources:
   - clusterissuer.yaml

diff --git a/cluster/network/cloudflared/values.yaml → cluster/network/cloudflared/helmvalues.yaml b/cluster/network/cloudflared/values.yaml → cluster/network/cloudflared/helmvalues.yaml
diff --git a/cluster/network/cloudflared/kustomization.yaml b/cluster/network/cloudflared/kustomization.yaml
@@ -5,9 +5,9 @@ helmCharts:
   repo: https://khuedoan.github.io/charts
   version: 0.4.3
   releaseName: cloudflared
-  valuesFile: values.yaml
+  valuesFile: helmvalues.yaml
   namespace: network
 generators:
-  - ./secret-generator.yaml
+  - ./secretgenerator.yaml
 resources:
   - dnsendpoint.yaml
diff --git a/...network/cloudflared/secret-generator.yaml → .../network/cloudflared/secretgenerator.yaml b/...network/cloudflared/secret-generator.yaml → .../network/cloudflared/secretgenerator.yaml
diff --git a/cluster/network/external-dns/values-pi.yaml → ...r/network/external-dns/helmvalues-pi.yaml b/cluster/network/external-dns/values-pi.yaml → ...r/network/external-dns/helmvalues-pi.yaml
@@ -18,7 +18,6 @@ extraArgs:
 interval: 5m
 triggerLoopOnEvent: true
 sources: ["ingress"]
-metrics:
+serviceMonitor:
   enabled: true
-  serviceMonitor:
-    enabled: true
+
diff --git a/cluster/network/external-dns/values.yaml → cluster/network/external-dns/helmvalues.yaml b/cluster/network/external-dns/values.yaml → cluster/network/external-dns/helmvalues.yaml
diff --git a/cluster/network/external-dns/kustomization.yaml b/cluster/network/external-dns/kustomization.yaml
@@ -5,14 +5,14 @@ helmCharts:
   repo: https://kubernetes-sigs.github.io/external-dns
   version: 1.14.4
   releaseName: external-dns
-  valuesFile: values.yaml
+  valuesFile: helmvalues.yaml
   namespace: network
 - name: external-dns
   includeCRDs: false
   repo: https://kubernetes-sigs.github.io/external-dns
   version: 1.14.4
   releaseName: external-dns-pihole
-  valuesFile: values-pi.yaml
+  valuesFile: helmvalues-pi.yaml
   namespace: network
 generators:
-- ./secret-generator.yaml
+- ./secretgenerator.yaml
diff --git a/...etwork/external-dns/secret-generator.yaml → ...network/external-dns/secretgenerator.yaml b/...etwork/external-dns/secret-generator.yaml → ...network/external-dns/secretgenerator.yaml
diff --git a/...etwork/ingress-nginx/values-external.yaml → ...rk/ingress-nginx/helmvalues-external.yaml b/...etwork/ingress-nginx/values-external.yaml → ...rk/ingress-nginx/helmvalues-external.yaml
diff --git a/cluster/network/ingress-nginx/values.yaml → ...rk/ingress-nginx/helmvalues-internal.yaml b/cluster/network/ingress-nginx/values.yaml → ...rk/ingress-nginx/helmvalues-internal.yaml
diff --git a/cluster/network/ingress-nginx/kustomization.yaml b/cluster/network/ingress-nginx/kustomization.yaml
@@ -5,12 +5,12 @@ helmCharts:
   repo: https://kubernetes.github.io/ingress-nginx
   version: 4.10.0
   releaseName: ingress-nginx
-  valuesFile: values.yaml
+  valuesFile: helmvalues-internal.yaml
   namespace: network
 - name: ingress-nginx
   includeCRDs: false
   repo: https://kubernetes.github.io/ingress-nginx
   version: 4.10.0
   releaseName: ingress-nginx-external
-  valuesFile: values-external.yaml
+  valuesFile: helmvalues-external.yaml
   namespace: network