about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@gmail.com>2016-09-20T23·32+0200
committerVincent Ambo <tazjin@gmail.com>2016-09-21T00·29+0200
commit7e12db2454ebadc5fb1f96590c58489b2b1ad9d5 (patch)
tree3011121fa796cd83662dca350352798e669e836b
parent8bc007c7f3a6217fbbb7afb8aeca3abf948ca95b (diff)
[nginx] Use Deployment resource instead of RC
-rw-r--r--nginx/nginx-svc.yaml4
-rw-r--r--nginx/nginx.yaml (renamed from nginx/nginx-rc.yaml)21
2 files changed, 13 insertions, 12 deletions
diff --git a/nginx/nginx-svc.yaml b/nginx/nginx-svc.yaml
index bdb2f2dd47ad..defe39355b68 100644
--- a/nginx/nginx-svc.yaml
+++ b/nginx/nginx-svc.yaml
@@ -5,11 +5,13 @@ metadata:
   name: nginx
   labels:
     app: nginx
+  annotations:
+    acme/certificate: "tazj.in"
 spec:
   type: LoadBalancer
   loadBalancerIP: 104.155.119.229
   selector:
-    lb-target: nginx
+    app: nginx
   ports:
     - port: 80
       name: http
diff --git a/nginx/nginx-rc.yaml b/nginx/nginx.yaml
index 65f282a2ede1..3d44e33ceb4e 100644
--- a/nginx/nginx-rc.yaml
+++ b/nginx/nginx.yaml
@@ -1,30 +1,26 @@
 ---
-apiVersion: v1
-kind: ReplicationController
+apiVersion: extensions/v1beta1
+kind: Deployment
 metadata:
-  name: nginx-v4
+  name: nginx
   labels:
     app: nginx
-    version: 1.9.12
     spec: v4
 spec:
-  replicas: 2
-  selector:
-    app: nginx
-    rcv: v4
+  replicas: 1
   template:
     metadata:
       labels:
         app: nginx
-        lb-target: nginx
-        rcv: v4
     spec:
       containers:
-        - image: nginx:1.9.11
+        - image: nginx:1.9.12
           name: nginx
           volumeMounts:
             - name: tazj-in-tls
               mountPath: /etc/nginx/ssl/tazj.in
+            - name: www-tazj-in-tls
+              mountPath: /etc/nginx/ssl/www.tazj.in
             - name: nginx-dhparam
               mountPath: /etc/nginx/ssl/dhparam
             - name: nginx-config
@@ -47,6 +43,9 @@ spec:
         - name: tazj-in-tls
           secret:
             secretName: tazj-in-tls
+        - name: www-tazj-in-tls
+          secret:
+            secretName: www-tazj-in-tls
         - name: nginx-dhparam
           secret:
             secretName: nginx-dhparam