Tidy deployment file

Author: grimbough

kubernetes/deployment.yaml

@@ -12,13 +12,6 @@ spec:
   replicas: 1
   template:
     spec:      
-      #affinity:
-      #  podAffinity:
-      #    requiredDuringSchedulingIgnoredDuringExecution:
-      #      - labelSelector:
-      #          matchLabels:
-      #            app: git-cron
-      #        topologyKey: "kubernetes.io/hostname"
     metadata:
       labels:
         app: git-repo
@@ -28,39 +21,12 @@ spec:
           image: grimbough/code.bioc-gitlist:0.1.1
           imagePullPolicy: "Always"
           volumeMounts:
-            #- mountPath: "/var/git"
-            #  name: git-repo
             - mountPath: "/var/git"
               name: git-repo-iscsi
           ports:
             - name: http
               containerPort: 8080
               protocol: TCP
-          #livenessProbe:
-          #  failureThreshold: 6
-          #  httpGet:
-          #    path: /
-          #    port: http
-          #  initialDelaySeconds: 30
-          #  timeoutSeconds: 15
-          #readinessProbe:
-          #  httpGet:
-          #    path: /
-          #    port: http
-          #  initialDelaySeconds: 30
-          #  periodSeconds: 15
-          #  timeoutSeconds: 15
-          #env:
-          #- name : DB_USER
-          #  value: xwiki
-          #- name : DB_PASSWORD
-          #  value: bj%ksFh!gdb76Dhd
-          #- name : DB_HOST
-          #  value: itswiki-postgresql
-          #- name : JAVA_OPTS
-          #  value: "-Xmx5048m -Xms5048m"
-          #- name : CATALINA_OPTS
-          #  value: "-Xmx5048m -Xms5048m"
           resources:
             limits:
               cpu: 1
@@ -72,9 +38,6 @@ spec:
         - name: git-repo-iscsi
           persistentVolumeClaim:
             claimName:  bioc-code-iscsi-pvc
-        #- name: git-repo
-        #  persistentVolumeClaim:
-        #    claimName:  bioc-code-tools-pvc
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -114,32 +77,6 @@ spec:
             - name: http
               containerPort: 8080
               protocol: TCP
-          #livenessProbe:
-          #  failureThreshold: 6
-          #  httpGet:
-          #    host: git-repo
-          #    path: /
-          #    port: http
-          #  initialDelaySeconds: 30
-          #  timeoutSeconds: 15
-          #readinessProbe:
-          #  httpGet:
-          #    path: /
-          #    port: http
-          #  initialDelaySeconds: 30
-          #  periodSeconds: 15
-          #  timeoutSeconds: 15
-          #env:
-          #- name : DB_USER
-          #  value: xwiki
-          #- name : DB_PASSWORD
-          #  value: bj%ksFh!gdb76Dhd
-          #- name : DB_HOST
-          #  value: itswiki-postgresql
-          #- name : JAVA_OPTS
-          #  value: "-Xmx5048m -Xms5048m"
-          #- name : CATALINA_OPTS
-          #  value: "-Xmx5048m -Xms5048m"
           resources:
             limits:
               cpu: 1
@@ -172,14 +109,7 @@ spec:
     metadata:
       labels:
         app: code-home
-    spec:      
-      #affinity:
-      #  podAffinity:
-      #    requiredDuringSchedulingIgnoredDuringExecution:
-      #      - labelSelector:
-      #          matchLabels:
-      #            app: git-repo
-      #        topologyKey: "kubernetes.io/hostname"
+    spec:
       containers:
         - name: code-home
           image: grimbough/code.bioc-home:0.1.1
@@ -188,35 +118,10 @@ spec:
             - name: http
               containerPort: 8080
               protocol: TCP
-          #livenessProbe:
-          #  failureThreshold: 6
-          #  httpGet:
-          #    path: /
-          #    port: http
-          #  initialDelaySeconds: 30
-          #  timeoutSeconds: 15
-          #readinessProbe:
-          #  httpGet:
-          #    path: /
-          #    port: http
-          #  initialDelaySeconds: 30
-          #  periodSeconds: 15
-          #  timeoutSeconds: 15
-          #env:
-          #- name : DB_USER
-          #  value: xwiki
-          #- name : DB_PASSWORD
-          #  value: bj%ksFh!gdb76Dhd
-          #- name : DB_HOST
-          #  value: itswiki-postgresql
-          #- name : JAVA_OPTS
-          #  value: "-Xmx5048m -Xms5048m"
-          #- name : CATALINA_OPTS
-          #  value: "-Xmx5048m -Xms5048m"
           resources:
             limits:
               cpu: 1
-              memory: 2Gi
-            requests:
-              cpu: 700m
               memory: 1Gi
+            requests:
+              cpu: 500m
+              memory: 256Mi