Skip to content

Commit cc51a0b

Browse files
authored
Merge branch 'main' into zhaque44-utils-test
2 parents 69be3cf + 2c82d83 commit cc51a0b

File tree

4 files changed

+14
-10
lines changed

4 files changed

+14
-10
lines changed

.github/workflows/ci-e2e.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
timeout-minutes: 10
2222
steps:
2323
- name: Set up Go
24-
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # pin@v5
24+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # pin@v5
2525
with:
2626
go-version: '1.23'
2727
# see https://github.com/actions/setup-go?tab=readme-ov-file#caching-dependency-files-and-build-outputs

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Checkout Repo
1717
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # pin@v4
1818
- name: Set up Go
19-
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # pin@v5
19+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # pin@v5
2020
with:
2121
go-version: "1.23"
2222
- name: Get dependencies
@@ -67,7 +67,7 @@ jobs:
6767
- name: Checkout Repo
6868
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # pin@v4
6969
- name: Set up Go
70-
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # pin@v5
70+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # pin@v5
7171
with:
7272
go-version: "1.23"
7373
- name: go mod tidy

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
fetch-depth: 0
2727

2828
- name: Setup Go
29-
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
29+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
3030
with:
3131
go-version: "1.23"
3232

docs/tool-comparison.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ were introduced.
3030
| **Home-Grown CI Solution** | Whatever you want | Whatever you want | Whatever you want |
3131
| **Telefonistka** | Environment directory contents | Automated PR (DRY branch) | When branch protection rules pass |
3232
| **Kargo** | git commits, image tags, or Helm chart versions | A variety of options (PRs, commits, out-of-sync apps) | Defined by a DAG and a variety of rules |
33-
| **Codefresh Products** | json-path-specified fields | Codefresh backend | Manually or according to promotion rules |
33+
| **Codefresh GitOps** | json-paths in Helm/Kustomize/or other manifests | Automated PR or commit (DRY) in folder or branch | When promotion policies are met |
3434

3535
## GitOps Promoter
3636

@@ -71,14 +71,18 @@ be assembled in a DAG. You can interact with the DAG via a custom UI/CLI.
7171
pushing a commit, leaving "freight" as "unqualified" (represented as status fields on CRs)
7272
3. When to promote: defined by a DAG and a variety of rules such as manual approval or Argo CD app health
7373

74-
## Codefresh Products
74+
## Codefresh GitOps
7575

76-
This tool uses file selectors and json paths. You can structure your git repo however you want. Then you write file
76+
[Codefresh GitOps' promotion feature](https://codefresh.io/docs/docs/promotions/promotions-overview/) uses file selectors and json paths. You can structure your git repo however you want. Then you write file
7777
selectors and json paths to determine which parts of the repo should be moved from file to file. For example, if your
7878
app is structured as a Helm chart with environment-specific values files, you can define your promotion rules to copy
7979
the .image.tag field from the values-dev.yaml file to the values-prod.yaml file.
8080

81-
1. What to promote: json-path-specified fields from lower-env yaml files to higher-env files
82-
2. How to "hold" the change: Codefresh backend
83-
3. When to promote: manually or according to promotion rules (TODO: further research this part)
81+
This tool tracks the relationship between Argo CD applications by using a "product" name and then groups those products by "environment". An Environment can be any combination of clusters, namespaces, or Application annotations. Changes are coordinated by the GitOps control plane across any number of Argo instances, clusters, or applications.
82+
83+
Currently, diffing is limited to DRY manifests with [hydrated server-side rendered diffs planned](https://roadmap.codefresh.io/c/128-promotion-preview).
84+
85+
1. What to promote: json-path-specified fields from lower-env yaml files to higher-env files between Argo CD applications linked by a "product" name"
86+
2. How to "hold" the change: Pull Request or Commit
87+
3. When to promote: when promotion policies are met, for example, tests pass, approvals are given, pull request requirements are met, environment has certain tags, or manual promotion is allowed (drag and drop).
8488

0 commit comments

Comments
 (0)