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 cac9a9d6..66362d92 100644 --- a/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml +++ b/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml @@ -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: @@ -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 @@ -413,7 +441,6 @@ spec: phase: description: PromotionTaskPhase enum: - - Pending - Executing - Terminating - Succeeded @@ -470,7 +497,6 @@ spec: phase: description: PromotionTaskPhase enum: - - Pending - Executing - Terminating - Succeeded @@ -487,6 +513,8 @@ spec: type: string healthMessage: type: string + revision: + type: string sync: description: SyncStatusCode is a type which represents possible comparison results @@ -500,11 +528,29 @@ spec: - healthMessage - sync type: object - commitSha: - maxLength: 40 - minLength: 7 - pattern: (^[A-Fa-f0-9]+$|^$) - 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]+$|^$) + type: string + type: object phase: description: PromoteAppWithCommitPhase enum: @@ -525,6 +571,8 @@ spec: type: string healthMessage: type: string + revision: + type: string sync: description: SyncStatusCode is a type which represents possible comparison results @@ -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]+$|^$) + type: string + type: object phase: description: PromoteAppWithPRPhase enum: @@ -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]+$|^$) + type: string + type: object + phase: + description: RevertPromotionCommitPhase + enum: + - Unknown + - Pending + - RevertDone + - Syncing + - Complete + type: string + required: + - phase + type: object runWorkflow: properties: nodes: @@ -613,6 +743,8 @@ spec: type: string healthMessage: type: string + revision: + type: string sync: description: SyncStatusCode is a type which represents possible comparison results @@ -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 diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml index 63a07799..52a76a82 100644 --- a/charts/gitops-runtime/values.yaml +++ b/charts/gitops-runtime/values.yaml @@ -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: [] @@ -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: