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..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: @@ -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 diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml index d0563059..5bfa11f6 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 @@ -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 @@ -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