From f109454eee5aaf756e0e0990abb9fab257e345dc Mon Sep 17 00:00:00 2001 From: Allen Porter Date: Sun, 24 Dec 2023 02:51:55 +0000 Subject: [PATCH 1/5] Diff test --- tests/testdata/cluster/apps/base/podinfo/kustomization.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testdata/cluster/apps/base/podinfo/kustomization.yaml b/tests/testdata/cluster/apps/base/podinfo/kustomization.yaml index b9b173da..95598168 100644 --- a/tests/testdata/cluster/apps/base/podinfo/kustomization.yaml +++ b/tests/testdata/cluster/apps/base/podinfo/kustomization.yaml @@ -3,5 +3,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: podinfo resources: - - namespace.yaml + #- namespace.yaml - release.yaml From 34899f59311e18ce831ddc97fa8565ca238477c0 Mon Sep 17 00:00:00 2001 From: Allen Porter Date: Sun, 24 Dec 2023 02:54:39 +0000 Subject: [PATCH 2/5] Add diff debug output --- action/diff/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/action/diff/action.yml b/action/diff/action.yml index f8214439..14316b19 100644 --- a/action/diff/action.yml +++ b/action/diff/action.yml @@ -110,6 +110,7 @@ runs: - name: Generate Diff output id: flux_diff_output run: | + wc -l diff.patch delimiter="$(openssl rand -hex 8)" echo "diff<<${delimiter}" >> $GITHUB_OUTPUT cat diff.patch >> $GITHUB_OUTPUT From 771255c2ea6f3ffd1908f1774f7d90c572ac534e Mon Sep 17 00:00:00 2001 From: Allen Porter Date: Sun, 24 Dec 2023 03:00:23 +0000 Subject: [PATCH 3/5] Fix diff output --- action/diff/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action/diff/action.yml b/action/diff/action.yml index 14316b19..a9df609c 100644 --- a/action/diff/action.yml +++ b/action/diff/action.yml @@ -46,7 +46,7 @@ inputs: outputs: diff: description: Output of the diff command or empty if there is no diff - value: ${{ steps.flux_diff.outputs.diff }} + value: ${{ steps.flux_diff_output.outputs.diff }} runs: using: "composite" steps: From 6a93fc4f4a493481b364d13760d9ba5f4f5d9dea Mon Sep 17 00:00:00 2001 From: Allen Porter Date: Sun, 24 Dec 2023 03:01:48 +0000 Subject: [PATCH 4/5] Revert kustomizatoin change --- tests/testdata/cluster/apps/base/podinfo/kustomization.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testdata/cluster/apps/base/podinfo/kustomization.yaml b/tests/testdata/cluster/apps/base/podinfo/kustomization.yaml index 95598168..b9b173da 100644 --- a/tests/testdata/cluster/apps/base/podinfo/kustomization.yaml +++ b/tests/testdata/cluster/apps/base/podinfo/kustomization.yaml @@ -3,5 +3,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: podinfo resources: - #- namespace.yaml + - namespace.yaml - release.yaml From d7a35e867cf913dc0ce75d09eac54cc57165de77 Mon Sep 17 00:00:00 2001 From: Allen Porter Date: Sun, 24 Dec 2023 03:02:59 +0000 Subject: [PATCH 5/5] Remove wc debug output --- action/diff/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/action/diff/action.yml b/action/diff/action.yml index a9df609c..141072b8 100644 --- a/action/diff/action.yml +++ b/action/diff/action.yml @@ -110,7 +110,6 @@ runs: - name: Generate Diff output id: flux_diff_output run: | - wc -l diff.patch delimiter="$(openssl rand -hex 8)" echo "diff<<${delimiter}" >> $GITHUB_OUTPUT cat diff.patch >> $GITHUB_OUTPUT