Skip to content

Commit d581861

Browse files
Merge branch 'stable/0.24' into prep/v0.24.2
2 parents 0831139 + 50457a8 commit d581861

File tree

6 files changed

+31
-27
lines changed

6 files changed

+31
-27
lines changed

charts/gitops-runtime/Chart.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ dependencies:
3737
version: 8.0.6-8-cap-v3.0.2-2025-09-07-cdf75df5
3838
- name: argo-events
3939
repository: https://codefresh-io.github.io/argo-helm
40-
version: 2.4.8-cap-CR-29689
40+
version: 2.4.9-cap-CR-30841
4141
- name: argo-workflows
4242
repository: https://codefresh-io.github.io/argo-helm
43-
version: 0.45.15-v3.6.7-cap-CR-28355
43+
version: 0.45.16-v3.6.7-cap-CR-30835
4444
condition: argo-workflows.enabled
4545
- name: argo-rollouts
4646
repository: https://codefresh-io.github.io/argo-helm
47-
version: 2.37.3-6-v1.7.2-cap-CR-29629
47+
version: 2.37.3-7-v1.7.2-cap-OSS-697
4848
condition: argo-rollouts.enabled
4949
- name: sealed-secrets
5050
repository: https://bitnami-labs.github.io/sealed-secrets/

charts/gitops-runtime/templates/hooks/pre-uninstall/cleanup-resources.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ kind: Job
33
metadata:
44
name: cleanup-runtime-resources
55
annotations:
6-
"helm.sh/hook": pre-delete
7-
"helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation
6+
helm.sh/hook: pre-delete
7+
helm.sh/hook-weight: "5"
8+
helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation
89
spec:
910
backoffLimit: 3
1011
template:
1112
spec:
12-
serviceAccount: argocd-application-controller
13+
serviceAccount: runtime-cleanup
1314
restartPolicy: Never
1415
containers:
1516
- name: cleanup-runtime-resources

charts/gitops-runtime/templates/hooks/pre-uninstall/delete-runtime-from-platform.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ kind: Job
88
metadata:
99
name: delete-runtime-from-platform
1010
annotations:
11-
"helm.sh/hook": pre-delete
12-
"helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation,hook-failed
11+
helm.sh/hook: pre-delete
12+
helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation,hook-failed
1313
spec:
1414
backoffLimit: 3
1515
template:

charts/gitops-runtime/templates/hooks/pre-uninstall/rbac.yaml

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,20 @@
1+
apiVersion: v1
2+
kind: ServiceAccount
3+
metadata:
4+
name: runtime-cleanup
5+
annotations:
6+
helm.sh/hook: pre-delete
7+
helm.sh/hook-weight: "-10"
8+
helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation,hook-failed
9+
---
110
apiVersion: rbac.authorization.k8s.io/v1
211
kind: Role
312
metadata:
413
name: runtime-cleanup
514
annotations:
6-
"helm.sh/hook": pre-delete
7-
"helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation,hook-failed
15+
helm.sh/hook: pre-delete
16+
helm.sh/hook-weight: "-10"
17+
helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation,hook-failed
818
rules:
919
- apiGroups:
1020
- "*"
@@ -18,20 +28,13 @@ kind: RoleBinding
1828
metadata:
1929
name: runtime-cleanup
2030
annotations:
21-
"helm.sh/hook": pre-delete
22-
"helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation,hook-failed
31+
helm.sh/hook: pre-delete
32+
helm.sh/hook-weight: "-10"
33+
helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation,hook-failed
2334
roleRef:
2435
apiGroup: ""
2536
kind: Role
2637
name: runtime-cleanup
2738
subjects:
2839
- kind: ServiceAccount
2940
name: runtime-cleanup
30-
---
31-
apiVersion: v1
32-
kind: ServiceAccount
33-
metadata:
34-
name: runtime-cleanup
35-
annotations:
36-
"helm.sh/hook": pre-delete
37-
"helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation,hook-failed

charts/gitops-runtime/values.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ sealed-secrets:
226226
image:
227227
registry: 'quay.io'
228228
repository: 'codefresh/sealed-secrets-controller'
229-
tag: '0.29.0'
229+
tag: '0.32.0'
230230
resources:
231231
limits:
232232
cpu: 500m
@@ -728,7 +728,7 @@ gitops-operator:
728728
image:
729729
registry: quay.io
730730
repository: codefresh/codefresh-gitops-operator
731-
tag: 58625b8
731+
tag: d6c93d9
732732
env:
733733
GITOPS_OPERATOR_VERSION: 0.10.1 # hacky workaround, since our tags are no longer semver compliant
734734
serviceAccount:
@@ -763,7 +763,7 @@ cf-argocd-extras:
763763
image:
764764
registry: quay.io
765765
repository: codefresh/cf-argocd-extras
766-
tag: v0.5.14
766+
tag: c74d94c
767767
nodeSelector: {}
768768
tolerations: []
769769
affinity: {}
@@ -787,7 +787,7 @@ cf-argocd-extras:
787787
image:
788788
registry: quay.io
789789
repository: codefresh/cf-argocd-extras
790-
tag: v0.5.14
790+
tag: c74d94c
791791
nodeSelector: {}
792792
tolerations: []
793793
affinity: {}

installer-image/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
FROM golang:1.24.6 AS go-build
1+
FROM golang:1.24.6 AS go-build
22

33
RUN go install github.com/davidrjonas/semver-cli@latest \
44
&& cp $GOPATH/bin/semver-cli /usr/local/bin/
55

66
#bookworm-slim
7-
FROM debian:12.11-slim
7+
FROM debian:12.12-slim
88

99
RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
1010

11-
ARG CF_CLI_VERSION=v0.2.12
11+
ARG CF_CLI_VERSION=v0.2.13
1212
ARG TARGETARCH
1313

1414
RUN apt-get update && apt-get install curl jq -y

0 commit comments

Comments
 (0)