diff --git a/examples/example-deployment.yaml b/examples/example-deployment.yaml index 4598ab5..90f0076 100644 --- a/examples/example-deployment.yaml +++ b/examples/example-deployment.yaml @@ -68,10 +68,12 @@ metadata: name: example-ingress namespace: example annotations: - kubernetes.io/ingress.class: "nginx" + spec.ingressClassName: "nginx" cert-manager.io/cluster-issuer: letsencrypt-prod - acme.cert-manager.io/http01-edit-in-place: "true" + 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 # Use the following annotation if the backend only speaks HTTPS (fill out the service name accordingly): #nginx.org/ssl-services: "example-service" spec: @@ -89,4 +91,15 @@ spec: tls: - hosts: - example.apps.yolokube.de - secretName: example-cert \ No newline at end of file + secretName: example-cert +# Use for Basic auth: +#--- +#kind: Secret +#metadata: +# name: example-basic-auth-secret +# namespace: example +#apiVersion: v1 +#type: nginx.org/htpasswd +#stringData: +# htpasswd: | +#test:$apr1$2XMU6EMv$f1MJ7zxqTS079YsB7Z.CX/ \ No newline at end of file diff --git a/prometheus/ingress.yaml b/prometheus/ingress.yaml index dec45c2..63b3ca0 100644 --- a/prometheus/ingress.yaml +++ b/prometheus/ingress.yaml @@ -7,12 +7,8 @@ metadata: annotations: kubernetes.io/ingress.class: "nginx" cert-manager.io/cluster-issuer: letsencrypt-prod - acme.cert-manager.io/http01-edit-in-place: "true" + acme.cert-manager.io/http01-edit-in-place: "false" ingress.kubernetes.io/ssl-redirect: "false" - nginx.org/server-snippets: | - location ~ /.well-known/acme-challenge/(.*) { - auth_basic off; - } nginx.org/basic-auth-secret: prometheus-basic-auth-secret #nginx.org/ssl-services: "prometheus-server" spec: @@ -40,12 +36,8 @@ metadata: annotations: kubernetes.io/ingress.class: "nginx" cert-manager.io/cluster-issuer: letsencrypt-prod - acme.cert-manager.io/http01-edit-in-place: "true" + acme.cert-manager.io/http01-edit-in-place: "false" ingress.kubernetes.io/ssl-redirect: "false" - nginx.org/server-snippets: | - location ~ /.well-known/acme-challenge/(.*) { - auth_basic off; - } nginx.org/basic-auth-secret: prometheus-basic-auth-secret #nginx.org/ssl-services: "prometheus-server" spec: