Merge branch 'main' into fix_helmchart_ingress

.github/workflows/build.yaml

@@ -9,7 +9,7 @@ jobs:
     steps:
       - 
         name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
       -
@@ -47,7 +47,7 @@ jobs:
       -
         name: Create KUBECONFIG
         env:
-          KUBE_CONFIG: '${{ secrets.KUBECONFIG_TEST }}'
+          KUBE_CONFIG: '${{ secrets.KUBECONFIG_K8S_ACEND_TEST }}'
         run: |
           mkdir -p $HOME/.kube
           echo "$KUBE_CONFIG" > $HOME/.kube/config

.github/workflows/lighthouse.yaml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - 
         name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
       - name: Run Lighthouse test

.github/workflows/pr-cleanup.yaml

@@ -9,7 +9,7 @@ jobs:
     steps:
       - 
         name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
       -
@@ -25,7 +25,7 @@ jobs:
       -
         name: Create KUBECONFIG
         env:
-          KUBE_CONFIG: '${{ secrets.KUBECONFIG_TEST }}'
+          KUBE_CONFIG: '${{ secrets.KUBECONFIG_K8S_ACEND_TEST }}'
         run: |
           mkdir -p $HOME/.kube
           echo "$KUBE_CONFIG" > $HOME/.kube/config

.github/workflows/push_main.yaml

@@ -10,7 +10,7 @@ jobs:
     steps:
       - 
         name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
       -
@@ -49,7 +49,7 @@ jobs:
       -
         name: Create KUBECONFIG
         env:
-          KUBE_CONFIG: '${{ secrets.KUBECONFIG }}'
+          KUBE_CONFIG: '${{ secrets.KUBECONFIG_K8S_ACEND }}'
         run: |
           mkdir -p $HOME/.kube
           echo "$KUBE_CONFIG" > $HOME/.kube/config

.nvmrc

@@ -1 +1 @@
-18.15.0
+18.17.1

Dockerfile

@@ -1,4 +1,4 @@
-FROM klakegg/hugo:0.107.0-ext-ubuntu AS builder
+FROM klakegg/hugo:0.111.3-ext-ubuntu AS builder
 
 # Add package.json before rest of repo for caching
 COPY package.json package-lock.json .nvmrc /src/
@@ -8,7 +8,7 @@ COPY . /src
 
 RUN npm run build
 
-FROM nginxinc/nginx-unprivileged:1.23-alpine
+FROM nginxinc/nginx-unprivileged:1.25-alpine
 EXPOSE 8080
 # The URL of the backend service, see https://github.com/acend/website-backend
 ENV BACKEND_URL=http://acend-website-backend:8000

helm-chart/templates/acend-ingres.yaml

@@ -11,8 +11,6 @@ metadata:
   {{- with .Values.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
-    kubernetes.io/tls-acme: "true"
-    cert-manager.io/cluster-issuer: acend-letsencrypt
   {{- end }}
 spec:
   ingressClassName: {{ .Values.ingress.ingressClass }}
@@ -27,26 +25,6 @@ spec:
             name: {{ $fullName }}
             port:
               number: {{ $svcPort }}
-  tls:
-  - hosts:
-    - acend.ch
-    secretName: acend-ch
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: {{ $fullName }}-www
-  labels:
-    {{- include "acend-website-chart.labels" . | nindent 4 }}
-  {{- with .Values.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-    kubernetes.io/tls-acme: "true"
-    cert-manager.io/cluster-issuer: acend-letsencrypt
-  {{- end }}
-ingressClassName: {{ .Values.ingress.ingressClass }}
-spec:
-  rules:
   - host: www.acend.ch
     http:
       paths:
@@ -59,8 +37,10 @@ spec:
               number: {{ $svcPort }}
   tls:
   - hosts:
+    - acend.ch
     - www.acend.ch
-    secretName: www-acend-ch
+    secretName: acend-main-wildcard
+
 {{ else }}
 ---
 apiVersion: networking.k8s.io/v1