DevFW-CICD/stacks
12
0
Fork 1
Code Issues Pull requests 3 Projects Releases Packages Wiki Activity Actions

Merge pull request 'updated argocd nginxingress and forgejo' (#22) from forgejo_upgrade_to_11_0_5 into development

Browse source 
Reviewed-on: #22
This commit is contained in:
richardrobertreitz 2025-03-27 19:49:13 +00:00
commit 4814dff26f
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
template/stacks/core/argocd.yaml
View file

@ -16,12 +16,12 @@ spec:
name: in-cluster name: in-cluster
namespace: argocd namespace: argocd
sources: 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 path: charts/argo-cd
# TODO: RIRE Can be updated when https://github.com/argoproj/argo-cd/issues/20790 is fixed and merged # 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, # 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 # 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: helm:
valueFiles: valueFiles:
- $values/stacks/core/argocd/values.yaml - $values/stacks/core/argocd/values.yaml

6
template/stacks/core/forgejo-runner/dind-docker.yaml
View file

@ -28,7 +28,7 @@ spec:
# https://forgejo.org/docs/v1.21/admin/actions/#offline-registration # https://forgejo.org/docs/v1.21/admin/actions/#offline-registration
initContainers: initContainers:
- name: runner-register - name: runner-register
image: code.forgejo.org/forgejo/runner:6.0.1 image: code.forgejo.org/forgejo/runner:6.3.1
command: command:
- "forgejo-runner" - "forgejo-runner"
- "register" - "register"
@ -58,7 +58,7 @@ spec:
mountPath: /data mountPath: /data
containers: containers:
- name: runner - name: runner
image: code.forgejo.org/forgejo/runner:6.0.1 image: code.forgejo.org/forgejo/runner:6.3.1
command: command:
- "sh" - "sh"
- "-c" - "-c"
@ -94,7 +94,7 @@ spec:
- name: runner-data - name: runner-data
mountPath: /data mountPath: /data
- name: daemon - name: daemon
image: docker:27.4.1-dind image: docker:28.0.4-dind
env: env:
- name: DOCKER_TLS_CERTDIR - name: DOCKER_TLS_CERTDIR
value: /certs value: /certs

4
template/stacks/core/forgejo.yaml
View file

@ -16,9 +16,9 @@ spec:
name: in-cluster name: in-cluster
namespace: gitea namespace: gitea
sources: 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: . path: .
targetRevision: v10.1.1 targetRevision: v11.0.5-depends
helm: helm:
valueFiles: valueFiles:
- $values/stacks/core/forgejo/values.yaml - $values/stacks/core/forgejo/values.yaml

4
template/stacks/core/ingress-nginx.yaml
View file

@ -16,9 +16,9 @@ spec:
name: in-cluster name: in-cluster
namespace: ingress-nginx namespace: ingress-nginx
sources: 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 path: charts/ingress-nginx
targetRevision: helm-chart-4.11.3 targetRevision: helm-chart-4.12.1-depends
helm: helm:
valueFiles: valueFiles:
- $values/stacks/core/ingress-nginx/values.yaml - $values/stacks/core/ingress-nginx/values.yaml