Add tests to Jenkins pipeline

Jenkinsfile

@@ -27,6 +27,17 @@ spec:
       mountPath: /var/run
     - name: docker-local-certs
       mountPath: /etc/docker/certs.d/docker.local
+  - name: python
+    image: docker.local/ci/python:latest
+    imagePullPolicy: Always
+    command: ["cat"]
+  - name: helm
+    image: docker.local/ci/helm:latest
+    imagePullPolicy: Always
+    env:
+    - name: KUBECONFIG
+      value: /home/jenkins/agent/workspace/gitea-bme_covidok-backend_master/ci/kube.config
+    command: ["cat"]
 ''') {
 
     node(POD_LABEL) {
@@ -34,10 +45,40 @@ spec:
             git url: 'https://gyulai.cloud/git/bme/covidok-backend.git',
                 credentialsId: '1b1c30a0-590d-41d4-b775-bdb90e837bc8'
             container('docker') {
-                stage('Build and publish dev Docker image') {
-                    sh 'docker build -f /home/jenkins/agent/workspace/gitea-bme_covidok-backend_master/CoviDok/Dockerfile.CI -t docker.local/bme/covidok:latest /home/jenkins/agent/workspace && docker push docker.local/bme/covidok'
+                stage('Build dev image') {
+                    sh 'docker build -f /home/jenkins/agent/workspace/gitea-bme_covidok-backend_master/CoviDok/Dockerfile.CI -t docker.local/bme/covidok:dev /home/jenkins/agent/workspace'
+                }
+                stage('Push dev image')
+                    sh 'docker push docker.local/bme/covidok:dev'
+                }
+            }
+            container('helm') {
+                stage('Helm lint'){
+                    sh 'helm lint /home/jenkins/agent/workspace/gitea-bme_covidok-backend_master/helm/covidok'
+                }
+                stage('Install dev') {
+                    sh '/home/jenkins/agent/workspace/gitea-bme_covidok-backend_master/ci/helm_test.sh'
+                }
+            }
+            container('python') {
+                stage('API test'){
+                    sh 'python3 -m pytest /home/jenkins/agent/workspace/gitea-bme_covidok-backend_master/ci/tests'
+                }
+            }
+            container('docker') {
+                stage('Push tested image'){
+                    sh 'docker tag docker.local/bme/covidok:dev docker.local/bme/covidok:latest'
+                    sh 'docker push docker.local/bme/covidok:latest'
+                }
+            }
+            container('helm'){
+                post{
+                    always {
+                        sh '/home/jenkins/agent/workspace/gitea-bme_covidok-backend_master/ci/cleanup.sh'
+                    }
                 }
             }
+        archiveArtifacts artifacts: '/home/jenkins/agent/workspace/gitea-bme_covidok-backend_master/covidok*tgz', followSymlinks: false, onlyIfSuccessful: true
         }
     }
 }

ci/cleanup.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -e
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+if [ -f "$DIR/namespace" ]
+then
+   kubectl delete namespace `cat "$DIR/namespace"` 
+fi

ci/helm_test.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+set -e
+
+if [ ! -d "$1" ]
+then
+    echo "Helm dir does not exist!"
+    exit 1
+fi
+
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+POSTFIX=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 10 | head -n 1)
+NAMESPACE="covidok-ci-$POSTFIX"
+HELM_PACKAGE="covid-$POSTFIX"
+
+printf "$NAMESPACE" > "$DIR/namespace"
+
+kubectl create namespace "$NAMESPACE"
+
+helm install -f "$DIR/ci_values.yaml" -n "$NAMESPACE" "$HELM_PACKAGE" "$1"
+
+i=0
+while [ "$(kubectl get pod -n "$NAMESPACE" -l=app.kubernetes.io/name=covidok -o jsonpath='{.items[*].status.containerStatuses[0].ready}')" != "true" ]; do
+    echo "Covidok backend is not yet ready..."
+    if [ $i -gt 10 ]
+    then
+        echo "Timeout reached while waiting for backend to start"
+        exit 1
+    else
+        sleep 5
+    fi
+done
+
+echo "Covidok backend is up"
+CLUSTERIP=$(kubectl get svc -n test1 -l=app.kubernetes.io/name=covidok -o jsonpath='{.items[*].spec.clusterIP}')
+echo "ClusterIP of service is $CLUSTERIP, writing to file"
+printf $CLUSTERIP > $DIR/tests/host.file

ci/kube.config

@@ -0,0 +1,19 @@
+apiVersion: v1
+clusters:
+- cluster:
+    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRJd01EZ3hOREU1TlRJd09Gb1hEVE13TURneE1qRTVOVEl3T0Zvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTXNNCkdrb1IrVFhTYTFzVHhsSDZ4UHE3aHdDWjdIRS90YUY5SHVYR0dPMC9PL3pYREhvNXhhcUwzKyt2cFVVZWFtZXAKZTBmMlRuMUZXSDNhZndWRnlhUVNlNGpSSXFzaU1admhlT2ZUdW1GbGJnOWVPeUZQNGgweC9RVUV4Q3Z6QzlxNQpwQloxVEkwcTRUSHJkR1VuemYySllmblZsdFFZM21UMHQ4RDV5RXFBVTNiNE5TKzUzSGVmREFQRXlrUzFsckU4CmxzSzFTVnBiZG9BZDJtTUk0M1lvRFRFYWY1bnlQblBVUnV3dTJWbmlxYVY0bXRUYmFIbktrazdqandQY2kvRSsKMmd3STFpVVBWU3BQTVF1SFJCWVhqUUYyVUw2eUF0R3o3OFFVdS93K2FIYXNBMUQ5OXFQZWc2bUhRTlVEOGJiUAp2VjczSmg0NG5HRi9NVVpvN0tVQ0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFGMWZVcHFTbTNrZlI3WXQxY3NMenhONFdhN1IKVGtWQ2ZmekUwQStSQXVBSTN0RUhNOWxqV1AxU3hLNEYwYUpLMVdEY09UK3VmOVpvNGFYOS8raVpuYjFGVE5IYwphYm44eVBxSEJFYisyenl2SHQxa0Y4NjloSUo5Q1dnQVNodzl4OVhTa3lnb3cwb2NUNmFKZm9JbHA3MDNLeGVuCms4QTdqWVVEeU40a2hQUzNVYUtIUjU2MFhHWXFBRndVYjd3Mk4wUFVneENJWlZRcEpJVlg4N2Zrby96TkZaU3UKRDlkMFpyWnRTdm4zZWhHTkw4MWkrclRRY3kwOENvNGZ5RmhPL0dydTdNTW00WS9YSmEzSHhpQVBGbUtYeEpMRwpUMTB2aVpkL1lZWFF6K0lHVnZPVnZmVHROaUVITERWWk9TU3pmVHA3bkZJNjJoQW0vQ1BSM2xLZWtyYz0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    server: https://192.168.0.101:6443
+  name: kubernetes
+contexts:
+- context:
+    cluster: kubernetes
+    user: kubernetes-admin
+  name: kubernetes-admin@kubernetes
+current-context: kubernetes-admin@kubernetes
+kind: Config
+preferences: {}
+users:
+- name: kubernetes-admin
+  user:
+    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4akNDQWRxZ0F3SUJBZ0lJUEZUSDI2cTVDeDh3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TURBNE1UUXhPVFV5TURoYUZ3MHlNVEE0TVRReE9UVXlNVEZhTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQXhQSE5ieE9RUTFLZkZTSzcKbVJDOUlGMzFmaC9JVTI4Q1dvV2NmZWZ1dEgrV2VmVVpES2JkL2xGU3ZGUm1tQlY0S3lzc2oyUmNSV3VFd09LRgpLM05yRlFlQXRERVlMa0wvdzVDZmVCdGU3SkF1Qmp0Y2dnVW9hT3BQZENFSzlzWHhndjdmZmFHSnBoUHNkeVprCko5TkJJZ0NEVzk1QWhiYXNTSHhCalcwUlF6dTNiWmFDNDIrTEt3OWJLWC9wVTFGMmwvODlMcktaZkU4SDN5dFAKU2hnVTY5S1BucGJSUWpwM3VwaUFrcWR0OTBpSzJrS2VpZWpmY1IvNk9KdGtsYm1KK012c2VtQXJ3VW5Ya1NISgo5SkpSVjdycFJCeEVaTjhLeDhmczNzODRxSjRMUU5qaUU4M2V0Ujd4ejNXY0dZSE1oY1dzVU1KZEgwd3NaYWQzCmF0OEF5d0lEQVFBQm95Y3dKVEFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFKcngrVWwwNkpqN0tFQTIvekl1OVQxbksxU3RMVU5NRGVaLwp2c1JzVm1qd3ByZ0pvUkRUU0xOQ3BpNDZqTytITDZGTkFvc0xCcDNUZTNwQW1jMVhxa2ZQZ1VHamlNd2I4S25RClpaMXZORTQwZkZscStlUW1VSTM2OURtWVJKcnltWkhjRkxXVTg5cnBycnBPSUQ1WnN2dE5reHo3TE0wZmVuUFMKNWxIUUt0akl2cnhOeUhEaloyVUlIcDZiNmlOVzB0ajNGaTNXQk5rMHg5OVd2ZGdLLzVyakUra2lndHJlSnZPNAo2d3NhdEhFcWh0TnZ0RW9pdklvK1h6OHh3QkkxVnJDVDBiSUFwK1FXWlhBQkduV2NjcWdUN0RoeUs5aFZWQkdXCnV0VDVpVGQvaGF5cFN1N25oQi9CYmtDWi9NK0dobmR2VVhMdTl1QnVITjRmb09iS0N4bz0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBeFBITmJ4T1FRMUtmRlNLN21SQzlJRjMxZmgvSVUyOENXb1djZmVmdXRIK1dlZlVaCkRLYmQvbEZTdkZSbW1CVjRLeXNzajJSY1JXdUV3T0tGSzNOckZRZUF0REVZTGtML3c1Q2ZlQnRlN0pBdUJqdGMKZ2dVb2FPcFBkQ0VLOXNYeGd2N2ZmYUdKcGhQc2R5WmtKOU5CSWdDRFc5NUFoYmFzU0h4QmpXMFJRenUzYlphQwo0MitMS3c5YktYL3BVMUYybC84OUxyS1pmRThIM3l0UFNoZ1U2OUtQbnBiUlFqcDN1cGlBa3FkdDkwaUsya0tlCmllamZjUi82T0p0a2xibUorTXZzZW1BcndVblhrU0hKOUpKUlY3cnBSQnhFWk44S3g4ZnMzczg0cUo0TFFOamkKRTgzZXRSN3h6M1djR1lITWhjV3NVTUpkSDB3c1phZDNhdDhBeXdJREFRQUJBb0lCQUdJV0M3ckdnNU1FRXpiegpsWHNtV3d0RHdJQ1FVN1U2RkhJQkdXK2JrOGRSeEIvNWNnQmJHelVPUzZhQVlwaGNHUDFuQTBwbk1ZMWhmenlSCmxNR1BPa1crOXRySG1NTnhtdkJMbHlDNmdReFF3cHRYOVRyTVZ0UHAzcWgzekg0YkY2Mm1RcWpQU3o3cnJWbXEKUlRlUWYxL3Y0WHhmdE1ManQrcGgrRVAzamlGdE84UmN2eHFIOThCNmpHc0Z4alVjT0F6NUx2ZXoxTzdwMXI1YgpMWE9SODdlUFp3Z0xhbDZzMkh2NVljZmloVzVoV2RhZU5leDJLTXRJUDFVd0J3aUQ5REJIcGlqTUNvaERHRzhNClFxLzNSOTh6Q0FDdmpsU2NxSnRZdXdFc3hBVUlOUllISzRBNU5lRXVvdk9nbnJEQzhaOE1hRWJKcGdoYlBWaG4KQnJuVmFBRUNnWUVBekVrak1NL3dNMXlKMit2N0l4L05vN1VrZWc2UXlHVHNJMkN6QUZMZlM1SVhUSVpLUW80UApsTTlIL3VzNmN0RVE5ZHkvR3VIaVUrd01XNWQrbFMyZGlSTkxEamVadzBZa1BqOXVhQWFIeWh3ZnlHd21YY2JzCnBubHc3NGthQkhibSsrSVN0djgvRmVhMlhZamdnVnBEcHd1WVhkbWY4bnJnQm9yVXVWTnNUQU1DZ1lFQTlzenEKd3BWekp3emZQekpWTkN1M0srbCs3MnFtdkwyTGdjdGhZR3N0NysxSWt6bUk1amQveVlCQnQxcVhpeFJZSlIyegptcW13Q29FdG8yc0lBaW5Ic3k5VEE0Y21ZY3ZiRFdGNXhOaUJEaFYvTm9ZMUI3YTFMS2FzcGtyYXoybFdPazA4CkhmaXBkMGdaUEtweDB0U1FNc042alE5V3hWc2dUcHhMZUpBek1aa0NnWUEyTW5VbW54UWYzRDRxM1hsOFFSVEMKaU8xTGdJL0N5cHVuYXlFeVJjbzk5MTA5RFNlb2JwNE5vY3g5QWhVNG51UzhCYnVodXluYmovVmJXMTdXM3dvNwpjcVhuK0xKUGowMVFRbTNkSlZaak5ZRHRJRnd4WnZRajJuWXU1cFhEZDNRaWdVRHIwZDMveG55OVpmSUIvMXVSCmRzOE9udzBEUEx3d29DWjlvSGRMMXdLQmdRQ3FFbWdza3lSNVlvdHRWMWdUelpRNmRIdCtyUFlkMWxpT3B3S0IKbVJwYzNoMUhKenpKdUxFY3dIK0l4S3J0c3FWVFhuWm9QRXNOMGhzTEpEU3VtTy8rOEx1NkVLWkllbHlIaWdhSgp1ZENsVGZjT01jblZlUGk4dmxiM2VWbnoyRmtOY0MvZlQzNG9yc3lGVzhkNFMvYmFwSTZOS21iWE5ZYTc1VVMwCjNsb0k4UUtCZ1FDTVBBUlhCdVZoak5aQk5NUHlScER3cVkyWFZOQTRSM1BvODR1NTN1Sk1PY1VHaGF6OTVvOGwKZkljY0hpOXpwVlUyb0Y0R1I1Y0FKSVVTMlF5WmxmbzNYYkxuaU81NWFHWkprbldRR2dxWjNWLzNubUI3bEpyUwpDNkVYNmdMR29haEJQM1djNlk4dmNlZFU3NnphbEUra2hqUEtzNTZKZXRHZXhkaWR5NUFESFE9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=

ci/tests/config.py

@@ -0,0 +1,13 @@
+import os 
+
+
+host_file = os.path.join(os.path.dirname(os.path.realpath(__file__)), "host.file")
+
+
+def load_host():
+    with open(host_file) as f:
+        return f.read().strip()
+
+
+def url_base():
+    return "http://" + load_host()

tests/test_auth.py → ci/tests/test_auth.py

@@ -1,11 +1,10 @@
 import requests
 import json
-
-url_base = "http://localhost:56030"
+from config import url_base
 
 def test_auth_basic():
     body = {"Email": "a", "Password": "a"}
-    response = requests.post(url_base + "/api/Auth/login", json=body)
+    response = requests.post(url_base() + "/api/Auth/login", json=body)
     data = json.loads(response.text)
     assert data["firstName"] == "Sajt"
     assert data["lastName"] == "Osperec"
@@ -13,48 +12,48 @@ def test_auth_basic():
 
 def test_auth_fail():
     body = {"Email": "b", "Password": "b"}
-    response = requests.post(url_base + "/api/Auth/login", json=body)
+    response = requests.post(url_base() + "/api/Auth/login", json=body)
     assert response.status_code == 401
 
 def test_auth_register():
     body = {"Email": "b", "FirstName": "a", "LastName": "a", "Password": "a", "Role": 0}
-    response = requests.post(url_base + "/api/Auth/register", json=body)
+    response = requests.post(url_base() + "/api/Auth/register", json=body)
     data = json.loads(response.text)
     assert data["status"] == 0
 
 def test_auth_register_bad_pass():
     body = {"Email": "b", "FirstName": "a", "LastName": "a", "Password": "1", "Role": 0}
-    response = requests.post(url_base + "/api/Auth/register", json=body)
+    response = requests.post(url_base() + "/api/Auth/register", json=body)
     data = json.loads(response.text)
     assert data["status"] == 1
     assert data["body"]["reason"] == "Password does not meet complexity requirements!"
 
 def test_auth_register_email_taken():
     body = {"Email": "a", "FirstName": "a", "LastName": "a", "Password": "a", "Role": 0}
-    response = requests.post(url_base + "/api/Auth/register", json=body)
+    response = requests.post(url_base() + "/api/Auth/register", json=body)
     data = json.loads(response.text)
     assert data["status"] == 1
     assert data["body"]["reason"] == "a is already registered!"
 
 def test_auth_child():
     body = {"SessionId": "id", "FirstName": "a", "LastName": "a", "BirthDate": "x", "SocSecNum": "2"}
-    response = requests.post(url_base + "/api/Auth/child", json=body)
+    response = requests.post(url_base() + "/api/Auth/child", json=body)
     data = json.loads(response.text)
     assert data["status"] == 0
     assert "childID" in data["body"]
 
 def test_auth_child_ssn_taken():
     body = {"SessionId": "id", "FirstName": "a", "LastName": "a", "BirthDate": "x", "SocSecNum": "111111111"}
-    response = requests.post(url_base + "/api/Auth/child", json=body)
+    response = requests.post(url_base() + "/api/Auth/child", json=body)
     data = json.loads(response.text)
     assert data["status"] == 1
     assert "SSN" in data["body"]["reason"]
 
 def test_auth_child_unauthorized():
     body = {"SessionId": "a", "FirstName": "a", "LastName": "a", "BirthDate": "x", "SocSecNum": "2"}
-    response = requests.post(url_base + "/api/Auth/child", json=body)
+    response = requests.post(url_base() + "/api/Auth/child", json=body)
     assert response.status_code == 401
 
 body = {"Email": "a", "FirstName": "a", "LastName": "a", "Password": "1", "Role": 0}
-response = requests.post(url_base + "/api/Auth/register", json=body)
+response = requests.post(url_base() + "/api/Auth/register", json=body)
 print(response.text)

tests/test_case.py → ci/tests/test_case.py

@@ -1,12 +1,11 @@
 import requests
 import json
-
-url_base = "http://localhost:56030"
+from config import url_base
 
 def test_case_basic():
     case_id = "1f4g5"
     body = {"SessionID": "a"}
-    response = requests.post(url_base + "/api/Case/"+case_id, json=body)
+    response = requests.post(url_base() + "/api/Case/"+case_id, json=body)
     data = json.loads(response.text)
     print(data)
     assert data["id"] == case_id
@@ -14,37 +13,37 @@ def test_case_basic():
 def test_case_unauthorized():
     case_id = "1f4g5"
     body = {"SessionID": "b"}
-    response = requests.post(url_base + "/api/Case/"+case_id, json=body)
+    response = requests.post(url_base() + "/api/Case/"+case_id, json=body)
     assert response.status_code == 401
 
 def test_case_update():
     case_id = "5f6h4"
     body = {"CaseID": case_id, "UpdateMsg": "a", "SessionID": "a"}
-    response = requests.put(url_base + "/api/Case/"+case_id+"/update", json=body)
+    response = requests.put(url_base() + "/api/Case/"+case_id+"/update", json=body)
     assert response.status_code == 200
 
 def test_case_update_unauthorized():
     case_id = "5f6h4"
     body = {"CaseID": case_id, "UpdateMsg": "a", "SessionID": "b"}
-    response = requests.put(url_base + "/api/Case/"+case_id+"/update", json=body)
+    response = requests.put(url_base() + "/api/Case/"+case_id+"/update", json=body)
     assert response.status_code == 401
 
 def test_case_close():
     case_id = "5f6h4"
     body = {"CaseID": case_id, "UpdateMsg": "a", "SessionID": "a"}
-    response = requests.put(url_base + "/api/Case/"+case_id+"/close", json=body)
+    response = requests.put(url_base() + "/api/Case/"+case_id+"/close", json=body)
     assert response.status_code == 200
 
 def test_case_close_unauthorized():
     case_id = "5f6h4"
     body = {"CaseID": case_id, "UpdateMsg": "a", "SessionID": "b"}
-    response = requests.put(url_base + "/api/Case/"+case_id+"/close", json=body)
+    response = requests.put(url_base() + "/api/Case/"+case_id+"/close", json=body)
     assert response.status_code == 401
 
 def test_case_filter():
     parent_id = "34g5g53"
     body = {"SessionID": "a", "Filters": {"ParentID": parent_id}}
-    response = requests.post(url_base + "/api/Case/filter", json=body)
+    response = requests.post(url_base() + "/api/Case/filter", json=body)
     data = json.loads(response.text)
     for i in data["cases"]:
         assert i["parentID"] == parent_id

tests/test_doc.py → ci/tests/test_doc.py

@@ -1,10 +1,9 @@
 import requests
 import json
-
-url_base = "http://localhost:56030"
+from config import url_base
 
 def test_doc_get():
-    response = requests.get(url_base + "/api/Doc")
+    response = requests.get(url_base() + "/api/Doc")
     data = json.loads(response.text)
     assert data["status"] == 0
     for val in data["body"].values():
@@ -12,7 +11,7 @@ def test_doc_get():
 
 def test_doc_assistants():
     doc_id = "a23f"
-    response = requests.get(url_base + "/api/Doc/" + doc_id + "/assistants")
+    response = requests.get(url_base() + "/api/Doc/" + doc_id + "/assistants")
     data = json.loads(response.text)
     assert data["status"] == 0
     for key, val in data["body"].items():
@@ -22,7 +21,7 @@ def test_doc_assistants():
 
 def test_doc_children():
     doc_id = "a23f"
-    response = requests.get(url_base + "/api/Doc/" + doc_id + "/children")
+    response = requests.get(url_base() + "/api/Doc/" + doc_id + "/children")
     data = json.loads(response.text)
     assert data["status"] == 0
     for key, val in data["body"].items():

helm/covidok/templates/NOTES.txt

@@ -1,21 +0,0 @@
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range $host := .Values.ingress.hosts }}
-  {{- range .paths }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}
-  {{- end }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "covidok.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "covidok.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "covidok.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "covidok.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
-{{- end }}

helm/covidok/templates/_helpers.tpl

@@ -49,14 +49,3 @@ Selector labels
 app.kubernetes.io/name: {{ include "covidok.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "covidok.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "covidok.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}

helm/covidok/templates/deployment.yaml

@@ -24,22 +24,12 @@ spec:
       {{- end }}
       containers:
         - name: {{ .Chart.Name }}
-          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: "{{ .Values.images.covidok.name }}:{{ .Values.images.covidok.tag }}"
+          imagePullPolicy: {{ .Values.images.pullPolicy }}
           ports:
             - name: http
               containerPort: 80
               protocol: TCP
-          livenessProbe:
-            httpGet:
-              path: /
-              port: http
-          readinessProbe:
-            httpGet:
-              path: /
-              port: http
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

helm/covidok/values.yaml

@@ -2,25 +2,20 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
-image:
-  repository: nginx
-  pullPolicy: IfNotPresent
+images:
+  covidok:
+    name: docker.local/bme/covidok
+    tag: latest
+  mysql:
+    name: mysql
+    tag: 8.0
+  pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-  tag: ""
 
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 
-serviceAccount:
-  # Specifies whether a service account should be created
-  create: true
-  # Annotations to add to the service account
-  annotations: {}
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: ""
-
 podAnnotations: {}
 
 service: