tls updates.

vallard · Jan 3, 2020 · 4f0e8a1 · 4f0e8a1
1 parent 7528c30
commit 4f0e8a1
Show file tree

Hide file tree

Showing 3 changed files with 88 additions and 14 deletions.
diff --git a/networking/cert-manager/default-ing-prod.yaml b/networking/cert-manager/default-ing-prod.yaml
@@ -1,7 +1,3 @@
-# Please edit the object below. Lines beginning with a '#' will be ignored,
-# and an empty file will abort the edit. If an error occurs while saving this file will be
-# reopened with the relevant failures.
-#
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
@@ -14,7 +10,18 @@ spec:
   tls:
   - hosts:
     - k8s.castlerock.ai
+    - "*.k8s.castlerock.ai"
     secretName: k8s-root-tls
-  backend:
-    serviceName: default-backend
-    servicePort: 80
+  rules:
+    - host: k8s.castlerock.ai
+      http:
+        paths:
+        - backend:
+            serviceName: default-backend
+            servicePort: 80
+    - host: "*.k8s.castlerock.ai"
+      http:
+        paths:
+        - backend:
+            serviceName: default-backend
+            servicePort: 80
diff --git a/networking/cert-manager/default-ing-stag.yaml b/networking/cert-manager/default-ing-stag.yaml
@@ -1,7 +1,3 @@
-# Please edit the object below. Lines beginning with a '#' will be ignored,
-# and an empty file will abort the edit. If an error occurs while saving this file will be
-# reopened with the relevant failures.
-#
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
@@ -14,7 +10,18 @@ spec:
   tls:
   - hosts:
     - k8s.castlerock.ai
+    - "*.k8s.castlerock.ai"
     secretName: k8s-root-tls
-  backend:
-    serviceName: default-backend
-    servicePort: 80
+  rules:
+    - host: k8s.castlerock.ai
+      http:
+        paths:
+        - backend:
+            serviceName: default-backend
+            servicePort: 80
+    - host: "*.k8s.castlerock.ai"
+      http:
+        paths:
+        - backend:
+            serviceName: default-backend
+            servicePort: 80
diff --git a/networking/tls-test.yaml b/networking/tls-test.yaml
@@ -0,0 +1,60 @@
+# Please edit the object below. Lines beginning with a '#' will be ignored,
+# and an empty file will abort the edit. If an error occurs while saving this file will be
+# reopened with the relevant failures.
+#
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    run: ngx1
+  name: ngx1
+  namespace: default
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      run: ngx1
+  template:
+    metadata:
+      labels:
+        run: ngx1
+    spec:
+      containers:
+      - image: nginx
+        imagePullPolicy: Always
+        name: ngx1
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    run: ngx1
+  name: ngx1
+spec:
+  ports:
+  - port: 80
+    protocol: TCP
+    targetPort: 80
+  selector:
+    run: ngx1
+---
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  annotations:
+    cert-manager.io/issuer: letsencrypt-prod
+    kubernetes.io/ingress.class: nginx
+  name: ngx1
+  namespace: default
+spec:
+  tls:
+  - hosts:
+    - ngx1.k8s.castlerock.ai
+    secretName: ngx1-k8s-tls
+  rules:
+  - host: ngx1.k8s.castlerock.ai
+    http: 
+      paths:
+      - backend:
+          serviceName: ngx1
+          servicePort: 80