[16.02.20] Fixed deployment settings

configuration/kubernetes/deployment.yaml

@@ -1,19 +1,18 @@
-apiVersion: v1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
     name: LABEL
   name: RESOURCE_NAME
+  namespace: production
 spec:
   replicas: 1
   selector:
+    matchLabels:
       app: RESOURCE_NAME
   strategy:
-    type: Rolling
+    type: RollingUpdate
-    rollingParams:
+    rollingUpdate:
-      updatePeriodSeconds: 1
-      intervalSeconds: 1
-      timeoutSeconds: 300
       maxSurge: 25%
       maxUnavailable: 0
   template:
@@ -22,8 +21,8 @@ spec:
         app: RESOURCE_NAME
     spec:
       containers:
-        - name: RESOURCE_NAME
+      - image: REPOSITORY/IMAGE
-          image: REPOSITORY/IMAGE
+        name: RESOURCE_NAME
         env:
           - name: KUBERNETES_NAMESPACE
             valueFrom:
@@ -53,6 +52,16 @@ spec:
               secretKeyRef:
                 name: jdbc
                 key: jdbc.password
+        ports:
+        - containerPort: 9090
+          name: RESOURCE_NAME
+#        readinessProbe:
+#          httpGet:
+#            path: /
+#            port: 9090
+#          timeoutSeconds: 2
+#          successThreshold: 2
+#          failureThreshold: 2
         imagePullPolicy: Always
         resources:
           requests:
@@ -62,3 +71,5 @@ spec:
             cpu: 0.5
             memory: 256Mi
       restartPolicy: Always
+      imagePullSecrets:
+        - name: registry-secret

configuration/kubernetes/service.yaml

@@ -2,14 +2,13 @@ kind: Service
 apiVersion: v1
 metadata:
   labels:
-    name: LABEL
+    name: gateway
-  name: RESOURCE_NAME
+  name: db-gateway
 spec:
   selector:
-    app: RESOURCE_NAME
+    app: db-gateway
   ports:
     - port: 9090
-      protocol: TCP
       targetPort: 9090
   sessionAffinity: None
   type: ClusterIP

configuration/pipelines/build.groovy

@@ -72,10 +72,10 @@ try {
         stage('Build Image') {
             mvn 'clean package -DskipTests'
 
-            sh "sed -i 's/REPOSITORY/${env.DOCKER_REPOSITORY}/g' configuration/kubernetes/deploy-config.yaml"
+            sh "sed -i 's/REPOSITORY/${env.DOCKER_REPOSITORY}/g' configuration/kubernetes/deployment.yaml"
-            sh "sed -i 's/IMAGE/${env.APPLICATION_NAME}:${env.APPLICATION_VERSION}/g' configuration/kubernetes/deploy-config.yaml"
+            sh "sed -i 's/IMAGE/${env.APPLICATION_NAME}:${env.APPLICATION_VERSION}/g' configuration/kubernetes/deployment.yaml"
-            sh "sed -i 's/RESOURCE_NAME/${env.APPLICATION_NAME}/g' configuration/kubernetes/deploy-config.yaml"
+            sh "sed -i 's/RESOURCE_NAME/${env.APPLICATION_NAME}/g' configuration/kubernetes/deployment.yaml"
-            sh "sed -i 's/LABEL/${env.APPLICATION_LABEL}/g' configuration/kubernetes/deploy-config.yaml"
+            sh "sed -i 's/LABEL/${env.APPLICATION_LABEL}/g' configuration/kubernetes/deployment.yaml"
 
             sh "sed -it 's/RESOURCE_NAME/${env.APPLICATION_NAME}/g' configuration/kubernetes/service.yaml"
             sh "sed -it 's/LABEL/${env.APPLICATION_LABEL}/g' configuration/kubernetes/service.yaml"

src/main/resources/application.yaml

@@ -19,6 +19,5 @@ spring:
       org.hibernate.jdbc.lob.non_contextual_creation: true
       format_sql: true
     database: postgresql
-
 server:
   port: 9090