Merge branch 'main' into feat/ditch-argocd-and-argo-helm-fork

Author: reggie-k

charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml

@@ -487,6 +487,8 @@ spec:
                               type: string
                             healthMessage:
                               type: string
+                            revision:
+                              type: string
                             sync:
                               description: SyncStatusCode is a type which represents
                                 possible comparison results
@@ -500,11 +502,29 @@ spec:
                           - healthMessage
                           - sync
                           type: object
-                        commitSha:
-                          maxLength: 40
-                          minLength: 7
-                          pattern: (^[A-Fa-f0-9]+$|^<any-commit>$)
-                          type: string
+                        commitInfo:
+                          properties:
+                            commitAuthorId:
+                              properties:
+                                email:
+                                  type: string
+                                username:
+                                  type: string
+                              required:
+                              - email
+                              - username
+                              type: object
+                            commitDate:
+                              format: date-time
+                              type: string
+                            commitMessage:
+                              type: string
+                            commitSha:
+                              maxLength: 40
+                              minLength: 7
+                              pattern: (^[A-Fa-f0-9]+$|^<any-commit>$)
+                              type: string
+                          type: object
                         phase:
                           description: PromoteAppWithCommitPhase
                           enum:
@@ -525,6 +545,8 @@ spec:
                               type: string
                             healthMessage:
                               type: string
+                            revision:
+                              type: string
                             sync:
                               description: SyncStatusCode is a type which represents
                                 possible comparison results
@@ -538,6 +560,29 @@ spec:
                           - healthMessage
                           - sync
                           type: object
+                        commitInfo:
+                          properties:
+                            commitAuthorId:
+                              properties:
+                                email:
+                                  type: string
+                                username:
+                                  type: string
+                              required:
+                              - email
+                              - username
+                              type: object
+                            commitDate:
+                              format: date-time
+                              type: string
+                            commitMessage:
+                              type: string
+                            commitSha:
+                              maxLength: 40
+                              minLength: 7
+                              pattern: (^[A-Fa-f0-9]+$|^<any-commit>$)
+                              type: string
+                          type: object
                         phase:
                           description: PromoteAppWithPRPhase
                           enum:
@@ -613,6 +658,8 @@ spec:
                               type: string
                             healthMessage:
                               type: string
+                            revision:
+                              type: string
                             sync:
                               description: SyncStatusCode is a type which represents
                                 possible comparison results

charts/gitops-runtime/values.yaml

@@ -49,6 +49,8 @@ global:
     cluster: https://kubernetes.default.svc
     # -- Defines whether this is a Codefresh hosted runtime. Should not be changed.
     codefreshHosted: false
+    # -- Defines if runtime is namespace scoped. Required for running multiple runtimes in the same cluster
+    singleNamespace: false
     # -- Ingress settings
     ingress:
       # -- if set to true, the pre-install hook will validate the existance of appropriate values, but *will not* attempt to make a web request to the ingress host
@@ -146,7 +148,7 @@ global:
     image:
       registry: quay.io
       repository: codefresh/cf-argocd-extras
-      tag: e746a97
+      tag: d4fefcb
     nodeSelector: {}
     tolerations: []
     affinity: {}
@@ -248,7 +250,7 @@ argo-cd:
 # Argo Events
 #-----------------------------------------------------------------------------------------------------------------------
 argo-events:
-  enabled: false
+  enabled: true
   fullnameOverride: argo-events
   crds:
     install: false
@@ -608,7 +610,7 @@ gitops-operator:
     # -- defaults
     registry: quay.io
     repository: codefresh/codefresh-gitops-operator
-    tag: "6881890"
+    tag: "2784cd5"
   env:
     GITOPS_OPERATOR_VERSION: 0.11.1
   serviceAccount:
@@ -638,7 +640,7 @@ argo-gateway:
   image:
     registry: quay.io
     repository: codefresh/cf-argocd-extras
-    tag: e746a97
+    tag: d4fefcb
   nodeSelector: {}
   tolerations: []
   affinity: {}

installer-image/Dockerfile

@@ -4,11 +4,11 @@ RUN go install github.com/davidrjonas/semver-cli@latest \
   && cp $GOPATH/bin/semver-cli /usr/local/bin/
 
 #bookworm-slim
-FROM debian:12.11-slim
+FROM debian:13-slim
 
 RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
 
-ARG CF_CLI_VERSION=v0.2.12
+ARG CF_CLI_VERSION=v0.2.14
 ARG TARGETARCH
 
 RUN apt-get update && apt-get install curl jq -y
@@ -17,6 +17,6 @@ COPY --from=go-build /usr/local/bin/semver-cli /usr/local/bin/semver-cli
 
 COPY --from=bitnamilegacy/kubectl:1.33.4 /opt/bitnami/kubectl/bin/kubectl /usr/local/bin/
 
-RUN adduser --shell /bin/bash codefresh
+RUN useradd -m -s /bin/bash codefresh
 USER codefresh
 WORKDIR /home/codefresh