diff --git a/scripts/create-namespaces.sh b/scripts/create-namespaces.sh index 21a9139..7706fa8 100755 --- a/scripts/create-namespaces.sh +++ b/scripts/create-namespaces.sh @@ -1,5 +1,8 @@ #!/bin/bash +# Install the CustomResourceDefinition resources separately +kubectl apply -f https://raw.githubusercontent.com/jetstack/cert-manager/release-0.10/deploy/manifests/00-crds.yaml + kubectl apply -f https://raw.githubusercontent.com/openfaas/faas-netes/master/namespaces.yml # Create the namespace for cert-manager diff --git a/scripts/install-cert-manager.sh b/scripts/install-cert-manager.sh index 4f647c6..f39db9b 100755 --- a/scripts/install-cert-manager.sh +++ b/scripts/install-cert-manager.sh @@ -1,6 +1,3 @@ -# Install the CustomResourceDefinition resources separately -kubectl apply -f https://raw.githubusercontent.com/jetstack/cert-manager/release-0.10/deploy/manifests/00-crds.yaml - # Add the Jetstack Helm repository helm repo add jetstack https://charts.jetstack.io diff --git a/templates/k8s/ingress-auth.yml b/templates/k8s/ingress-auth.yml index 87f8a6f..8ca5f7a 100644 --- a/templates/k8s/ingress-auth.yml +++ b/templates/k8s/ingress-auth.yml @@ -5,10 +5,6 @@ metadata: name: openfaas-auth-ingress namespace: openfaas annotations: - {{ if .TLS }} - certmanager.k8s.io/cluster-issuer: letsencrypt-{{.IssuerType}} - kubernetes.io/tls-acme: "true" - {{ end }} kubernetes.io/ingress.class: "nginx" nginx.ingress.kubernetes.io/limit-connections: "20" nginx.ingress.kubernetes.io/limit-rpm: "600" diff --git a/templates/k8s/ingress-wildcard.yml b/templates/k8s/ingress-wildcard.yml index 5eecb8b..356dc55 100644 --- a/templates/k8s/ingress-wildcard.yml +++ b/templates/k8s/ingress-wildcard.yml @@ -5,10 +5,6 @@ metadata: name: openfaas-ingress namespace: openfaas annotations: - {{ if .TLS }} - certmanager.k8s.io/cluster-issuer: letsencrypt-{{.IssuerType}} - kubernetes.io/tls-acme: "true" - {{ end }} kubernetes.io/ingress.class: "nginx" nginx.ingress.kubernetes.io/limit-connections: "20" nginx.ingress.kubernetes.io/limit-rpm: "600"