From 1a679ee05d8e382d976c6cd5f78b3a98e250222c Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Thu, 1 Oct 2020 19:53:30 +0200 Subject: [PATCH] Remove creationTimestamp leading spaces --- .github/workflows/bootstrap.yaml | 4 ++++ .github/workflows/e2e.yaml | 7 +++++++ cmd/gotk/export.go | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/bootstrap.yaml b/.github/workflows/bootstrap.yaml index b4f8748a..99c9ea57 100644 --- a/.github/workflows/bootstrap.yaml +++ b/.github/workflows/bootstrap.yaml @@ -34,6 +34,7 @@ jobs: ./bin/gotk bootstrap github --manifests ./manifests/install/ \ --owner=fluxcd-testing \ --repository=gotk-test-${{ steps.vars.outputs.sha_short }} \ + --branch=main \ --path=test-cluster env: GITHUB_TOKEN: ${{ secrets.GITPROVIDER_BOT_TOKEN }} @@ -42,6 +43,7 @@ jobs: ./bin/gotk bootstrap github --manifests ./manifests/install/ \ --owner=fluxcd-testing \ --repository=gotk-test-${{ steps.vars.outputs.sha_short }} \ + --branch=main \ --path=test-cluster env: GITHUB_TOKEN: ${{ secrets.GITPROVIDER_BOT_TOKEN }} @@ -54,6 +56,7 @@ jobs: ./bin/gotk bootstrap github --manifests ./manifests/install/ \ --owner=fluxcd-testing \ --repository=gotk-test-${{ steps.vars.outputs.sha_short }} \ + --branch=main \ --path=test-cluster env: GITHUB_TOKEN: ${{ secrets.GITPROVIDER_BOT_TOKEN }} @@ -62,6 +65,7 @@ jobs: ./bin/gotk bootstrap github --manifests ./manifests/install/ \ --owner=fluxcd-testing \ --repository=gotk-test-${{ steps.vars.outputs.sha_short }} \ + --branch=main \ --path=test-cluster \ --delete env: diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index a73450ea..80f713f1 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -49,6 +49,13 @@ jobs: ./bin/gotk create source git podinfo \ --url https://github.com/stefanprodan/podinfo \ --tag-semver=">=3.2.3" + - name: gotk create source git export apply + run: | + ./bin/gotk create source git podinfo-export \ + --url https://github.com/stefanprodan/podinfo \ + --tag-semver=">=3.2.3" \ + --export | kubectl apply -f - + ./bin/gotk delete source git podinfo-export --silent - name: gotk get sources git run: | ./bin/gotk get sources git diff --git a/cmd/gotk/export.go b/cmd/gotk/export.go index 750def2e..652e2396 100644 --- a/cmd/gotk/export.go +++ b/cmd/gotk/export.go @@ -39,7 +39,7 @@ func init() { } func resourceToString(data []byte) string { - data = bytes.Replace(data, []byte("creationTimestamp: null\n"), []byte(""), 1) + data = bytes.Replace(data, []byte(" creationTimestamp: null\n"), []byte(""), 1) data = bytes.Replace(data, []byte("status: {}\n"), []byte(""), 1) return string(data) }