Merge pull request #26 from lambchop4prez/add-cert-manager

Adding cert manager, moving ingress-nginx to networking
lambchop4prez · Sep 26, 2023 · 7aee55d · 7aee55d
2 parents 5287d30 + e1cb78e
commit 7aee55d
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 4 deletions.
diff --git a/cluster/apps/kustomization.yaml b/cluster/apps/kustomization.yaml
@@ -1,4 +1,5 @@
+---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ingress-nginx
+  - networking
diff --git a/cluster/apps/networking/cert-manager/helm-release.yaml b/cluster/apps/networking/cert-manager/helm-release.yaml
@@ -0,0 +1,23 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: cert-manager
+  namespace: networking
+spec:
+  interval: 5m
+  chart:
+    spec:
+      # renovate: registryUrl=https://charts.jetstack.io/
+      chart: cert-manager
+      version: v1.13.0
+      sourceRef:
+        kind: HelmRepository
+        name: jetstack-charts
+        namespace: flux-system
+  values:
+    installCRDs: true
+    webhook:
+      enabled: true
+    replicaCount: 1
+    podDnsPolicy: "None"
diff --git a/cluster/apps/networking/cert-manager/kustomization.yaml b/cluster/apps/networking/cert-manager/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - helm-release.yaml
+  - vault-issuer.yaml
diff --git a/cluster/apps/ingress-nginx/helm-release.yaml → ...etworking/ingress-nginx/helm-release.yaml b/cluster/apps/ingress-nginx/helm-release.yaml → ...etworking/ingress-nginx/helm-release.yaml
@@ -32,7 +32,7 @@ spec:
           value: "${TIMEZONE}"
       service:
         annotations:
-          metallb.universe.tf/loadBalancerIPs: "${INGRESS_NGINX_ADDRESS}"
+          io.cilium/lb-ipam-ips: ["${INGRESS_NGINX_ADDRESS}"]
         externalTrafficPolicy: Cluster
       publishService:
         enabled: true

diff --git a/...ter/apps/ingress-nginx/kustomization.yaml → ...tworking/ingress-nginx/kustomization.yaml b/...ter/apps/ingress-nginx/kustomization.yaml → ...tworking/ingress-nginx/kustomization.yaml
diff --git a/cluster/apps/networking/kustomization.yaml b/cluster/apps/networking/kustomization.yaml
@@ -0,0 +1,6 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ingress-nginx
+  - cert-manager
diff --git a/cluster/base/charts/helm/jetstack-charts.yaml b/cluster/base/charts/helm/jetstack-charts.yaml
@@ -0,0 +1,10 @@
+---
+apiVersion: source.toolkit.fluxcd.io/v1beta1
+kind: HelmRepository
+metadata:
+  name: jetstack-charts
+  namespace: flux-system
+spec:
+  interval: 15m
+  url: https://charts.jetstack.io/
+  timeout: 3m
diff --git a/cluster/base/charts/helm/kustomization.yaml b/cluster/base/charts/helm/kustomization.yaml
@@ -7,6 +7,7 @@ resources:
   - grafana-charts.yaml
   - influxdata-charts.yaml
   - ingress-nginx-charts.yaml
+  - jetstack-charts.yaml
   - k8s-gateway.yaml
   - metallb-charts.yaml
   - metrics-server-charts.yaml

diff --git a/cluster/base/cluster-config.yaml b/cluster/base/cluster-config.yaml
@@ -6,8 +6,6 @@ metadata:
   namespace: flux-system
 data:
   TIMEZONE: "America/Detroit"
-  METALLB_BGP_RANGE: "10.10.100.0/24"
-  METALLB_BGP_ASN: "64512"
   BGP_ROUTER_ADDR: "10.4.1.1"
   BGP_ROUTER_ASN: "65551"
   INGRESS_NGINX_ADDRESS: "10.10.100.101"