From 82294d3cf530c944fe92dd670e009146c8bc5fc5 Mon Sep 17 00:00:00 2001 From: Aaron Riedel Date: Sun, 18 Jun 2023 05:18:02 +0200 Subject: [PATCH] fck nginx-ingress, use loadbalancer for https --- argo/ingress.yaml | 8 +------- core-deployments.yaml | 30 ------------------------------ examples/example-deployment.yaml | 6 ------ grafana/ingress.yaml | 8 +------- prometheus/ingress.yaml | 12 ------------ storage/dashboard.yaml | 8 +------- 6 files changed, 3 insertions(+), 69 deletions(-) diff --git a/argo/ingress.yaml b/argo/ingress.yaml index 1be72cb..5f1b81c 100644 --- a/argo/ingress.yaml +++ b/argo/ingress.yaml @@ -6,8 +6,6 @@ metadata: namespace: argocd annotations: kubernetes.io/ingress.class: "nginx" - cert-manager.io/cluster-issuer: letsencrypt-prod - acme.cert-manager.io/http01-edit-in-place: "true" ingress.kubernetes.io/ssl-redirect: "false" nginx.org/ssl-services: "argocd-server" spec: @@ -21,8 +19,4 @@ spec: service: name: argocd-server port: - number: 443 - tls: - - hosts: - - argo.apps.yolokube.de - secretName: argocd-cert \ No newline at end of file + number: 443 \ No newline at end of file diff --git a/core-deployments.yaml b/core-deployments.yaml index 6dd69b0..d47ef9b 100644 --- a/core-deployments.yaml +++ b/core-deployments.yaml @@ -52,36 +52,6 @@ spec: --- apiVersion: argoproj.io/v1alpha1 kind: Application -metadata: - name: certbot - namespace: argocd -spec: - project: default - sources: - - chart: cert-manager - repoURL: https://charts.jetstack.io - targetRevision: v1.11.0 - helm: - releaseName: certbot - parameters: - - name: "installCRDs" - value: "true" - - repoURL: https://git.ar21.de/yolokube/core-deployments.git - targetRevision: HEAD - path: certbot - destination: - server: https://kubernetes.default.svc - namespace: cert-manager - syncPolicy: - syncOptions: - - CreateNamespace=true - - automated: - selfHeal: false - prune: true ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application metadata: name: rook namespace: argocd diff --git a/examples/example-deployment.yaml b/examples/example-deployment.yaml index 90f0076..18b9439 100644 --- a/examples/example-deployment.yaml +++ b/examples/example-deployment.yaml @@ -69,8 +69,6 @@ metadata: namespace: example annotations: spec.ingressClassName: "nginx" - cert-manager.io/cluster-issuer: letsencrypt-prod - acme.cert-manager.io/http01-edit-in-place: "false" ingress.kubernetes.io/ssl-redirect: "false" # Use for Basic auth: #nginx.org/basic-auth-secret: example-basic-auth-secret @@ -88,10 +86,6 @@ spec: name: example-service port: number: 80 - tls: - - hosts: - - example.apps.yolokube.de - secretName: example-cert # Use for Basic auth: #--- #kind: Secret diff --git a/grafana/ingress.yaml b/grafana/ingress.yaml index 2c2d109..ac4c83c 100644 --- a/grafana/ingress.yaml +++ b/grafana/ingress.yaml @@ -6,8 +6,6 @@ metadata: namespace: grafana annotations: kubernetes.io/ingress.class: "nginx" - cert-manager.io/cluster-issuer: letsencrypt-prod - acme.cert-manager.io/http01-edit-in-place: "true" ingress.kubernetes.io/ssl-redirect: "false" #nginx.org/ssl-services: "grafana" spec: @@ -21,8 +19,4 @@ spec: service: name: grafana port: - number: 80 - tls: - - hosts: - - grafana.apps.yolokube.de - secretName: grafana-cert \ No newline at end of file + number: 80 \ No newline at end of file diff --git a/prometheus/ingress.yaml b/prometheus/ingress.yaml index 22ecb42..b21162e 100644 --- a/prometheus/ingress.yaml +++ b/prometheus/ingress.yaml @@ -6,8 +6,6 @@ metadata: namespace: prometheus annotations: kubernetes.io/ingress.class: "nginx" - cert-manager.io/cluster-issuer: letsencrypt-staging - acme.cert-manager.io/http01-edit-in-place: "false" ingress.kubernetes.io/ssl-redirect: "false" nginx.org/basic-auth-secret: prometheus-basic-auth-secret #nginx.org/ssl-services: "prometheus-server" @@ -23,10 +21,6 @@ spec: name: prometheus-server port: number: 80 - tls: - - hosts: - - prometheus.apps.yolokube.de - secretName: prometheus-cert --- apiVersion: networking.k8s.io/v1 kind: Ingress @@ -35,8 +29,6 @@ metadata: namespace: prometheus annotations: kubernetes.io/ingress.class: "nginx" - cert-manager.io/cluster-issuer: letsencrypt-staging - acme.cert-manager.io/http01-edit-in-place: "false" ingress.kubernetes.io/ssl-redirect: "false" nginx.org/basic-auth-secret: prometheus-basic-auth-secret #nginx.org/ssl-services: "prometheus-server" @@ -52,10 +44,6 @@ spec: name: prometheus-alertmanager port: number: 9093 - tls: - - hosts: - - alertmanager.apps.yolokube.de - secretName: alertmanager-cert --- kind: Secret metadata: diff --git a/storage/dashboard.yaml b/storage/dashboard.yaml index 2a69ff5..868c453 100644 --- a/storage/dashboard.yaml +++ b/storage/dashboard.yaml @@ -6,8 +6,6 @@ metadata: namespace: rook-ceph annotations: kubernetes.io/ingress.class: "nginx" - cert-manager.io/cluster-issuer: letsencrypt-prod - acme.cert-manager.io/http01-edit-in-place: "true" ingress.kubernetes.io/ssl-redirect: "false" spec: rules: @@ -20,8 +18,4 @@ spec: service: name: rook-ceph-mgr-dashboard port: - number: 80 - tls: - - hosts: - - rook.apps.yolokube.de - secretName: rook-dashboard-cert \ No newline at end of file + number: 80 \ No newline at end of file