WIP: Edit ingress

.gitignore

@@ -2,3 +2,5 @@
 *.pyc
 #*.yaml
 !/deployment/wes-tes/**
+charts/
+Chart.lock

charts/tesk/Chart.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: nginx-ingress
+  repository: oci://registry-1.docker.io/nginxcharts
+  version: 1.1.2
+digest: sha256:ba4849c000bf8fcefd1c23038c2ce5c5ef1879da5ddf9a253e1b68458480c35c
+generated: "2024-02-07T15:07:23.216829+02:00"

charts/tesk/Chart.yaml

@@ -4,3 +4,8 @@ description: A TESK-EXILIR Helm chart for Kubernetes
 type: application
 version: 0.1.0
 appVersion: dev
+dependencies:
+  - name: nginx-ingress
+    condition: ingress.nginx
+    repository: oci://registry-1.docker.io/nginxcharts
+    version: 1.1.2

charts/tesk/templates/ingress/ingress-rules.yaml

@@ -1,23 +1,29 @@
-{{ if .Values.ingress.active }}
-apiVersion: extensions/v1beta1
+{{ if .Values.ingress.rules }}
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: ingress-rules {{ if .Values.ingress.annotations }}
   annotations:
   {{- range $key, $value := .Values.ingress.annotations }}
     {{ $key }}: {{ $value | quote }}
   {{- end }} {{ end }}
-spec: {{ if .Values.ingress.tls_secret_name }}
+spec:
+  ingressClassName: {{ .Values.ingress.ingressClassName }}
+  {{ if .Values.ingress.tls_secret_name }}
   tls:
   - hosts:
     - {{ .Values.host_name }}
-    secretName: {{ .Values.ingress.tls_secret_name }} {{ end }}
+    secretName: {{ .Values.ingress.tls_secret_name }}
+  {{ end }}
   rules:
   - host: {{ .Values.host_name }}
     http:
       paths:
       - path: {{ .Values.ingress.path }}
+        pathType: Exact
         backend:
-          serviceName: tesk-api
-          servicePort: {{ .Values.tesk.port }}
+          service:
+            name: tesk-api
+            port:
+              number: {{ .Values.tesk.port }}
 {{ end }}

charts/tesk/values.yaml

@@ -75,36 +75,19 @@ ftp:
 # Configure this, only if you choose "kubernetes" as "clusterTYpe"
 #
 ingress:
-    active: false
-    # The path, where TESK API will be exposed.
-    # path: /tes
-    path: /
-    # If no TLS secret name configured, TLS will be switched off
-    tls_secret_name:
-    # Annotations for Ingress Resource.
-    annotations:
-        kubernetes.io/ingress.class: nginx
-        kubernetes.io/tls-acme: "true"
-
-        # Choose one of the following depending on your setup
-        # cert-manager.io/issuer: letsencrypt-production
-        cert-manager.io/cluster-issuer: letsencrypt-production
-    deploy_ingress:
-        # This provides installation of one specific Ingress Controller https://github.com/nginxinc/kubernetes-ingress
-        # You will most probably be better off installing one of your choice yourself, as we may not update this section frequently enough.
-        # Also it is likely the installation of an Ingress Controller will be removed completely from the chart
-        active: false
-        nginx_image: nginx/nginx-ingress:1.4.6
-        # the following variables are specific to each deployment
-        # We used externalIP to expose Ingress on 80/443 port. On OpenStack internal IP of master node (10.*) worked for us.
-        # Could be any node, but calls to the service have to be using it. In our case DNS entry is assigned to master's external IP
-        # Use NodePort as an alternative (breaks Swagger)
-        external_ip: 10.1.1.1
-        node_port: 30977
-        # the following variables are specific to each deployment
-        # use:
-        # - scope=Cluster, if you want Ingress to listen to all namespaces (requires ClusterAdmin)
-        # - scope= , if you want Ingress to listen only to its own namespace
-        scope: ""
-        #
-        #
+  # Deploy k8s nginx controller
+  nginx: true
+  # To apply or not the ingress rules
+  rules: true
+  # The path, where TESK API will be exposed.
+  # path: /tes
+  path: /
+  # If no TLS secret name configured, TLS will be switched off
+  tls_secret_name:
+  ingressClassName: nginx
+  # Annotations for Ingress Resource.
+  annotations:
+      kubernetes.io/tls-acme: "true"
+      # Choose one of the following depending on your setup
+      # cert-manager.io/issuer: letsencrypt-production
+      cert-manager.io/cluster-issuer: letsencrypt-production