wip

pedjak · Nov 24, 2023 · e77416a · e77416a
1 parent e5e5637
commit e77416a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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