Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/generate-diff.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
-v $(pwd)/output:/output \
-e TARGET_BRANCH=refs/pull/${{ github.event.number }}/merge \
-e REPO=${{ github.repository }} \
dagandersen/argocd-diff-preview:v0.1.27
dagandersen/argocd-diff-preview:v0.2.0

- name: Post diff as comment
run: |
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Check out [How it works](https://dag-andersen.github.io/argocd-diff-preview/how-
> -v $(pwd)/target-branch:/target-branch \
> -e TARGET_BRANCH=helm-example-3 \
> -e REPO=dag-andersen/argocd-diff-preview \
> dagandersen/argocd-diff-preview:v0.1.27
> dagandersen/argocd-diff-preview:v0.2.0
> ```
>
> and the output would be something like this:
Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:
-v $(pwd)/output:/output \
-e TARGET_BRANCH=refs/pull/${{ github.event.number }}/merge \
-e REPO=${{ github.repository }} \
dagandersen/argocd-diff-preview:v0.1.27
dagandersen/argocd-diff-preview:v0.2.0

- name: Post diff as comment
run: |
Expand Down
4 changes: 2 additions & 2 deletions docs/application-selection.md
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ jobs:
-v $(pwd)/main:/base-branch \
-v $(pwd)/pull-request:/target-branch \
-v $(pwd)/output:/output \
dagandersen/argocd-diff-preview:v0.1.27 \
dagandersen/argocd-diff-preview:v0.2.0 \
--target-branch=refs/pull/${{ github.event.number }}/merge \
--repo=${{ github.repository }} \
--auto-detect-files-changed=true \
Expand Down Expand Up @@ -236,7 +236,7 @@ jobs:
-e TARGET_BRANCH=refs/pull/${{ github.event.number }}/merge \
-e REPO=${{ github.repository }} \
-e FILES_CHANGED="${{ steps.changed-files.outputs.all_changed_files }}" \
dagandersen/argocd-diff-preview:v0.1.27
dagandersen/argocd-diff-preview:v0.2.0
```

---
Expand Down
2 changes: 1 addition & 1 deletion docs/cluster-generator.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,5 @@ jobs:
-v $(pwd)/secrets:/secrets \
-e TARGET_BRANCH=refs/pull/${{ github.event.number }}/merge \
-e REPO=${{ github.repository }} \
dagandersen/argocd-diff-preview:v0.1.27
dagandersen/argocd-diff-preview:v0.2.0
```
2 changes: 1 addition & 1 deletion docs/demo.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ docker run \
-v $(pwd)/target-branch:/target-branch \
-e TARGET_BRANCH=helm-example-3 \
-e REPO=dag-andersen/argocd-diff-preview \
dagandersen/argocd-diff-preview:v0.1.27
dagandersen/argocd-diff-preview:v0.2.0
```

and the output would be something like this:
Expand Down
4 changes: 2 additions & 2 deletions docs/getting-started/github-actions-workflow.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
-v $(pwd)/output:/output \
-e TARGET_BRANCH=refs/pull/${{ github.event.number }}/merge \
-e REPO=${{ github.repository }} \
dagandersen/argocd-diff-preview:v0.1.27
dagandersen/argocd-diff-preview:v0.2.0

- name: Post diff as comment
run: |
Expand Down Expand Up @@ -92,7 +92,7 @@ In the simple code examples above, we do not provide the cluster with any creden
-v $(pwd)/secrets:/secrets \ ⬅️ Mount the secrets folder
-e TARGET_BRANCH=refs/pull/${{ github.event.number }}/merge \
-e REPO=${{ github.repository }} \
dagandersen/argocd-diff-preview:v0.1.27
dagandersen/argocd-diff-preview:v0.2.0
```

!!! tip "Extracting secrets from an existing Argo CD installation"
Expand Down
4 changes: 2 additions & 2 deletions docs/getting-started/gitlab-cicd.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ diff:
-v $(pwd)/target-branch:/target-branch \
-e TARGET_BRANCH=${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME} \
-e REPO=${CI_MERGE_REQUEST_PROJECT_PATH} \
dagandersen/argocd-diff-preview:v0.1.27
dagandersen/argocd-diff-preview:v0.2.0
- |
jq --null-input --rawfile msg $(pwd)/output/diff.md '{body: $msg}' > pr_comment.json
NOTE_ID=$(curl --silent --header "PRIVATE-TOKEN: ${GITLAB_TOKEN}" \
Expand Down Expand Up @@ -97,7 +97,7 @@ In the simple code example above, we do not provide the cluster with any credent
-v $(pwd)/secrets:/secrets \ ⬅️ Mount the secrets folder
-e TARGET_BRANCH=${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME} \
-e REPO=${CI_MERGE_REQUEST_PROJECT_PATH} \
dagandersen/argocd-diff-preview:v0.1.27
dagandersen/argocd-diff-preview:v0.2.0

```

Expand Down
4 changes: 2 additions & 2 deletions docs/getting-started/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
-e TARGET_BRANCH=<branch-a> \
-e BASE_BRANCH=<branch-b> \
-e REPO=<owner>/<repo> \
dagandersen/argocd-diff-preview:v0.1.27
dagandersen/argocd-diff-preview:v0.2.0
```

If base-branch(`BASE_BRANCH`) is not specified it will default to `main`.
Expand All @@ -52,7 +52,7 @@
*Example for downloading and running on macOS:*

```bash
curl -LJO https://github.com/dag-andersen/argocd-diff-preview/releases/download/v0.1.27/argocd-diff-preview-Darwin-x86_64.tar.gz
curl -LJO https://github.com/dag-andersen/argocd-diff-preview/releases/download/v0.2.0/argocd-diff-preview-Darwin-x86_64.tar.gz
tar -xvf argocd-diff-preview-Darwin-x86_64.tar.gz
sudo mv argocd-diff-preview /usr/local/bin
argocd-diff-preview --help
Expand Down
4 changes: 2 additions & 2 deletions docs/getting-started/self-hosted-gh-runner.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ jobs:
-v $(pwd)/output:/output \
-e TARGET_BRANCH=refs/pull/${{ github.event.number }}/merge \
-e REPO=${{ github.repository }} \
dagandersen/argocd-diff-preview:v0.1.27
dagandersen/argocd-diff-preview:v0.2.0

- name: Post diff as comment
run: |
Expand Down Expand Up @@ -174,6 +174,6 @@ Add the `--kind-options` flag to your workflow to use the custom configuration:
-v $(pwd)/output:/output \
-e TARGET_BRANCH=refs/pull/${{ github.event.number }}/merge \
-e REPO=${{ github.repository }} \
dagandersen/argocd-diff-preview:v0.1.27 \
dagandersen/argocd-diff-preview:v0.2.0 \
--kind-options '--config /base-branch/hack/kind.yaml'
```
2 changes: 1 addition & 1 deletion docs/how-it-works.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ You can do this by mounting a `/secrets` folder:
-v $(pwd)/secrets:/secrets \ ⬅️ Mount the secrets folder
-e TARGET_BRANCH=refs/pull/${{ github.event.number }}/merge \
-e REPO=${{ github.repository }} \
dagandersen/argocd-diff-preview:v0.1.27
dagandersen/argocd-diff-preview:v0.2.0
```

All resources in the `/secrets` folder are applied to the cluster. The relevant secrets are typically included in the `/secrets` folder:
Expand Down
10 changes: 5 additions & 5 deletions docs/multi-repo.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ docker run \
-v $(pwd)/output:/output \
-e REPO=<org>/<repo-with-pr> \ ⬅️ Must match the repo with the PR
-e TARGET_BRANCH=<pr-branch> \ ⬅️ The branch to redirect applications to
dagandersen/argocd-diff-preview:v0.1.27
dagandersen/argocd-diff-preview:v0.2.0
```

!!! note "Why does this matter?"
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
-v $(pwd)/secrets:/secrets \ ⬅️ Mount the secrets folder
-e TARGET_BRANCH=<pr-branch> \ ⬅️ The PR branch on the Application Repository
-e REPO=<org>/<application-repository> \ ⬅️ Application Repository
dagandersen/argocd-diff-preview:v0.1.27
dagandersen/argocd-diff-preview:v0.2.0

- name: Post diff as comment
run: |
Expand Down Expand Up @@ -158,7 +158,7 @@ docker run \
-v $(pwd)/secrets:/secrets \
-e TARGET_BRANCH=<pr-branch> \
-e REPO=<org>/<application-repository> \
dagandersen/argocd-diff-preview:v0.1.27
dagandersen/argocd-diff-preview:v0.2.0
```

### Pipeline in the Resource Repository
Expand Down Expand Up @@ -245,7 +245,7 @@ jobs:
-v $(pwd)/secrets:/secrets \ ⬅️ Mount the secrets folder
-e TARGET_BRANCH=<pr-branch> \ ⬅️ The PR branch on the Resource Repository
-e REPO=<org>/<resource-repository> \ ⬅️ Resource Repository (where the PR is!)
dagandersen/argocd-diff-preview:v0.1.27
dagandersen/argocd-diff-preview:v0.2.0

- name: Post diff as comment
run: |
Expand Down Expand Up @@ -276,7 +276,7 @@ docker run \
-v $(pwd)/secrets:/secrets \
-e TARGET_BRANCH=<pr-branch> \
-e REPO=<org>/<resource-repository> \
dagandersen/argocd-diff-preview:v0.1.27
dagandersen/argocd-diff-preview:v0.2.0
```

---
Expand Down
2 changes: 1 addition & 1 deletion docs/reusing-clusters/branch-vs-sha.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,5 @@ For other CI/CD platforms (GitLab CI, Jenkins, CircleCI, etc.), consult their do
-v $(pwd)/output:/output \
-e TARGET_BRANCH=${{ github.event.pull_request.head.sha }} # ✅ Use SHA
-e REPO=${{ github.repository }} \
dagandersen/argocd-diff-preview:v0.1.27
dagandersen/argocd-diff-preview:v0.2.0
```
2 changes: 1 addition & 1 deletion docs/reusing-clusters/connecting.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ docker run \
-v $(pwd)/target-branch:/target-branch \
-e TARGET_BRANCH=helm-example-3 \
-e REPO=dag-andersen/argocd-diff-preview \
dagandersen/argocd-diff-preview:v0.1.27 \
dagandersen/argocd-diff-preview:v0.2.0 \
--argocd-namespace=argocd-diff-preview \
--create-cluster=false
```
Expand Down
2 changes: 1 addition & 1 deletion docs/reusing-clusters/lockdown-mode.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ docker run \
-v $(pwd)/target-branch:/target-branch \
-e TARGET_BRANCH=my-feature-branch \
-e REPO=my-org/my-repo \
dagandersen/argocd-diff-preview:v0.1.27 \
dagandersen/argocd-diff-preview:v0.2.0 \
--argocd-namespace=argocd-diff-preview \
--create-cluster=false \
--render-method=server-api
Expand Down
2 changes: 1 addition & 1 deletion docs/reusing-clusters/openshift.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ RUN curl -sSL -o argocd-linux-amd64 https://github.com/argoproj/argo-cd/releases
argocd version || true

# argocd-diff-preview CLI
RUN curl -LJO https://github.com/dag-andersen/argocd-diff-preview/releases/download/v0.1.27/argocd-diff-preview-Linux-x86_64.tar.gz && \
RUN curl -LJO https://github.com/dag-andersen/argocd-diff-preview/releases/download/v0.2.0/argocd-diff-preview-Linux-x86_64.tar.gz && \
tar -xvf argocd-diff-preview-Linux-x86_64.tar.gz && \
mv argocd-diff-preview /usr/local/bin && \
argocd-diff-preview --version
Expand Down
4 changes: 2 additions & 2 deletions docs/reusing-clusters/self-hosted-gh-runner.md
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ jobs:

- name: Install argocd-diff-preview
run: |
curl -LJO https://github.com/dag-andersen/argocd-diff-preview/releases/download/v0.1.27/argocd-diff-preview-Linux-x86_64.tar.gz
curl -LJO https://github.com/dag-andersen/argocd-diff-preview/releases/download/v0.2.0/argocd-diff-preview-Linux-x86_64.tar.gz
tar -xvf argocd-diff-preview-Linux-x86_64.tar.gz
sudo mv argocd-diff-preview /usr/local/bin
argocd-diff-preview --version
Expand Down Expand Up @@ -247,7 +247,7 @@ If you prefer to use the Docker image (requires Docker installed on runner pods)
-v $(pwd)/target-branch:/target-branch \
-e TARGET_BRANCH=refs/pull/${{ github.event.number }}/merge \
-e REPO=${{ github.repository }} \
dagandersen/argocd-diff-preview:v0.1.27 \
dagandersen/argocd-diff-preview:v0.2.0 \
--argocd-namespace=argocd-diff-preview \
--create-cluster=false
```
Expand Down
2 changes: 2 additions & 0 deletions examples/internal-chart/app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ spec:
helm:
valueFiles:
- $local-files/examples/helm/values/my-app.yaml
valuesObject:
replicas: 5