Skip to content
This repository has been archived by the owner on Feb 2, 2021. It is now read-only.

Commit

Permalink
Convert to static Certificates
Browse files Browse the repository at this point in the history
There was an issue that caused two certificates to fight with
each other - one created by Ingress shim and one by the
bootstrap as a Certificate object, for the same domain.

This patch moves away from using ingress-shim.

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
  • Loading branch information
alexellis committed Sep 6, 2019
1 parent 6d17241 commit 7d15d45
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 11 deletions.
3 changes: 3 additions & 0 deletions scripts/create-namespaces.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 0 additions & 3 deletions scripts/install-cert-manager.sh
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 0 additions & 4 deletions templates/k8s/ingress-auth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 0 additions & 4 deletions templates/k8s/ingress-wildcard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 7d15d45

Please sign in to comment.