From dd7551a2932533a1fd4bd323a769f51c670b1c34 Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Thu, 27 Mar 2025 19:33:56 +0100 Subject: [PATCH 1/3] updated forgejo and forgejo-runner --- template/stacks/core/forgejo-runner/dind-docker.yaml | 6 +++--- template/stacks/core/forgejo.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/template/stacks/core/forgejo-runner/dind-docker.yaml b/template/stacks/core/forgejo-runner/dind-docker.yaml index 04b07a7..3676503 100644 --- a/template/stacks/core/forgejo-runner/dind-docker.yaml +++ b/template/stacks/core/forgejo-runner/dind-docker.yaml @@ -28,7 +28,7 @@ spec: # https://forgejo.org/docs/v1.21/admin/actions/#offline-registration initContainers: - name: runner-register - image: code.forgejo.org/forgejo/runner:6.0.1 + image: code.forgejo.org/forgejo/runner:6.3.1 command: - "forgejo-runner" - "register" @@ -58,7 +58,7 @@ spec: mountPath: /data containers: - name: runner - image: code.forgejo.org/forgejo/runner:6.0.1 + image: code.forgejo.org/forgejo/runner:6.3.1 command: - "sh" - "-c" @@ -94,7 +94,7 @@ spec: - name: runner-data mountPath: /data - name: daemon - image: docker:27.4.1-dind + image: docker:28.0.4-dind env: - name: DOCKER_TLS_CERTDIR value: /certs diff --git a/template/stacks/core/forgejo.yaml b/template/stacks/core/forgejo.yaml index 9b4aeae..4e95fe0 100644 --- a/template/stacks/core/forgejo.yaml +++ b/template/stacks/core/forgejo.yaml @@ -18,7 +18,7 @@ spec: sources: - repoURL: https://code.forgejo.org/forgejo-helm/forgejo-helm.git path: . - targetRevision: v10.1.1 + targetRevision: v11.0.5 helm: valueFiles: - $values/stacks/core/forgejo/values.yaml From 9ba027f94b35a94db45ae22b47536ad537acba00 Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Thu, 27 Mar 2025 20:10:06 +0100 Subject: [PATCH 2/3] updated nginx-ingress --- template/stacks/core/ingress-nginx.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/core/ingress-nginx.yaml b/template/stacks/core/ingress-nginx.yaml index cb69681..1bec144 100644 --- a/template/stacks/core/ingress-nginx.yaml +++ b/template/stacks/core/ingress-nginx.yaml @@ -18,7 +18,7 @@ spec: sources: - repoURL: https://github.com/kubernetes/ingress-nginx path: charts/ingress-nginx - targetRevision: helm-chart-4.11.3 + targetRevision: helm-chart-4.12.1 helm: valueFiles: - $values/stacks/core/ingress-nginx/values.yaml From b3495f610c5a9a8a84d5a89f78ae12aa58a88608 Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Thu, 27 Mar 2025 20:42:01 +0100 Subject: [PATCH 3/3] updated argocd --- template/stacks/core/argocd.yaml | 4 ++-- template/stacks/core/forgejo.yaml | 4 ++-- template/stacks/core/ingress-nginx.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/template/stacks/core/argocd.yaml b/template/stacks/core/argocd.yaml index 4f65e09..201951f 100644 --- a/template/stacks/core/argocd.yaml +++ b/template/stacks/core/argocd.yaml @@ -16,12 +16,12 @@ spec: name: in-cluster namespace: argocd sources: - - repoURL: https://github.com/argoproj/argo-helm + - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/argocd-helm.git path: charts/argo-cd # TODO: RIRE Can be updated when https://github.com/argoproj/argo-cd/issues/20790 is fixed and merged # As logout make problems, it is suggested to switch from path based routing to an own argocd domain, # similar to the CNOE amazon reference implementation and in our case, Forgejo - targetRevision: argo-cd-7.7.5 + targetRevision: argo-cd-7.8.14-depends helm: valueFiles: - $values/stacks/core/argocd/values.yaml diff --git a/template/stacks/core/forgejo.yaml b/template/stacks/core/forgejo.yaml index 4e95fe0..a89d576 100644 --- a/template/stacks/core/forgejo.yaml +++ b/template/stacks/core/forgejo.yaml @@ -16,9 +16,9 @@ spec: name: in-cluster namespace: gitea sources: - - repoURL: https://code.forgejo.org/forgejo-helm/forgejo-helm.git + - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/forgejo-helm.git path: . - targetRevision: v11.0.5 + targetRevision: v11.0.5-depends helm: valueFiles: - $values/stacks/core/forgejo/values.yaml diff --git a/template/stacks/core/ingress-nginx.yaml b/template/stacks/core/ingress-nginx.yaml index 1bec144..2517368 100644 --- a/template/stacks/core/ingress-nginx.yaml +++ b/template/stacks/core/ingress-nginx.yaml @@ -16,9 +16,9 @@ spec: name: in-cluster namespace: ingress-nginx sources: - - repoURL: https://github.com/kubernetes/ingress-nginx + - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/ingress-nginx-helm.git path: charts/ingress-nginx - targetRevision: helm-chart-4.12.1 + targetRevision: helm-chart-4.12.1-depends helm: valueFiles: - $values/stacks/core/ingress-nginx/values.yaml