From 7463be5aa8d242c732797eea52ba5329ad2ab42d Mon Sep 17 00:00:00 2001 From: "codefresh-v2-pipelines[bot]" <109073600+codefresh-v2-pipelines[bot]@users.noreply.github.com> Date: Thu, 18 Sep 2025 08:05:26 +0000 Subject: [PATCH 1/5] [gitops-operator]feat: add GetPromotionValuesHandler and VerifyAppHandler implementations --- charts/gitops-runtime/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml index 78f68d657..06f05df70 100644 --- a/charts/gitops-runtime/values.yaml +++ b/charts/gitops-runtime/values.yaml @@ -726,7 +726,7 @@ gitops-operator: # -- defaults registry: quay.io repository: codefresh/codefresh-gitops-operator - tag: aa271bd + tag: c409284 env: GITOPS_OPERATOR_VERSION: 0.11.1 serviceAccount: From 9a9603daf1a02dd30967b4ab56dd44228020d21d Mon Sep 17 00:00:00 2001 From: scme0 Date: Thu, 18 Sep 2025 10:28:09 +0200 Subject: [PATCH 2/5] update promotiontasks crd --- .../gitops-operator/crds/promotiontasks.yaml | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 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 abeb5ac5f..2cffd5dff 100644 --- a/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml +++ b/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml @@ -137,6 +137,10 @@ spec: type: object promoteAppWithCommit: properties: + commitDescription: + type: string + commitMessage: + type: string promotionValues: items: properties: @@ -164,7 +168,6 @@ spec: - file - properties type: object - minItems: 1 type: array targetApplication: properties: @@ -183,11 +186,19 @@ spec: - namespace type: object required: + - commitDescription + - commitMessage - promotionValues - targetApplication type: object promoteAppWithPR: properties: + prBranchName: + type: string + prDescription: + type: string + prTitle: + type: string promotionValues: items: properties: @@ -215,7 +226,6 @@ spec: - file - properties type: object - minItems: 1 type: array targetApplication: properties: @@ -234,6 +244,9 @@ spec: - namespace type: object required: + - prBranchName + - prDescription + - prTitle - promotionValues - targetApplication type: object @@ -373,10 +386,10 @@ spec: items: description: StepStatus properties: + failureSummary: + type: string getPromotionValues: properties: - error: - type: string phase: description: GetPromotionValuesStatusPhase enum: @@ -450,8 +463,6 @@ spec: minLength: 7 pattern: ^[A-Fa-f0-9]+$ type: string - error: - type: string phase: description: PromoteAppWithCommitPhase enum: @@ -480,8 +491,6 @@ spec: - health - sync type: object - error: - type: string phase: description: PromoteAppWithPRPhase enum: @@ -562,7 +571,10 @@ spec: - health - sync type: object - error: + commitSha: + maxLength: 40 + minLength: 7 + pattern: ^[A-Fa-f0-9]+$ type: string phase: description: VerifyAppPhase @@ -602,5 +614,3 @@ spec: storage: true subresources: status: {} - {{- end }} -{{- end }} From 7b2992b180916a3841174eb9b3709d464df69f1a Mon Sep 17 00:00:00 2001 From: scme0 Date: Thu, 18 Sep 2025 10:50:03 +0200 Subject: [PATCH 3/5] fix promotiontasks.yaml --- .../_components/gitops-operator/crds/promotiontasks.yaml | 2 ++ 1 file changed, 2 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 2cffd5dff..79033196d 100644 --- a/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml +++ b/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml @@ -614,3 +614,5 @@ spec: storage: true subresources: status: {} + {{- end }} +{{- end }} \ No newline at end of file From b4e6ce1084680c5484735c7765fbcb56dc4bf553 Mon Sep 17 00:00:00 2001 From: scme0 Date: Thu, 18 Sep 2025 10:53:59 +0200 Subject: [PATCH 4/5] lint --- charts/gitops-runtime/.gitignore | 4 +++- charts/gitops-runtime/.helmignore | 2 ++ .../_components/gitops-operator/crds/promotiontasks.yaml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/charts/gitops-runtime/.gitignore b/charts/gitops-runtime/.gitignore index 8f84b610d..c209341fa 100644 --- a/charts/gitops-runtime/.gitignore +++ b/charts/gitops-runtime/.gitignore @@ -1 +1,3 @@ -!charts/ \ No newline at end of file +!charts/ + +.DS_Store \ No newline at end of file diff --git a/charts/gitops-runtime/.helmignore b/charts/gitops-runtime/.helmignore index e7d076801..cffceec90 100644 --- a/charts/gitops-runtime/.helmignore +++ b/charts/gitops-runtime/.helmignore @@ -1,3 +1,5 @@ tests/ ci/ test-values/ + +.DS_Store 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 79033196d..efaa4d8ac 100644 --- a/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml +++ b/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml @@ -615,4 +615,4 @@ spec: subresources: status: {} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} From 28ff7c4e19043b61ccec672372a46a5c3fab5714 Mon Sep 17 00:00:00 2001 From: scme0 Date: Thu, 18 Sep 2025 11:34:09 +0200 Subject: [PATCH 5/5] fix changes to crd --- .../gitops-operator/crds/promotiontasks.yaml | 15 --------------- 1 file changed, 15 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 efaa4d8ac..ecd3dc7c7 100644 --- a/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml +++ b/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml @@ -137,10 +137,6 @@ spec: type: object promoteAppWithCommit: properties: - commitDescription: - type: string - commitMessage: - type: string promotionValues: items: properties: @@ -186,19 +182,11 @@ spec: - namespace type: object required: - - commitDescription - - commitMessage - promotionValues - targetApplication type: object promoteAppWithPR: properties: - prBranchName: - type: string - prDescription: - type: string - prTitle: - type: string promotionValues: items: properties: @@ -244,9 +232,6 @@ spec: - namespace type: object required: - - prBranchName - - prDescription - - prTitle - promotionValues - targetApplication type: object