Skip to content

feat: support promotion with pull request #880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Nov 6, 2025
Merged

feat: support promotion with pull request #880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
23b896c
update promotion task crd
scme0 Nov 4, 2025
7669aa4
updated appVersion to 2.0.0
ATGardner Nov 4, 2025
ce93352
updated promtask crd
ATGardner Nov 4, 2025
95345cd
updated promtask crd
ATGardner Nov 5, 2025
458594d
[gitops-operator]feat: add promoteAppWithPR handler implementation
codefresh-v2-pipelines[bot] Nov 5, 2025
cab5b98
reverted appVersion
ATGardner Nov 5, 2025
6ed12d1
updated app-proxy to 1.3899.0
ATGardner Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 61 additions & 4 deletions charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -589,13 +593,66 @@ spec:
description: PromoteAppWithPRPhase
enum:
- Pending
- PRCreated
- Suspended
- Syncing
- Complete
type: string
prUrl:
format: uri
type: string
prInfo:
description: PRInfo holds information about the created
pull request
properties:
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:
- isMerged
- state
- url
type: object
required:
- phase
type: object
Expand Down
22 changes: 8 additions & 14 deletions charts/gitops-runtime/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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
# -------------------------------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -272,26 +270,22 @@ sealed-secrets:
argo-cd:
enabled: true
fullnameOverride: argo-cd

notifications:
enabled: false

redis:
## Redis image
image:
# -- Redis repository
repository: ecr-public.aws.com/docker/library/redis
# -- Redis tag
tag: 8.2.2-alpine

redis-ha:
## Redis-ha image
image:
# -- Redis repository
repository: ecr-public.aws.com/docker/library/redis
# -- Redis tag
tag: 8.2.2-alpine

configs:
cm:
timeout.reconciliation: 20s
Expand Down Expand Up @@ -501,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
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -688,9 +682,9 @@ gitops-operator:
# -- defaults
registry: quay.io
repository: codefresh/codefresh-gitops-operator
tag: "293f24f"
tag: "6882325"
env:
<<:
!!merge <<:
Copy link
Contributor

@eti-codefresh eti-codefresh Nov 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is this?

Copy link
Contributor Author

@ATGardner ATGardner Nov 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i'm also wondering. this all came from the automation commit that bumped the operator image tag.

Copy link
Contributor Author

@ATGardner ATGardner Nov 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

458594d

- *otel-config
GITOPS_OPERATOR_VERSION: 0.11.1
serviceAccount:
Expand Down Expand Up @@ -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
Expand Down