commit e097b0143d01e602b348c929d9e878e277775461
author James E. Blair <jeblair@redhat.com> Thu Feb 13 23:09:34 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 13 23:09:34 2020 +0000
tree 9cf4dc9748cf1e7832520994139ae28f92d4be56
parent 69c6f1469f8b51e77818ca6364d5502c27d83718
parent ef48d8e73997c5e9fa74135520df16880e73c69b

Merge "Switch to google-managed certs"

k8s/zuul.yaml

diff --git a/k8s/zuul.yaml b/k8s/zuul.yaml
index be2244c..b16739b 100644
--- a/k8s/zuul.yaml
+++ b/k8s/zuul.yaml
@@ -277,6 +277,15 @@
         requests:
           storage: 80Gi
 ---
+apiVersion: networking.gke.io/v1beta1
+kind: ManagedCertificate
+metadata:
+  name: ci-gerritcodereview-com
+  namespace: zuul
+spec:
+  domains:
+    - ci.gerritcodereview.com
+---
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
@@ -284,18 +293,13 @@
   namespace: zuul
   annotations:
     kubernetes.io/ingress.global-static-ip-name: "zuul-static-ip"
-    cert-manager.io/cluster-issuer: letsencrypt-prod
-    acme.cert-manager.io/http01-edit-in-place: "true"
+    networking.gke.io/managed-certificates: "ci-gerritcodereview-com"
 spec:
   rules:
-  - host: gerrit-zuul.inaugust.com
+  - host: ci.gerritcodereview.com
     http:
       paths:
       - backend:
           serviceName: zuul-web
           servicePort: 9000
         path: /*
-  tls:
-    - secretName: zuul-web-certs
-      hosts:
-        - gerrit-zuul.inaugust.com

zuul/zuul.conf

diff --git a/zuul/zuul.conf b/zuul/zuul.conf
index e81ad4b..31b34fc 100644
--- a/zuul/zuul.conf
+++ b/zuul/zuul.conf
@@ -11,7 +11,7 @@
 
 [web]
 listen_address=0.0.0.0
-root=https://gerrit-zuul.inaugust.com
+root=https://ci.gerritcodereview.com
 port=9000
 
 [scheduler]