From f6598e68f6f8c1013d9d07316f13e8797ac6a540 Mon Sep 17 00:00:00 2001 From: jerger Date: Fri, 18 Mar 2022 13:12:54 +0100 Subject: [PATCH] traefic ingres proxy --- src/main/cljc/dda/c4k_nextcloud/core.cljc | 4 ---- src/main/resources/nextcloud/ingress.yaml | 12 ++++++------ .../cljc/dda/c4k_nextcloud/nextcloud_test.cljc | 15 +++++++-------- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/main/cljc/dda/c4k_nextcloud/core.cljc b/src/main/cljc/dda/c4k_nextcloud/core.cljc index 374cb2a..7616fc4 100644 --- a/src/main/cljc/dda/c4k_nextcloud/core.cljc +++ b/src/main/cljc/dda/c4k_nextcloud/core.cljc @@ -11,15 +11,11 @@ (def config-defaults {:issuer :staging}) - - (def auth? (s/keys :req-un [::postgres/postgres-db-user ::postgres/postgres-db-password ::nextcloud/nextcloud-admin-user ::nextcloud/nextcloud-admin-password ::aws-access-key-id ::aws-secret-access-key ::restic-password])) - - (defn-spec k8s-objects any? [config (s/merge nextcloud/config? auth?)] (let [storage-class (if (contains? config :postgres-data-volume-path) :manual :local-path)] diff --git a/src/main/resources/nextcloud/ingress.yaml b/src/main/resources/nextcloud/ingress.yaml index 5122631..866f143 100644 --- a/src/main/resources/nextcloud/ingress.yaml +++ b/src/main/resources/nextcloud/ingress.yaml @@ -4,12 +4,12 @@ metadata: name: ingress-cloud annotations: cert-manager.io/cluster-issuer: letsencrypt-staging-issuer - nginx.ingress.kubernetes.io/proxy-body-size: "256m" - nginx.ingress.kubernetes.io/ssl-redirect: "true" - nginx.ingress.kubernetes.io/rewrite-target: / - nginx.ingress.kubernetes.io/proxy-connect-timeout: "300" - nginx.ingress.kubernetes.io/proxy-send-timeout: "300" - nginx.ingress.kubernetes.io/proxy-read-timeout: "300" + ingress.kubernetes.io/proxy-body-size: "256m" + ingress.kubernetes.io/ssl-redirect: "true" + ingress.kubernetes.io/rewrite-target: / + ingress.kubernetes.io/proxy-connect-timeout: "300" + ingress.kubernetes.io/proxy-send-timeout: "300" + ingress.kubernetes.io/proxy-read-timeout: "300" namespace: default spec: tls: diff --git a/src/test/cljc/dda/c4k_nextcloud/nextcloud_test.cljc b/src/test/cljc/dda/c4k_nextcloud/nextcloud_test.cljc index ab5926c..1c92aa9 100644 --- a/src/test/cljc/dda/c4k_nextcloud/nextcloud_test.cljc +++ b/src/test/cljc/dda/c4k_nextcloud/nextcloud_test.cljc @@ -33,14 +33,13 @@ :metadata {:name "ingress-cloud" :annotations - {:cert-manager.io/cluster-issuer - "letsencrypt-staging-issuer" - :nginx.ingress.kubernetes.io/proxy-body-size "256m" - :nginx.ingress.kubernetes.io/ssl-redirect "true" - :nginx.ingress.kubernetes.io/rewrite-target "/" - :nginx.ingress.kubernetes.io/proxy-connect-timeout "300" - :nginx.ingress.kubernetes.io/proxy-send-timeout "300" - :nginx.ingress.kubernetes.io/proxy-read-timeout "300"} + {:cert-manager.io/cluster-issuer "letsencrypt-staging-issuer" + :ingress.kubernetes.io/proxy-body-size "256m" + :ingress.kubernetes.io/ssl-redirect "true" + :ingress.kubernetes.io/rewrite-target "/" + :ingress.kubernetes.io/proxy-connect-timeout "300" + :ingress.kubernetes.io/proxy-send-timeout "300" + :ingress.kubernetes.io/proxy-read-timeout "300"} :namespace "default"} :spec {:tls [{:hosts ["xx"], :secretName "cloud-secret"}]