Merge pull request rundeck#19 from rundeck/updatekubedeployment

Updatekubedeployment

kubernetes/README.md

@@ -119,4 +119,3 @@ kubectl delete job minio-create-bucket
 ```
 
 Note: These delete commands leave the persistent volumes and secrets in place so you can start up the environment again rather easily.
-

kubernetes/minio-deployment.yaml

@@ -1,12 +1,17 @@
 
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   # This name uniquely identifies the Deployment
-  name: minio
+  name: minio-deployment
+  labels:
+    app: minio
 spec:
   strategy:
     type: Recreate
+  selector:
+    matchLabels:
+      app: minio
   template:
     metadata:
       labels:

kubernetes/mysql-deployment.yaml

@@ -12,13 +12,18 @@ spec:
   type: LoadBalancer
 
 ---
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: mysql
+  labels:
+    app: mysql
 spec:
   strategy:
     type: Recreate
+  selector:
+    matchLabels:
+      app: mysql
   template:
     metadata:
       labels:

kubernetes/rundeckpro-deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: rudeckpro-nginx
@@ -39,13 +39,18 @@ spec:
 
 ---
 
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1 
 kind: Deployment
 metadata:
   name: rundeckpro
   namespace: default
+  labels:
+    app: rundeckpro
 spec:
   replicas: 2
+  selector:
+    matchLabels:
+      app: rundeckpro
   template:
     metadata:
       labels:
@@ -61,6 +66,9 @@ spec:
           - mountPath: /home/rundeck/etc/admin-role.aclpolicy
             name: acl
             subPath: admin-role.aclpolicy
+          - mountPath: /home/rundeck/.kube/config
+            name: kubeconfig
+            subPath: config
         env:
         - name: RUNDECK_GRAILS_URL
           value: "http://localhost"
@@ -109,6 +117,8 @@ spec:
             secretKeyRef:
               name: rundeckpro-storage-converter
               key: masterpassword
+        - name: RUNDECK_PLUGIN_CLUSTER_REMOTEEXECUTION_ENABLED
+          value: "false"
         ports:
         - containerPort: 4440
         livenessProbe:
@@ -138,4 +148,11 @@ spec:
           secretName: rundeckpro-admin-acl
           items:
           - key: admin-role.aclpolicy
-            path: admin-role.aclpolicy
+            path: admin-role.aclpolicy
+      - name: kubeconfig
+        secret:
+          secretName: kubeconfig
+          items:
+          - key: config
+            path: config
+