Skip to content

feat: runtime: add revert promotion commit step #827

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

Closed
scme0 wants to merge 5 commits into from
Closed

feat: runtime: add revert promotion commit step #827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7a1514e
update promotiontasks crd
scme0 Oct 21, 2025
329273f
fixup
scme0 Oct 21, 2025
1cf12a2
fix crd
scme0 Oct 21, 2025
3c70ba9
use specific app-proxy and gitops-operator tags
ATGardner Oct 22, 2025
362cda8
update crd
scme0 Oct 22, 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
155 changes: 144 additions & 11 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 @@ -256,6 +256,33 @@ spec:
- promotionValues
- targetApplication
type: object
revertPromotionCommit:
properties:
commitSha:
maxLength: 40
minLength: 7
pattern: ^[A-Fa-f0-9]+$
type: string
targetApplication:
properties:
name:
maxLength: 253
minLength: 1
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?)(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
type: string
namespace:
maxLength: 63
minLength: 1
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
type: string
required:
- name
- namespace
type: object
required:
- commitSha
- targetApplication
type: object
runWorkflow:
properties:
labels:
Expand Down Expand Up @@ -310,8 +337,9 @@ spec:
type: object
x-kubernetes-validations:
- message: exactly one of the fields in [runWorkflow promoteAppWithCommit
promoteAppWithPR verifyApp getPromotionValues] must be set
rule: '[has(self.runWorkflow),has(self.promoteAppWithCommit),has(self.promoteAppWithPR),has(self.verifyApp),has(self.getPromotionValues)].filter(x,x==true).size()
promoteAppWithPR verifyApp getPromotionValues revertPromotionCommit]
must be set
rule: '[has(self.runWorkflow),has(self.promoteAppWithCommit),has(self.promoteAppWithPR),has(self.verifyApp),has(self.getPromotionValues),has(self.revertPromotionCommit)].filter(x,x==true).size()
== 1'
maxItems: 100
minItems: 1
Expand Down Expand Up @@ -413,7 +441,6 @@ spec:
phase:
description: PromotionTaskPhase
enum:
- Pending
- Executing
- Terminating
- Succeeded
Expand Down Expand Up @@ -470,7 +497,6 @@ spec:
phase:
description: PromotionTaskPhase
enum:
- Pending
- Executing
- Terminating
- Succeeded
Expand All @@ -487,6 +513,8 @@ spec:
type: string
healthMessage:
type: string
revision:
type: string
sync:
description: SyncStatusCode is a type which represents
possible comparison results
Expand All @@ -500,11 +528,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:
Expand All @@ -525,6 +571,8 @@ spec:
type: string
healthMessage:
type: string
revision:
type: string
sync:
description: SyncStatusCode is a type which represents
possible comparison results
Expand All @@ -538,6 +586,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:
Expand All @@ -552,6 +623,65 @@ spec:
required:
- phase
type: object
revertPromotionCommit:
properties:
appStatus:
properties:
health:
description: Represents resource health status
type: string
healthMessage:
type: string
revision:
type: string
sync:
description: SyncStatusCode is a type which represents
possible comparison results
type: string
syncOperation:
type: string
syncOperationMessage:
type: string
required:
- health
- 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: RevertPromotionCommitPhase
enum:
- Unknown
- Pending
- RevertDone
- Syncing
- Complete
type: string
required:
- phase
type: object
runWorkflow:
properties:
nodes:
Expand Down Expand Up @@ -613,6 +743,8 @@ spec:
type: string
healthMessage:
type: string
revision:
type: string
sync:
description: SyncStatusCode is a type which represents
possible comparison results
Expand Down Expand Up @@ -648,8 +780,9 @@ spec:
type: object
x-kubernetes-validations:
- message: exactly one of the fields in [runWorkflow promoteAppWithCommit
promoteAppWithPR verifyApp getPromotionValues] must be set
rule: '[has(self.runWorkflow),has(self.promoteAppWithCommit),has(self.promoteAppWithPR),has(self.verifyApp),has(self.getPromotionValues)].filter(x,x==true).size()
promoteAppWithPR verifyApp getPromotionValues revertPromotionCommit]
must be set
rule: '[has(self.runWorkflow),has(self.promoteAppWithCommit),has(self.promoteAppWithPR),has(self.verifyApp),has(self.getPromotionValues),has(self.revertPromotionCommit)].filter(x,x==true).size()
== 1'
maxItems: 100
minItems: 1
Expand Down
8 changes: 4 additions & 4 deletions charts/gitops-runtime/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,8 +469,8 @@ app-proxy:
repository: codefreshplugins/argo-hub-codefresh-csdp-image-enricher-jira-info
tag: 1.1.17-main
image:
repository: quay.io/codefresh/cap-app-proxy
tag: 1.3820.0
repository: quay.io/codefresh/dev/cap-app-proxy
tag: 1.3844.0-emea-hackathon-reverterators-b24bcf6
pullPolicy: IfNotPresent
# -- Extra volume mounts for main container
extraVolumeMounts: []
Expand Down Expand Up @@ -633,8 +633,8 @@ gitops-operator:
image:
# -- defaults
registry: quay.io
repository: codefresh/codefresh-gitops-operator
tag: "6881890"
repository: codefresh/dev/codefresh-gitops-operator
tag: feat-hackathon-rollback-support-63752f3
env:
GITOPS_OPERATOR_VERSION: 0.11.1
serviceAccount:
Expand Down