set temporary urls during migration phase

google · Oct 24, 2019 · bcd7e7b · bcd7e7b
1 parent e6cdd01
commit bcd7e7b
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 58 deletions.
diff --git a/kubernetes/reverse-proxy/Certificates.yaml b/kubernetes/reverse-proxy/Certificates.yaml
@@ -44,7 +44,7 @@ metadata:
   name: results-prod-tls-cert
   namespace: cert-manager
 spec:
-  commonName: results.llvm-merge-guard.org
+  commonName: results.new.llvm-merge-guard.org
   secretName: results-prod-tls
   issuerRef:
     name: letsencrypt-prod
@@ -56,7 +56,7 @@ metadata:
   name: jenkins-prod-tls-cert
   namespace: cert-manager
 spec:
-  commonName: jenkins.llvm-merge-guard.org
+  commonName: jenkins.new.llvm-merge-guard.org
   secretName: jenkins-prod-tls
   issuerRef:
     name: letsencrypt-prod

diff --git a/kubernetes/reverse-proxy/Ingress.yaml b/kubernetes/reverse-proxy/Ingress.yaml
@@ -31,10 +31,10 @@ spec:
   tls:
   - secretName: jenkins-prod-tls
     hosts:
-    - jenkins.llvm-merge-guard.org
+    - jenkins.new.llvm-merge-guard.org
 
   rules:
-  - host: jenkins.llvm-merge-guard.org
+  - host: jenkins.new.llvm-merge-guard.org
     http:
       paths:
       - backend:
@@ -56,65 +56,65 @@ spec:
   tls:
   - secretName: results-prod-tls
     hosts:
-    - results.llvm-merge-guard.org
+    - results.new.llvm-merge-guard.org
   rules:
-  - host: results.llvm-merge-guard.org
+  - host: results.new.llvm-merge-guard.org
     http:
       paths:
       - backend:
           serviceName: nginx-results
           servicePort: 80
----
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: nginx-ingress-staging-jenkins
-  namespace: jenkins
-  annotations:
-    # static IP assignment not working. Not sure why.
-    kubernetes.io/ingress.global-static-ip-name: "web-static-ip"
-    kubernetes.io/ingress.class: "nginx"    
-    cert-manager.io/issuer: "letsencrypt-staging"
-    nginx.ingress.kubernetes.io/auth-type: basic
-    nginx.ingress.kubernetes.io/auth-secret: proxy-auth
-    nginx.ingress.kubernetes.io/auth-realm: "Authentication Required - LLVM pre-merge checks"
-    nginx.ingress.kubernetes.io/configuration-snippet: |
-        proxy_set_header Authorization $remote_user;
-spec:
-  tls:
-  - secretName: jenkins-staging-tls
-    hosts:
-    - jenkins.staging.llvm-merge-guard.org
+# ---
+# apiVersion: extensions/v1beta1
+# kind: Ingress
+# metadata:
+#   name: nginx-ingress-staging-jenkins
+#   namespace: jenkins
+#   annotations:
+#     # static IP assignment not working. Not sure why.
+#     kubernetes.io/ingress.global-static-ip-name: "web-static-ip"
+#     kubernetes.io/ingress.class: "nginx"    
+#     cert-manager.io/issuer: "letsencrypt-staging"
+#     nginx.ingress.kubernetes.io/auth-type: basic
+#     nginx.ingress.kubernetes.io/auth-secret: proxy-auth
+#     nginx.ingress.kubernetes.io/auth-realm: "Authentication Required - LLVM pre-merge checks"
+#     nginx.ingress.kubernetes.io/configuration-snippet: |
+#         proxy_set_header Authorization $remote_user;
+# spec:
+#   tls:
+#   - secretName: jenkins-staging-tls
+#     hosts:
+#     - jenkins.staging.llvm-merge-guard.org
 
-  rules:
-  - host: jenkins.staging.llvm-merge-guard.org
-    http:
-      paths:
-      - backend:
-          serviceName: jenkins-ui-staging
-          servicePort: 8080
----
+#   rules:
+#   - host: jenkins.staging.llvm-merge-guard.org
+#     http:
+#       paths:
+#       - backend:
+#           serviceName: jenkins-ui-staging
+#           servicePort: 8080
+# ---
 
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: nginx-ingress-staging-results
-  namespace: jenkins
-  annotations:
-    # static IP assignment not working. Not sure why.
-    kubernetes.io/ingress.global-static-ip-name: "web-static-ip"
-    kubernetes.io/ingress.class: "nginx"    
-    cert-manager.io/issuer: "letsencrypt-staging"
-spec:
-  tls:
-  - secretName: results-staging-tls
-    hosts:
-    - results.staging.llvm-merge-guard.org
-  rules:
-  - host: results.staging.llvm-merge-guard.org
-    http:
-      paths:
-      - backend:
-          serviceName: nginx-results
-          servicePort: 80
----
+# apiVersion: extensions/v1beta1
+# kind: Ingress
+# metadata:
+#   name: nginx-ingress-staging-results
+#   namespace: jenkins
+#   annotations:
+#     # static IP assignment not working. Not sure why.
+#     kubernetes.io/ingress.global-static-ip-name: "web-static-ip"
+#     kubernetes.io/ingress.class: "nginx"    
+#     cert-manager.io/issuer: "letsencrypt-staging"
+# spec:
+#   tls:
+#   - secretName: results-staging-tls
+#     hosts:
+#     - results.staging.llvm-merge-guard.org
+#   rules:
+#   - host: results.staging.llvm-merge-guard.org
+#     http:
+#       paths:
+#       - backend:
+#           serviceName: nginx-results
+#           servicePort: 80
+# ---