fixed merged conflicts

docker/ingress-tw2019.yaml

@@ -4,8 +4,8 @@ kind: Ingress
 metadata:
   name: sailing-tw2019-master-ingress
   annotations:
-    kubernetes.io/ingress.class: "nginx"
-    nginx.ingress.kubernetes.io/app-root: /gwt/AdminConsole.html
+    kubernetes.io/ingress.class: nginx
+    kubernetes.io/tls-acme: 'true'
 spec:
   rules:
   - host: tw2019-master.ingress.fooz2kz8j4.test001.shoot.canary.k8s-hana.ondemand.com
@@ -14,6 +14,10 @@ spec:
       - backend:
           serviceName: sailing-tw2019-master-svc
           servicePort: 80
+  tls:
+  - secretName: tw2019-master-tls-cert
+    hosts:
+    - tw2019-master.ingress.fooz2kz8j4.test001.shoot.canary.k8s-hana.ondemand.com
 ---
 apiVersion: extensions/v1beta1
 kind: Ingress
@@ -24,9 +28,13 @@ metadata:
     nginx.ingress.kubernetes.io/app-root: /gwt/Home.html#/event/:eventId=0638352a-e738-4aa1-a011-e488b3195636
 spec:
   rules:
-  - host: tw2019.ingress.fooz2kz8j4.test001.shoot.canary.k8s-hana.ondemand.com
+  - host: t.ingress.fooz2kz8j4.test001.shoot.canary.k8s-hana.ondemand.com
     http:
       paths:
       - backend:
           serviceName: sailing-tw2019-svc
           servicePort: 80
+  tls:
+  - secretName: tw2019-tls-cert
+    hosts:
+    - t.ingress.fooz2kz8j4.test001.shoot.canary.k8s-hana.ondemand.com

docker/installCertManager

@@ -1,3 +1,17 @@
 #!/bin/bash
 helm install --name cert-manager stable/cert-manager --version v0.4.1 --set ingressShim.defaultIssuerName=letsencrypt-prod --set ingressShim.defaultIssuerKind=ClusterIssuer
 helm upgrade cert-manager stable/cert-manager
+cat << EOF| kubectl apply -f -
+apiVersion: certmanager.k8s.io/v1alpha1
+kind: ClusterIssuer
+metadata:
+  name: letsencrypt-prod
+spec:
+  acme:
+    #server: https://acme-v02.api.letsencrypt.org/directory
+    server: https://acme-staging-v02.api.letsencrypt.org/directory
+    email: axel.uhl@sap.com
+    privateKeySecretRef:
+      name: letsencrypt-prod
+    http01: {}
+EOF