Merge branch 'adjust-gitlab-ci' into 'master'

Adjust gitlab ci

See merge request uplex/varnish/k8s-ingress!17

.gitlab-ci.yml

@@ -37,11 +37,13 @@ test:
   image: golang:1.21
   stage: test
   rules:
-    - changes:
-      - cmd/**.go
-      - pkg/**.go
-      - go.mod
-      - go.sum
+    - if: $CI_MERGE_REQUEST_ID
+      changes:
+        - cmd/**/*.go
+        - pkg/**/*.go
+        - go.mod
+        - go.sum
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
   before_script:
     - apt-get update -q
     - apt-get install -y golang-golang-x-tools pandoc git
@@ -63,10 +65,10 @@ build:haproxy:
   extends: .build-haproxy
   rules:
     - changes:
-      - container/Makefile
-      - container/Dockerfile.haproxy
-      - container/haproxy.cfg
-      - container/haproxy_exec.sh
+        - container/Makefile
+        - container/Dockerfile.haproxy
+        - container/haproxy.cfg
+        - container/haproxy_exec.sh
 
 # haproxy image can be build when user triggers it
 build:haproxy:manual:
@@ -79,14 +81,14 @@ build:klarlack:
   extends: .build-klarlack
   rules:
     - changes:
-      - container/Makefile
-      - container/Dockerfile.varnish
-      - container/varnishd_exec.sh
-      - container/start.cli
-      - container/bogo_backend.vcl
-      - container/boot.vcl
-      - container/notavailable.vcl
-      - container/ok.vcl
+        - container/Makefile
+        - container/Dockerfile.varnish
+        - container/varnishd_exec.sh
+        - container/start.cli
+        - container/bogo_backend.vcl
+        - container/boot.vcl
+        - container/notavailable.vcl
+        - container/ok.vcl
 
 # klarlack image can be build when user triggers it
 build:klarlack:manual:
@@ -101,15 +103,15 @@ build:ascn:
       optional: true
   rules:
     - changes:
-      - container/Makefile
-      - container/Dockerfile.ascn
-      - container/Dockerfile.varnish
-      - container/varnishd_exec.sh
-      - container/start.cli
-      - container/bogo_backend.vcl
-      - container/boot.vcl
-      - container/notavailable.vcl
-      - container/ok.vcl
+        - container/Makefile
+        - container/Dockerfile.ascn
+        - container/Dockerfile.varnish
+        - container/varnishd_exec.sh
+        - container/start.cli
+        - container/bogo_backend.vcl
+        - container/boot.vcl
+        - container/notavailable.vcl
+        - container/ok.vcl
 
 # ascn image can be build when user triggers it
 build:ascn:manual:
@@ -122,14 +124,14 @@ build:varnish:
   extends: .build-varnish
   rules:
     - changes:
-      - container/Makefile
-      - container/Dockerfile.varnish
-      - container/varnishd_exec.sh
-      - container/start.cli
-      - container/bogo_backend.vcl
-      - container/boot.vcl
-      - container/notavailable.vcl
-      - container/ok.vcl
+        - container/Makefile
+        - container/Dockerfile.varnish
+        - container/varnishd_exec.sh
+        - container/start.cli
+        - container/bogo_backend.vcl
+        - container/boot.vcl
+        - container/notavailable.vcl
+        - container/ok.vcl
 
 # varnish image can be build when user triggers it
 build:varnish:manual:
@@ -364,8 +366,8 @@ dev:haproxy-timeouts:
   parallel:
     matrix:
       - VARNISH:
-        - varnish
-        - klarlack
+          - varnish
+          - klarlack
         FOO: bar
   before_script:
     - apk add -U wget

deploy/values-varnish.yaml

 nameOverride: varnish-ingress
 fullnameOverride: varnish-ingress
 vikingService:
-
   ## Name of the ingress class to route through this controller
   ##
   ingressClass: varnish
@@ -9,3 +8,7 @@ vikingService:
   # labels to add to the pod container metadata
   podLabels:
     app: varnish-ingress
+
+  varnish:
+    livenessProbeConfig:
+      failureThreshold: 50

pkg/controller/controller.go

@@ -169,7 +169,6 @@ func NewIngressController(
 	incomplRetryDelay time.Duration,
 	maxSyncRetries uint,
 ) (*IngressController, error) {
-
 	ingc := IngressController{
 		log:       log,
 		client:    kubeClient,
@@ -232,8 +231,7 @@ func NewIngressController(
 	}
 
 	if namespace == api_v1.NamespaceAll {
-		ingc.informers.ns =
-			infFactory.Core().V1().Namespaces().Informer()
+		ingc.informers.ns = infFactory.Core().V1().Namespaces().Informer()
 		nsDeleteFunc := cache.ResourceEventHandlerFuncs{
 			DeleteFunc: ingc.deleteNs,
 		}
@@ -351,7 +349,7 @@ func (ingc *IngressController) updateObj(old, new interface{}) {
 			kind := "Unknown"
 			switch old.(type) {
 			case *net_v1.Ingress:
-				kind = "Ingress"
+				kind = "Ingresse"
 			case *net_v1.IngressClass:
 				kind = "IngressClass"
 			case *api_v1.Service: