From 23b896c067b69bde67beaae227d4116c44b2fe31 Mon Sep 17 00:00:00 2001 From: scme0 Date: Tue, 4 Nov 2025 16:40:12 +0200 Subject: [PATCH 1/7] update promotion task crd --- .../gitops-operator/crds/promotiontasks.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml b/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml index 4a540b6b..d1040065 100644 --- a/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml +++ b/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml @@ -593,6 +593,18 @@ spec: - Syncing - Complete type: string + prStatus: + properties: + isClosed: + description: |- + IsClosed is true if either the PR is merged or closed without merging. If the PR is merged, MergeCommitSHA will + also be set. + type: boolean + mergeCommitSha: + type: string + required: + - isClosed + type: object prUrl: format: uri type: string From 7669aa46bd2a058401c8459795ba7e0bf4d2145c Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Tue, 4 Nov 2025 16:40:12 +0200 Subject: [PATCH 2/7] updated appVersion to 2.0.0 --- charts/gitops-runtime/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/gitops-runtime/Chart.yaml b/charts/gitops-runtime/Chart.yaml index 92835134..56dd4832 100644 --- a/charts/gitops-runtime/Chart.yaml +++ b/charts/gitops-runtime/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 0.1.72 +appVersion: 2.0.0 # temporary TO BE REMOVED description: A Helm chart for Codefresh gitops runtime name: gitops-runtime version: 0.0.0 From ce93352c1bb30cef0a0a09b268c979e9a07a0ec4 Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Tue, 4 Nov 2025 16:40:12 +0200 Subject: [PATCH 3/7] updated promtask crd --- .../_components/gitops-operator/crds/promotiontasks.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml b/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml index d1040065..88234826 100644 --- a/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml +++ b/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml @@ -589,7 +589,7 @@ spec: description: PromoteAppWithPRPhase enum: - Pending - - PRCreated + - Suspended - Syncing - Complete type: string From 95345cd01afb6e8c8862fd1ff03c633eb0b14a03 Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Wed, 5 Nov 2025 17:06:13 +0200 Subject: [PATCH 4/7] updated promtask crd --- .../gitops-operator/crds/promotiontasks.yaml | 63 ++++++++++++++++--- 1 file changed, 54 insertions(+), 9 deletions(-) diff --git a/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml b/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml index 88234826..0fc9d5c9 100644 --- a/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml +++ b/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml @@ -541,6 +541,8 @@ spec: promoteAppWithPR: properties: appStatus: + description: APPStatus holds the status of the application + after the PR was merged properties: health: description: Represents resource health status @@ -563,6 +565,8 @@ spec: - sync type: object commitInfo: + description: CommitInfo holds information about the commit + that was created when the PR was merged properties: commitAuthorId: properties: @@ -593,21 +597,62 @@ spec: - Syncing - Complete type: string - prStatus: + prInfo: + description: PRInfo holds information about the created + pull request properties: - isClosed: - description: |- - IsClosed is true if either the PR is merged or closed without merging. If the PR is merged, MergeCommitSHA will - also be set. + author: + description: Pull request author + type: string + avatarUrl: + description: Pull request author avatar url + type: string + baseBranch: + description: Pull request base branch + type: string + createdAt: + description: Pull request created at + format: date-time + type: string + description: + description: Pull request description + type: string + headBranch: + description: Pull request head branch + type: string + id: + description: Pull request id + type: integer + isMerged: + description: Is pull request merged type: boolean mergeCommitSha: + description: Commit sha from the pull request merge + maxLength: 40 + minLength: 7 + pattern: ^[A-Fa-f0-9]+$ + type: string + repo: + description: Pull request repo name + type: string + state: + description: Pull request state + enum: + - Open + - Closed + type: string + title: + description: Pull request title + type: string + url: + description: Pull request url + format: uri type: string required: - - isClosed + - isMerged + - state + - url type: object - prUrl: - format: uri - type: string required: - phase type: object From 458594dd5b24e44da8a137b7c14ca92850637e98 Mon Sep 17 00:00:00 2001 From: "codefresh-v2-pipelines[bot]" <109073600+codefresh-v2-pipelines[bot]@users.noreply.github.com> Date: Wed, 5 Nov 2025 17:57:19 +0000 Subject: [PATCH 5/7] [gitops-operator]feat: add promoteAppWithPR handler implementation --- charts/gitops-runtime/values.yaml | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml index d0563059..d570ed30 100644 --- a/charts/gitops-runtime/values.yaml +++ b/charts/gitops-runtime/values.yaml @@ -189,11 +189,10 @@ global: scrapeTimeout: 10s labels: {} config: {} - anchors: common-envs: - # -- Telemetry configuration - &otel-config + # -- Telemetry configuration # -- Base endpoint URL for all OpenTelemetry signals. # Ref: https://opentelemetry.io/docs/languages/sdk-configuration/otlp-exporter/ OTEL_EXPORTER_OTLP_ENDPOINT: 'http://localhost:4317' @@ -227,7 +226,6 @@ anchors: OTEL_EXPORTER_PROMETHEUS_PORT: '9464' # -- Emit the stable HTTP and networking OTel conventions if CF_TELEMETRY_OTEL_ALLOW_HTTP_INSTRUMENTATION=true. OTEL_SEMCONV_STABILITY_OPT_IN: 'http' - # ------------------------------------------------------------------------------------------------------------------------- # Installer # ------------------------------------------------------------------------------------------------------------------------- @@ -272,10 +270,8 @@ sealed-secrets: argo-cd: enabled: true fullnameOverride: argo-cd - notifications: enabled: false - redis: ## Redis image image: @@ -283,7 +279,6 @@ argo-cd: repository: ecr-public.aws.com/docker/library/redis # -- Redis tag tag: 8.2.2-alpine - redis-ha: ## Redis-ha image image: @@ -291,7 +286,6 @@ argo-cd: repository: ecr-public.aws.com/docker/library/redis # -- Redis tag tag: 8.2.2-alpine - configs: cm: timeout.reconciliation: 20s @@ -570,7 +564,7 @@ app-proxy: # -- Cors settings for app-proxy. This is the list of allowed domains for platform (comma separated). cors: "https://g.codefresh.io" env: - <<: + !!merge <<: - *otel-config # -- Level of logging for app-proxy CF_TELEMETRY_LOGS_LEVEL: 'info' @@ -688,9 +682,9 @@ gitops-operator: # -- defaults registry: quay.io repository: codefresh/codefresh-gitops-operator - tag: "293f24f" + tag: "6882325" env: - <<: + !!merge <<: - *otel-config GITOPS_OPERATOR_VERSION: 0.11.1 serviceAccount: @@ -859,11 +853,11 @@ redis: event-reporters: cluster-event-reporter: env: - <<: + !!merge <<: - *otel-config runtime-event-reporter: env: - <<: + !!merge <<: - *otel-config # -- Redis-HA subchart replaces custom redis deployment when `redis-ha.enabled=true` # Ref: https://github.com/DandyDeveloper/charts/blob/master/charts/redis-ha/values.yaml From cab5b98b742b6e9ddff4615bdf1aeb5d442ca02d Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Wed, 5 Nov 2025 19:59:21 +0200 Subject: [PATCH 6/7] reverted appVersion --- charts/gitops-runtime/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/gitops-runtime/Chart.yaml b/charts/gitops-runtime/Chart.yaml index 56dd4832..92835134 100644 --- a/charts/gitops-runtime/Chart.yaml +++ b/charts/gitops-runtime/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 2.0.0 # temporary TO BE REMOVED +appVersion: 0.1.72 description: A Helm chart for Codefresh gitops runtime name: gitops-runtime version: 0.0.0 From 6ed12d1d40f18aa1537f852cfb40bd831819dd8e Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Thu, 6 Nov 2025 10:10:54 +0200 Subject: [PATCH 7/7] updated app-proxy to 1.3899.0 feat: support terminating promotion with pr (https://github.com/codefresh-io/argo-platform/pull/6851) --- charts/gitops-runtime/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml index d570ed30..5bfa11f6 100644 --- a/charts/gitops-runtime/values.yaml +++ b/charts/gitops-runtime/values.yaml @@ -495,14 +495,14 @@ app-proxy: tag: 1.1.17-main image: repository: quay.io/codefresh/cap-app-proxy - tag: 1.3883.0 + tag: 1.3899.0 pullPolicy: IfNotPresent # -- Extra volume mounts for main container extraVolumeMounts: [] initContainer: image: repository: quay.io/codefresh/cap-app-proxy-init - tag: 1.3883.0 + tag: 1.3899.0 pullPolicy: IfNotPresent command: - ./init.sh