diff --git a/infrastructure/controllers/ingress-nginx.yaml b/infrastructure/controllers/ingress-nginx.yaml deleted file mode 100644 index 60d386f..0000000 --- a/infrastructure/controllers/ingress-nginx.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -apiVersion: source.toolkit.fluxcd.io/v1beta2 -kind: HelmRepository -metadata: - name: ingress-nginx - namespace: futureporn -spec: - interval: 24h - url: https://kubernetes.github.io/ingress-nginx ---- -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: ingress-nginx - namespace: futureporn -spec: - interval: 30m - chart: - spec: - chart: ingress-nginx - version: "*" - sourceRef: - kind: HelmRepository - name: ingress-nginx - namespace: futureporn - interval: 12h - values: - controller: - service: - type: "LoadBalancer" - admissionWebhooks: - enabled: false diff --git a/infrastructure/controllers/ingress-traefik.yaml b/infrastructure/controllers/ingress-traefik.yaml index c370804..e4804cc 100644 --- a/infrastructure/controllers/ingress-traefik.yaml +++ b/infrastructure/controllers/ingress-traefik.yaml @@ -97,7 +97,7 @@ spec: kind: Service apiVersion: v1 metadata: - name: traefik-ingress-service + name: traefik-web-ui namespace: kube-system spec: selector: @@ -108,4 +108,20 @@ spec: name: web - protocol: TCP port: 8080 - name: admin \ No newline at end of file + name: admin + +--- +apiVersion: extensions/v1beta1 +kind: Ingress +metadata: + name: traefik-web-ui + namespace: kube-system +spec: + rules: + - host: traefik-ui.minikube + http: + paths: + - path: / + backend: + serviceName: traefik-web-ui + servicePort: web \ No newline at end of file diff --git a/infrastructure/controllers/kube-prometheus-stack.yaml b/infrastructure/controllers/kube-prometheus-stack.yaml index 0944cd7..1cdad5c 100644 --- a/infrastructure/controllers/kube-prometheus-stack.yaml +++ b/infrastructure/controllers/kube-prometheus-stack.yaml @@ -53,6 +53,7 @@ spec: storage: 40Gi grafana: service: + annotations: chisel-operator.io/exit-node-name: "grafana-exit-node" diff --git a/infrastructure/controllers/kustomization.yaml b/infrastructure/controllers/kustomization.yaml index b30ef5e..4c01500 100644 --- a/infrastructure/controllers/kustomization.yaml +++ b/infrastructure/controllers/kustomization.yaml @@ -3,8 +3,6 @@ kind: Kustomization resources: - external-dns.yaml - cert-manager.yaml - - ingress-nginx.yaml - ingress-traefik.yaml - grafana-k8s-dashboards.yaml - # - grafana.yaml # experimenting with having prometheus install grafana - kube-prometheus-stack.yaml \ No newline at end of file