Update php Docker tag to v8.5.0

.gitea/workflows/render-manfiest-automerge.yaml

@@ -7,7 +7,7 @@ on:
     paths:
       - 'clusters/cl01tl/helm/**'
     types:
-      - labeled
+      - closed
 
 env:
   CLUSTER: cl01tl
@@ -19,8 +19,7 @@ env:
 jobs:
   render-manfiest-automerge:
     runs-on: ubuntu-js
-    if: |
-      (github.event_name == 'pull_request' && github.event.action == 'labeled' && contains(github.event.pull_request.labels.*.name, 'automerge'))
+    if: ${{ (github.event.pull_request.merged == true) && (contains(github.event.pull_request.labels.*.name, 'automerge')) }}
     steps:
       - name: Checkout Main
         uses: actions/checkout@v6

.gitea/workflows/render-manifests.yaml

@@ -171,7 +171,33 @@ jobs:
 
               echo ""
               echo ">> Rendering templates ..."
-              helm template "$chart_name" ./ --namespace "$chart_name" --include-crds > "$OUTPUT_FILE"
+
+              case "$chart_name" in
+                "stack")
+                  echo ">> Special Rendering for stack ..."
+                  helm template stack ./ --namespace argocd --include-crds > "$OUTPUT_FILE"
+                  ;;
+                "cilium")
+                  echo ">> Special Rendering for cilium ..."
+                  helm template cilium ./ --namespace kube-system --include-crds > "$OUTPUT_FILE"
+                  ;;
+                "coredns")
+                  echo ">> Special Rendering for coredns ..."
+                  helm template coredns ./ --namespace kube-system --include-crds > "$OUTPUT_FILE"
+                  ;;
+                "metrics-server")
+                  echo ">> Special Rendering for metrics-server ..."
+                  helm template metrics-server ./ --namespace kube-system --include-crds > "$OUTPUT_FILE"
+                  ;;
+                "prometheus-operator-crds")
+                  echo ">> Special Rendering for prometheus-operator-crds ..."
+                  helm template prometheus-operator-crds ./ --namespace kube-system --include-crds > "$OUTPUT_FILE"
+                  ;;
+                *)
+                  echo ">> Standard Rendering for $chart_name ..."
+                  helm template "$chart_name" ./ --namespace "$chart_name" --include-crds > "$OUTPUT_FILE"
+                  ;;
+              esac
 
               echo ""
               echo ">> Manifests for $chart_name rendered to $OUTPUT_FILE"

clusters/cl01tl/helm/shelly-plug/values.yaml

@@ -36,7 +36,7 @@ shelly-plug:
         main:
           image:
             repository: php
-            tag: 8.4.15-apache-bookworm
+            tag: 8.5.0-apache-bookworm
             pullPolicy: IfNotPresent
           env:
             - name: SHELLY_HOSTNAME

clusters/cl01tl/helm/stack/templates/application-set.yaml

@@ -26,8 +26,6 @@ spec:
             exclude: true
           - path: clusters/cl01tl/manifests/metrics-server
             exclude: true
-          - path: clusters/cl01tl/manifests/kubelet-serving-cert-approver
-            exclude: true
           - path: clusters/cl01tl/manifests/prometheus-operator-crds
             exclude: true
   template:

clusters/cl01tl/helm/stack/templates/application.yaml

@@ -156,44 +156,6 @@ spec:
       - ServerSideApply=true
       - PruneLast=true
 
----
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: kubelet-serving-cert-approver
-  namespace: argocd
-  labels:
-    app.kubernetes.io/name: kubelet-serving-cert-approver
-    app.kubernetes.io/instance: argocd
-    app.kubernetes.io/part-of: argocd
-  finalizers:
-    - resources-finalizer.argocd.argoproj.io
-spec:
-  project: default
-  source:
-    repoURL: http://gitea-http.gitea:3000/alexlebens/infrastructure
-    targetRevision: manifests
-    path: clusters/cl01tl/manifests/kubelet-serving-cert-approver
-  destination:
-    name: in-cluster
-    namespace: kubelet-serving-cert-approver
-  revisionHistoryLimit: 3
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: false
-    retry:
-      limit: 3
-      backoff:
-        duration: 1m
-        factor: 2
-        maxDuration: 15m
-    syncOptions:
-      - CreateNamespace=true
-      - ApplyOutOfSyncOnly=true
-      - ServerSideApply=true
-      - PruneLast=true
-
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: Application