From 449417e91d400032708d259f11d1df211d7fadfb Mon Sep 17 00:00:00 2001 From: Paul Walko Date: Sat, 21 Nov 2020 11:39:48 -0500 Subject: [PATCH] remove https/cert stuff --- fogcutter/k8s/cert-manager.yml | 4 ---- fogcutter/k8s/haproxy.yml | 3 +-- fogcutter/k8s/ingress.yml | 44 ++-------------------------------- 3 files changed, 3 insertions(+), 48 deletions(-) delete mode 100644 fogcutter/k8s/cert-manager.yml diff --git a/fogcutter/k8s/cert-manager.yml b/fogcutter/k8s/cert-manager.yml deleted file mode 100644 index 9005678..0000000 --- a/fogcutter/k8s/cert-manager.yml +++ /dev/null @@ -1,4 +0,0 @@ -# helm create namespace cert-manager -# helm repo add jetstack https://charts.jetstack.io && helm repo update -# helm install cert-manager jetstack/cert-manager --namespace cert-manager --version v1.0.3 -f cert-manager.yml -installCRDs: true diff --git a/fogcutter/k8s/haproxy.yml b/fogcutter/k8s/haproxy.yml index d2c7264..e617866 100644 --- a/fogcutter/k8s/haproxy.yml +++ b/fogcutter/k8s/haproxy.yml @@ -13,10 +13,9 @@ controller: type: NodePort nodePorts: http: 30080 - https: 30443 enablePorts: http: true - https: true + https: false stat: true ssh: true minecraft: true diff --git a/fogcutter/k8s/ingress.yml b/fogcutter/k8s/ingress.yml index 02487d4..1484643 100644 --- a/fogcutter/k8s/ingress.yml +++ b/fogcutter/k8s/ingress.yml @@ -3,9 +3,8 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: annotations: - # set to false if doing letsencrypt validation - ingress.kubernetes.io/ssl-redirect: "true" - cert-manager.io/cluster-issuer: letsencrypt-prod + # redirection is handled at upper haproxy layer + ingress.kubernetes.io/ssl-redirect: "false" name: haproxy-ingress namespace: pew spec: @@ -70,42 +69,3 @@ spec: name: plex port: number: 32400 - tls: - - secretName: pew-cert - hosts: - - seaturtle.pw - - airsonic.seaturtle.pw - - git.seaturtle.pw - - nc.seaturtle.pw - - plex.seaturtle.pw - - paul.walko.org - ---- -apiVersion: cert-manager.io/v1alpha2 -kind: ClusterIssuer -metadata: - name: letsencrypt-staging -spec: - acme: - email: paulsw.pw@gmail.com - server: https://acme-staging-v02.api.letsencrypt.org/directory - privateKeySecretRef: - name: pew-account-key - solvers: - - http01: - ingress: {} - ---- -apiVersion: cert-manager.io/v1alpha2 -kind: ClusterIssuer -metadata: - name: letsencrypt-prod -spec: - acme: - email: paulsw.pw@gmail.com - server: https://acme-v02.api.letsencrypt.org/directory - privateKeySecretRef: - name: pew-account-key - solvers: - - http01: - ingress: {}