Merge pull request #1724 from cheukwing/issue-1608

Add solvers fields in Let's Encrypt/nginx quick start guide
2019-06-05 14:10:40 +01:00 · 2019-06-05 14:10:40 +01:00 · 72813494c4
commit 72813494c4
parent bb0f479638 79109cb9a0
6 changed files with 13 additions and 21 deletions
--- a/docs/tutorials/acme/quick-start/example/ingress-tls-final.yaml
+++ b/docs/tutorials/acme/quick-start/example/ingress-tls-final.yaml
@ -5,7 +5,6 @@ metadata:
  annotations:
    kubernetes.io/ingress.class: "nginx"    
    certmanager.k8s.io/issuer: "letsencrypt-prod"
-    certmanager.k8s.io/acme-challenge-type: http01

 spec:
  tls:
--- a/docs/tutorials/acme/quick-start/example/ingress-tls.yaml
+++ b/docs/tutorials/acme/quick-start/example/ingress-tls.yaml
@ -5,7 +5,6 @@ metadata:
  annotations:
    kubernetes.io/ingress.class: "nginx"    
    certmanager.k8s.io/issuer: "letsencrypt-staging"
-    certmanager.k8s.io/acme-challenge-type: http01

 spec:
  tls:
--- a/docs/tutorials/acme/quick-start/example/ingress.yaml
+++ b/docs/tutorials/acme/quick-start/example/ingress.yaml
@ -5,7 +5,6 @@ metadata:
  annotations:
    kubernetes.io/ingress.class: "nginx"    
    #certmanager.k8s.io/issuer: "letsencrypt-staging"
-    #certmanager.k8s.io/acme-challenge-type: http01

 spec:
  tls:
--- a/docs/tutorials/acme/quick-start/example/production-issuer.yaml
+++ b/docs/tutorials/acme/quick-start/example/production-issuer.yaml
@ -12,4 +12,7 @@
       privateKeySecretRef:
         name: letsencrypt-prod
       # Enable the HTTP-01 challenge provider
-       http01: {}
+       solvers:
+       - http01:
+           ingress:
+             class: nginx
--- a/docs/tutorials/acme/quick-start/example/staging-issuer.yaml
+++ b/docs/tutorials/acme/quick-start/example/staging-issuer.yaml
@ -12,4 +12,7 @@
       privateKeySecretRef:
         name: letsencrypt-staging
       # Enable the HTTP-01 challenge provider
-       http01: {}
+       solvers:
+       - http01:
+           ingress:
+             class:  nginx
--- a/docs/tutorials/acme/quick-start/index.rst
+++ b/docs/tutorials/acme/quick-start/index.rst
@ -550,11 +550,14 @@ Check on the status of the issuer after you create it:
    Spec:
      Acme:
        Email:  your.email@your-domain.com
-        Http 01:
        Private Key Secret Ref:
          Key:
          Name:  letsencrypt-staging
        Server:  https://acme-staging-v02.api.letsencrypt.org/directory
+        Solvers:
+          Http 01:
+            Ingress:
+              Class:  nginx
    Status:
      Acme:
        Uri:  https://acme-staging-v02.api.letsencrypt.org/acme/acct/7374163
@ -647,13 +650,6 @@ certificate object. You can view this information using the
      Self Link:               /apis/certmanager.k8s.io/v1alpha1/namespaces/default/certificates/quickstart-example-tls
      UID:                     68d43400-ea92-11e8-82f8-42010a8a00b5
    Spec:
-      Acme:
-        Config:
-          Domains:
-            example.your-domain.com
-          Http 01:
-            Ingress:
-            Ingress Class:  nginx
      Dns Names:
        example.your-domain.com
      Issuer Ref:
@ -763,13 +759,6 @@ certificate.
      Self Link:               /apis/certmanager.k8s.io/v1alpha1/namespaces/default/certificates/quickstart-example-tls
      UID:                     bdd93b32-ea97-11e8-82f8-42010a8a00b5
    Spec:
-      Acme:
-        Config:
-          Domains:
-            example.your-domain.com
-          Http 01:
-            Ingress:
-            Ingress Class:  nginx
      Dns Names:
        example.your-domain.com
      Issuer Ref:
@ -785,7 +774,7 @@ certificate.
        Type:                  Ready
    Events:
      Type    Reason        Age   From          Message
-      ----    ------        ----  ----          -------
+   kubectl describe certificate quickstart-example-tls   ----    ------        ----  ----          -------
      Normal  Generated     18s   cert-manager  Generated new private key
      Normal  OrderCreated  18s   cert-manager  Created Order resource "quickstart-example-tls-889745041"