From fc94b1af7a95686c09efead6979bc8c91663b66e Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Wed, 24 Nov 2021 11:27:59 +0100 Subject: [PATCH 1/2] Revert "Merge pull request #2107 from chanwit/json_schemas" This reverts commit 75a18b454883641347ed952268209fd97806d1d0, reversing changes made to e72214e26689381c9e5c2f0940b71afb86c4f66b. Signed-off-by: Hidde Beydals --- .github/workflows/release.yaml | 2 -- .goreleaser.yml | 1 - 2 files changed, 3 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index cdba2f74..e00167d0 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -61,10 +61,8 @@ jobs: with: crd: all-crds.yaml output: schemas - combined_filename: crd-schemas.json - name: Archive the OpenAPI JSON schemas run: | - mv schemas/crd-schemas.json ./output/crd-schemas.json tar -czvf ./output/crd-schemas.tar.gz -C schemas . - name: Run GoReleaser uses: goreleaser/goreleaser-action@v1 diff --git a/.goreleaser.yml b/.goreleaser.yml index 480c3ba2..b57017b1 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -83,7 +83,6 @@ release: - glob: ./output/crd-schemas.tar.gz - glob: ./output/manifests.tar.gz - glob: ./output/install.yaml - - glob: ./output/crd-schemas.json dockers: - image_templates: - 'fluxcd/flux-cli:{{ .Tag }}-amd64' From bb04ca36b29891074ef0e01f56fb01169e75b659 Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Wed, 24 Nov 2021 11:33:10 +0100 Subject: [PATCH 2/2] Pin `crdjsonschema` action to commit Pinned to commit before https://github.com/fluxcd/pkg/pull/189 due to introduction faulty behavior. Signed-off-by: Hidde Beydals --- .github/workflows/release.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index e00167d0..6c599da5 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -56,8 +56,10 @@ jobs: - name: Build CRDs run: | kustomize build manifests/crds > all-crds.yaml + # Pinned to commit before https://github.com/fluxcd/pkg/pull/189 due to + # introduction faulty behavior. - name: Generate OpenAPI JSON schemas from CRDs - uses: fluxcd/pkg//actions/crdjsonschema@main + uses: fluxcd/pkg//actions/crdjsonschema@49e26aa2ee9e734c3233c560253fd9542afe18ae with: crd: all-crds.yaml output: schemas