From 0d63c675278569f87273537f8a401b6e2b6f6406 Mon Sep 17 00:00:00 2001 From: Predrag Knezevic Date: Thu, 23 Nov 2023 17:21:44 +0100 Subject: [PATCH 1/3] wip --- .github/workflows/diff.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/diff.yaml b/.github/workflows/diff.yaml index fa48c59..021585e 100644 --- a/.github/workflows/diff.yaml +++ b/.github/workflows/diff.yaml @@ -13,4 +13,4 @@ jobs: uses: pedjak/crossplane-diff-action@action with: dir: examples - github-token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + github-token: ${{ secrets.GITHUB_TOKEN }} From e5e563735ce4c4dea15c44ab091cd9e19136f4ce Mon Sep 17 00:00:00 2001 From: Predrag Knezevic Date: Thu, 23 Nov 2023 17:21:44 +0100 Subject: [PATCH 2/3] wip --- .github/workflows/diff.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/diff.yaml b/.github/workflows/diff.yaml index 021585e..bbf34c2 100644 --- a/.github/workflows/diff.yaml +++ b/.github/workflows/diff.yaml @@ -13,4 +13,8 @@ jobs: uses: pedjak/crossplane-diff-action@action with: dir: examples +<<<<<<< HEAD github-token: ${{ secrets.GITHUB_TOKEN }} +======= + token: ${{ secrets.GITHUB_TOKEN }} +>>>>>>> 4432273 (wip) From e77416a261e004bf7acc78a26b6f302000340664 Mon Sep 17 00:00:00 2001 From: Predrag Knezevic Date: Thu, 23 Nov 2023 17:22:59 +0100 Subject: [PATCH 3/3] wip --- .github/workflows/diff.yaml | 4 ---- examples/xr-cluster.yaml | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/diff.yaml b/.github/workflows/diff.yaml index bbf34c2..021585e 100644 --- a/.github/workflows/diff.yaml +++ b/.github/workflows/diff.yaml @@ -13,8 +13,4 @@ jobs: uses: pedjak/crossplane-diff-action@action with: dir: examples -<<<<<<< HEAD github-token: ${{ secrets.GITHUB_TOKEN }} -======= - token: ${{ secrets.GITHUB_TOKEN }} ->>>>>>> 4432273 (wip) diff --git a/examples/xr-cluster.yaml b/examples/xr-cluster.yaml index b5b146d..a33de4b 100644 --- a/examples/xr-cluster.yaml +++ b/examples/xr-cluster.yaml @@ -3,12 +3,13 @@ kind: XCluster metadata: name: aws-spoke-01 annotations: + foo: "3" crossplane.io/render-composition-path: apis/cluster/composition.yaml crossplane.io/render-function-path: examples/functions.yaml spec: parameters: id: aws-spoke-02 - region: us-west-2 + region: us-west-1 version: "1.26" nodes: count: 5