TLS certs working

kubernetes/reverse-proxy/Ingress.yaml

@@ -15,7 +15,7 @@
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  name: nginx-ingress
+  name: nginx-ingress-prod
   namespace: jenkins
   annotations:
     # static IP assignment not working. Not sure why.
@@ -24,15 +24,6 @@ metadata:
     cert-manager.io/issuer: "letsencrypt-prod"
 spec:
   tls:
-  # -- staging ------------------  
-  # - secretName: results-staging-tls
-  #   hosts:
-  #   - results.staging.llvm-merge-guard.org
-  # - secretName: results-staging-tls
-  #   hosts:
-  #   - jenkins.staging.llvm-merge-guard.org
-
-  # -- prod ------------------  
   - secretName: results-prod-tls
     hosts:
     - results.llvm-merge-guard.org
@@ -41,7 +32,6 @@ spec:
     - jenkins.llvm-merge-guard.org
 
   rules:
-  # -- prod ------------------  
   - host: results.llvm-merge-guard.org
     http:
       paths:
@@ -55,16 +45,38 @@ spec:
           serviceName: jenkins-ui
           servicePort: 8080
 
-  # -- staging ------------------  
+---
-  # - host: jenkins.staging.llvm-merge-guard.org
+apiVersion: extensions/v1beta1
-  #   http:
+kind: Ingress
-  #     paths:
+metadata:
-  #     - backend:
+  name: nginx-ingress-staging
-  #         serviceName: jenkins-ui
+  namespace: jenkins
-  #         servicePort: 8080
+  annotations:
-  # - host: results.staging.llvm-merge-guard.org
+    # static IP assignment not working. Not sure why.
-  #   http:
+    kubernetes.io/ingress.global-static-ip-name: "web-static-ip"
-  #     paths:
+    kubernetes.io/ingress.class: "nginx"    
-  #     - backend:
+    cert-manager.io/issuer: "letsencrypt-staging"
-  #         serviceName: nginx-results
+spec:
-  #         servicePort: 80
+  tls:
+  - secretName: results-staging-tls
+    hosts:
+    - results.staging.llvm-merge-guard.org
+  - secretName: results-staging-tls
+    hosts:
+    - jenkins.staging.llvm-merge-guard.org
+
+  rules:
+  - host: jenkins.staging.llvm-merge-guard.org
+    http:
+      paths:
+      - backend:
+          serviceName: jenkins-ui
+          servicePort: 8080
+  - host: results.staging.llvm-merge-guard.org
+    http:
+      paths:
+      - backend:
+          serviceName: nginx-results
+          servicePort: 80
+
+---

kubernetes/reverse-proxy/kustomization.yaml

@@ -0,0 +1,22 @@
+# Copyright 2019 Google LLC
+#
+# Licensed under the the Apache License v2.0 with LLVM Exceptions (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://llvm.org/LICENSE.txt
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: jenkins
+resources:
+  - Issuer.yaml
+  - Certificates.yaml
+  - Ingress.yaml
+