Merge branch 'malowe/main/36' into 'main'

Iss #36 - Update Jenkinsfile + k8s for latest-staging tag + OKD probes

Closes #36

See merge request !23

Jenkinsfile

@@ -95,6 +95,16 @@ pipeline {
       """,
       returnStdout: true
     )
+    LATEST_TAG_NAME = sh(
+      script: """
+        if [ "${env.ENVIRONMENT}" = "staging" ]; then
+          printf latest-staging
+        else
+          printf latest
+        fi
+      """,
+      returnStdout: true
+    )
   }
 
   options {
@@ -123,7 +133,7 @@ pipeline {
         readTrusted 'src/main/docker/Dockerfile.jvm'
         unstash 'target'
         sh '''
-          docker build -f src/main/docker/Dockerfile.jvm --no-cache -t ${IMAGE_NAME}:${TAG_NAME} -t ${IMAGE_NAME}:latest .
+          docker build -f src/main/docker/Dockerfile.jvm --no-cache -t ${IMAGE_NAME}:${TAG_NAME} -t ${IMAGE_NAME}:${LATEST_TAG_NAME} .
         '''
       }
     }
@@ -142,7 +152,7 @@ pipeline {
         withDockerRegistry([credentialsId: '04264967-fea0-40c2-bf60-09af5aeba60f', url: 'https://index.docker.io/v1/']) {
           sh '''
             docker push ${IMAGE_NAME}:${TAG_NAME}
-            docker push ${IMAGE_NAME}:latest
+            docker push ${IMAGE_NAME}:${LATEST_TAG_NAME}
           '''
         }
       }

src/main/k8s/production.yml

@@ -41,6 +41,26 @@ spec:
           requests:
             cpu: 300m
             memory: 384Mi
+        startupProbe:
+            httpGet:
+              path: /openvsx/q/health
+              port: 8090
+              scheme: HTTP
+            timeoutSeconds: 1
+            initialDelaySeconds: 20
+            periodSeconds: 10
+            successThreshold: 1
+            failureThreshold: 3
+        livenessProbe:
+            httpGet:
+              path: /openvsx/q/health
+              port: 8090
+              scheme: HTTP
+            timeoutSeconds: 1
+            initialDelaySeconds: 60
+            periodSeconds: 60
+            successThreshold: 1
+            failureThreshold: 3
         env: 
         - name: CONFIG_SECRET_PATH
           value: "/run/secrets/openvsx-api/secret.properties"

src/main/k8s/staging.yml

@@ -30,7 +30,7 @@ spec:
             weight: 1
       containers:
       - name: app
-        image: eclipsefdn/eclipse-openvsx-api:latest
+        image: eclipsefdn/eclipse-openvsx-api:latest-staging
         imagePullPolicy: Always
         ports:
         - containerPort: 8090
@@ -41,6 +41,26 @@ spec:
           requests:
             cpu: 300m
             memory: 384Mi
+        startupProbe:
+            httpGet:
+              path: /openvsx/q/health
+              port: 8090
+              scheme: HTTP
+            timeoutSeconds: 1
+            initialDelaySeconds: 20
+            periodSeconds: 10
+            successThreshold: 1
+            failureThreshold: 3
+        livenessProbe:
+            httpGet:
+              path: /openvsx/q/health
+              port: 8090
+              scheme: HTTP
+            timeoutSeconds: 1
+            initialDelaySeconds: 60
+            periodSeconds: 60
+            successThreshold: 1
+            failureThreshold: 3
         env: 
         - name: CONFIG_SECRET_PATH
           value: "/run/secrets/openvsx-api/secret.properties"