Update k8s deployment files

Author: scdf-build-bot

src/kubernetes/grafana/grafana-deployment.yaml

@@ -14,7 +14,7 @@ spec:
         app: grafana
     spec:
       containers:
-        - image: springcloud/spring-cloud-dataflow-grafana-prometheus:2.10.0-SNAPSHOT
+        - image: springcloud/spring-cloud-dataflow-grafana-prometheus:@dataflow.version@
           name: grafana
           env:
             - name: GF_SECURITY_ADMIN_USER

src/kubernetes/server/server-deployment.yaml

@@ -16,8 +16,8 @@ spec:
     spec:
       containers:
       - name: scdf-server
-        image: springcloud/spring-cloud-dataflow-server:2.10.0-SNAPSHOT
-        imagePullPolicy: Always
+        image: springcloud/spring-cloud-dataflow-server:@dataflow.version@
+        imagePullPolicy: IfNotPresent
         volumeMounts:
           - name: config
             mountPath: /workspace/config
@@ -58,7 +58,7 @@ spec:
         - name: SPRING_CLOUD_DATAFLOW_FEATURES_SCHEDULES_ENABLED
           value: 'true'
         - name: SPRING_CLOUD_DATAFLOW_TASK_COMPOSEDTASKRUNNER_URI
-          value: 'docker://springcloud/spring-cloud-dataflow-composed-task-runner:2.10.0-SNAPSHOT'
+          value: 'docker://springcloud/spring-cloud-dataflow-composed-task-runner:@dataflow.version@'
         - name: SPRING_CLOUD_KUBERNETES_CONFIG_ENABLE_API
           value: 'false'
         - name: SPRING_CLOUD_KUBERNETES_SECRETS_ENABLE_API

src/kubernetes/skipper/skipper-config-kafka.yaml

@@ -16,15 +16,9 @@ data:
                   default:
                     environmentVariables: 'SPRING_CLOUD_STREAM_KAFKA_BINDER_BROKERS=kafka-broker:9092,SPRING_CLOUD_STREAM_KAFKA_BINDER_ZK_NODES=${KAFKA_ZK_SERVICE_HOST}:${KAFKA_ZK_SERVICE_PORT}'
                     limits:
-                      memory: 2g
-                      cpu: 2.0                    
-                    readinessProbeDelay: 1
-                    readinessProbeTimeout: 5
-                    livenessProbeDelay: 1
-                    livenessProbeTimeout: 2
-                    startupProbeDelay: 20
-                    startupProbeTimeout: 5
-                    startupProbeFailure: 50
+                      memory: 1024Mi
+                      cpu: 500m                    
+                    startupProbeFailures: 30
       datasource:
         url: jdbc:mariadb://${MARIADB_SERVICE_HOST}:${MARIADB_SERVICE_PORT}/skipper
         username: root

src/kubernetes/skipper/skipper-config-rabbit.yaml

@@ -16,15 +16,10 @@ data:
                   default:
                     environmentVariables: 'SPRING_RABBITMQ_HOST=${RABBITMQ_SERVICE_HOST},SPRING_RABBITMQ_PORT=${RABBITMQ_SERVICE_PORT}'
                     limits:
-                      memory: 2g
-                      cpu: 2.0
-                    readinessProbeDelay: 1
-                    readinessProbeTimeout: 5
-                    livenessProbeDelay: 1
-                    livenessProbeTimeout: 2
-                    startupProbeDelay: 20
-                    startupProbeTimeout: 5
-                    startupProbeFailure: 50
+                      memory: 1024Mi
+                      cpu: 500m
+                    readinessProbeDelay: 120
+                    livenessProbeDelay: 90
       datasource:
         url: jdbc:mariadb://${MARIADB_SERVICE_HOST}:${MARIADB_SERVICE_PORT}/skipper
         username: root

src/kubernetes/skipper/skipper-deployment.yaml

@@ -17,7 +17,7 @@ spec:
       containers:
       - name: skipper
         image: springcloud/spring-cloud-skipper-server:2.9.0-SNAPSHOT
-        imagePullPolicy: Always
+        imagePullPolicy: IfNotPresent
         volumeMounts:
           - name: config
             mountPath: /workspace/config