From ee5007c6e6ac5115c28b50991db65bc20853f2ff Mon Sep 17 00:00:00 2001 From: Dexter Yan Date: Tue, 15 Oct 2024 17:41:49 +1300 Subject: [PATCH 01/23] test --- .github/workflows/build-test-deploy.yaml | 7 ++++++- Makefile | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test-deploy.yaml b/.github/workflows/build-test-deploy.yaml index aaa83179f..abae29978 100644 --- a/.github/workflows/build-test-deploy.yaml +++ b/.github/workflows/build-test-deploy.yaml @@ -73,12 +73,17 @@ jobs: go-version: "1.22" - name: setup env run: | + go env GOPATH echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV echo "$(go env GOPATH)/bin" >> $GITHUB_PATH shell: bash - uses: actions/checkout@v4 with: fetch-depth: 0 + - name: check paths + run: | + pwd + ls -la - run: make check-schemas compile-preflight: @@ -386,4 +391,4 @@ jobs: # if the validate-pr-tests job was successful, this job will succeed - name: succeed if validate-pr-tests job succeeded if: needs.validate-pr-tests.result == 'success' - run: echo "Validation succeeded" \ No newline at end of file + run: echo "Validation succeeded" diff --git a/Makefile b/Makefile index e85f845f6..08f850a31 100644 --- a/Makefile +++ b/Makefile @@ -131,7 +131,7 @@ generate: controller-gen client-gen $(CONTROLLER_GEN) \ object:headerFile=./hack/boilerplate.go.txt paths=./pkg/apis/... $(CLIENT_GEN) \ - --output-base=./../../../ \ + --output-base=${GOPATH}/src \ --output-package=github.com/replicatedhq/troubleshoot/pkg/client \ --clientset-name troubleshootclientset \ --input-base github.com/replicatedhq/troubleshoot/pkg/apis \ From e1523b1c8c63180c635755dbca05f5f605a1c468 Mon Sep 17 00:00:00 2001 From: Dexter Yan Date: Tue, 15 Oct 2024 17:51:29 +1300 Subject: [PATCH 02/23] test --- .github/workflows/build-test-deploy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-test-deploy.yaml b/.github/workflows/build-test-deploy.yaml index abae29978..9edcb4634 100644 --- a/.github/workflows/build-test-deploy.yaml +++ b/.github/workflows/build-test-deploy.yaml @@ -80,6 +80,7 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 + path: /home/runner/go - name: check paths run: | pwd From a680b46f7c657d797f75109625d468a6a742e582 Mon Sep 17 00:00:00 2001 From: Dexter Yan Date: Tue, 15 Oct 2024 18:21:15 +1300 Subject: [PATCH 03/23] test 2 --- .github/workflows/build-test-deploy.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-test-deploy.yaml b/.github/workflows/build-test-deploy.yaml index 9edcb4634..6fce06343 100644 --- a/.github/workflows/build-test-deploy.yaml +++ b/.github/workflows/build-test-deploy.yaml @@ -74,13 +74,13 @@ jobs: - name: setup env run: | go env GOPATH - echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV - echo "$(go env GOPATH)/bin" >> $GITHUB_PATH + echo "GOPATH=/home/runner/work/troubleshoot/troubleshoot" >> $GITHUB_ENV + echo "/home/runner/work/troubleshoot/troubleshoot/bin" >> $GITHUB_PATH shell: bash - uses: actions/checkout@v4 with: fetch-depth: 0 - path: /home/runner/go + path: go - name: check paths run: | pwd From 0744104a0aadd54c0df95c8423b47e340df5a4f3 Mon Sep 17 00:00:00 2001 From: Dexter Yan Date: Tue, 15 Oct 2024 18:23:02 +1300 Subject: [PATCH 04/23] test 2 --- .github/workflows/build-test-deploy.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-test-deploy.yaml b/.github/workflows/build-test-deploy.yaml index 6fce06343..f2728c4fa 100644 --- a/.github/workflows/build-test-deploy.yaml +++ b/.github/workflows/build-test-deploy.yaml @@ -80,7 +80,6 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - path: go - name: check paths run: | pwd From 130533eddf97db0b022d6bc4a7912239c6b0a782 Mon Sep 17 00:00:00 2001 From: Dexter Yan Date: Tue, 15 Oct 2024 18:26:01 +1300 Subject: [PATCH 05/23] test 2 --- .github/workflows/build-test-deploy.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-test-deploy.yaml b/.github/workflows/build-test-deploy.yaml index f2728c4fa..5b07479ca 100644 --- a/.github/workflows/build-test-deploy.yaml +++ b/.github/workflows/build-test-deploy.yaml @@ -80,11 +80,10 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - name: check paths - run: | - pwd - ls -la - - run: make check-schemas + path: src + - run: | + cd src + make check-schemas compile-preflight: runs-on: ubuntu-latest From 507990cdc9b4dee13183d1e23d1538bf3f051e3c Mon Sep 17 00:00:00 2001 From: Dexter Yan Date: Wed, 16 Oct 2024 10:13:35 +1300 Subject: [PATCH 06/23] test2 --- .github/workflows/build-test-deploy.yaml | 10 +++------- Makefile | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-test-deploy.yaml b/.github/workflows/build-test-deploy.yaml index 5b07479ca..4d87bbc58 100644 --- a/.github/workflows/build-test-deploy.yaml +++ b/.github/workflows/build-test-deploy.yaml @@ -73,17 +73,13 @@ jobs: go-version: "1.22" - name: setup env run: | - go env GOPATH - echo "GOPATH=/home/runner/work/troubleshoot/troubleshoot" >> $GITHUB_ENV - echo "/home/runner/work/troubleshoot/troubleshoot/bin" >> $GITHUB_PATH + echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV + echo "$(go env GOPATH)/bin" >> $GITHUB_PATH shell: bash - uses: actions/checkout@v4 with: fetch-depth: 0 - path: src - - run: | - cd src - make check-schemas + - run: make check-schemas compile-preflight: runs-on: ubuntu-latest diff --git a/Makefile b/Makefile index 08f850a31..9bd98b780 100644 --- a/Makefile +++ b/Makefile @@ -131,7 +131,7 @@ generate: controller-gen client-gen $(CONTROLLER_GEN) \ object:headerFile=./hack/boilerplate.go.txt paths=./pkg/apis/... $(CLIENT_GEN) \ - --output-base=${GOPATH}/src \ + --output-base=$$(pwd)/../../../ \ --output-package=github.com/replicatedhq/troubleshoot/pkg/client \ --clientset-name troubleshootclientset \ --input-base github.com/replicatedhq/troubleshoot/pkg/apis \ From 1a84e3509b5885e3533404ee415e1af5d68a5fc9 Mon Sep 17 00:00:00 2001 From: Dexter Yan Date: Wed, 16 Oct 2024 10:21:31 +1300 Subject: [PATCH 07/23] test 3 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9bd98b780..457153c60 100644 --- a/Makefile +++ b/Makefile @@ -145,7 +145,7 @@ openapischema: controller-gen controller-gen crd +output:dir=./config/crds paths=./pkg/apis/troubleshoot/v1beta2 check-schemas: generate schemas - @if [ -n "$(shell git status --short)" ]; then \ + @if [ -n "$$(git status --short)" ]; then \ echo -e "\033[31mThe git repo is dirty :( Ensure all generated files are committed e.g CRD schema files\033[0;m"; \ git status --short; \ exit 1; \ From 354c647966ee3caafaab71f2c48c70db494845e8 Mon Sep 17 00:00:00 2001 From: Dexter Yan Date: Wed, 16 Oct 2024 10:24:42 +1300 Subject: [PATCH 08/23] test 3 --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 457153c60..a2f8bb37e 100644 --- a/Makefile +++ b/Makefile @@ -145,6 +145,7 @@ openapischema: controller-gen controller-gen crd +output:dir=./config/crds paths=./pkg/apis/troubleshoot/v1beta2 check-schemas: generate schemas + git status --short @if [ -n "$$(git status --short)" ]; then \ echo -e "\033[31mThe git repo is dirty :( Ensure all generated files are committed e.g CRD schema files\033[0;m"; \ git status --short; \ From 2884a9c9682d8f813327eaacd04badbf08dabf6f Mon Sep 17 00:00:00 2001 From: Dexter Yan Date: Wed, 16 Oct 2024 10:33:47 +1300 Subject: [PATCH 09/23] test 3 --- .../typed/troubleshoot/v1beta2/supportbundle.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go b/pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go index 521f4df90..c8fff5666 100644 --- a/pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go +++ b/pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go @@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by client-gen. DO NOT EDIT. +// Code generated by client-gen. DO NOT EDIT. -------------------------------- package v1beta2 From ff0cc6c35b0a0678f682469113d179c59ef5137b Mon Sep 17 00:00:00 2001 From: Dexter Yan Date: Wed, 16 Oct 2024 10:41:11 +1300 Subject: [PATCH 10/23] test 3 --- .github/workflows/build-test-deploy.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-test-deploy.yaml b/.github/workflows/build-test-deploy.yaml index 4d87bbc58..dba9f2616 100644 --- a/.github/workflows/build-test-deploy.yaml +++ b/.github/workflows/build-test-deploy.yaml @@ -79,6 +79,9 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 + - name: check files + run: | + cat pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go - run: make check-schemas compile-preflight: From be8152c2a9cd00cfc7d31b5cd85d1c31fd93a87f Mon Sep 17 00:00:00 2001 From: Dexter Yan Date: Wed, 16 Oct 2024 10:50:05 +1300 Subject: [PATCH 11/23] test 3 --- .github/workflows/build-test-deploy.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-test-deploy.yaml b/.github/workflows/build-test-deploy.yaml index dba9f2616..9ccf492b3 100644 --- a/.github/workflows/build-test-deploy.yaml +++ b/.github/workflows/build-test-deploy.yaml @@ -83,6 +83,8 @@ jobs: run: | cat pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go - run: make check-schemas + - run: | + ls $$(pwd)/../../../github.com/replicatedhq/troubleshoot/pkg/client compile-preflight: runs-on: ubuntu-latest From 5b07057fea752b6a48cc3576b5947b61ba764321 Mon Sep 17 00:00:00 2001 From: Dexter Yan Date: Wed, 16 Oct 2024 10:52:48 +1300 Subject: [PATCH 12/23] test 3 --- .github/workflows/build-test-deploy.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-test-deploy.yaml b/.github/workflows/build-test-deploy.yaml index 9ccf492b3..fb65a3f66 100644 --- a/.github/workflows/build-test-deploy.yaml +++ b/.github/workflows/build-test-deploy.yaml @@ -84,7 +84,9 @@ jobs: cat pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go - run: make check-schemas - run: | - ls $$(pwd)/../../../github.com/replicatedhq/troubleshoot/pkg/client + pwd + echo $$(pwd) + cat pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go compile-preflight: runs-on: ubuntu-latest From 7207dd5f605546a7c6cfab557b7877e505d8c061 Mon Sep 17 00:00:00 2001 From: Dexter Yan Date: Wed, 16 Oct 2024 11:00:06 +1300 Subject: [PATCH 13/23] test 3 --- .github/workflows/build-test-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test-deploy.yaml b/.github/workflows/build-test-deploy.yaml index fb65a3f66..d3c5ec6da 100644 --- a/.github/workflows/build-test-deploy.yaml +++ b/.github/workflows/build-test-deploy.yaml @@ -85,7 +85,7 @@ jobs: - run: make check-schemas - run: | pwd - echo $$(pwd) + echo $(pwd) cat pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go compile-preflight: From d7de5c1fdea36447550ae6084b937bff3799251d Mon Sep 17 00:00:00 2001 From: Dexter Yan Date: Wed, 16 Oct 2024 11:06:50 +1300 Subject: [PATCH 14/23] test 3 --- .github/workflows/build-test-deploy.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test-deploy.yaml b/.github/workflows/build-test-deploy.yaml index d3c5ec6da..d416fbd39 100644 --- a/.github/workflows/build-test-deploy.yaml +++ b/.github/workflows/build-test-deploy.yaml @@ -79,14 +79,17 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 + path: github.com/replicatedhq/ - name: check files run: | cat pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go - - run: make check-schemas + - run: | + cd github.com/replicatedhq/troubleshoot + make check-schemas - run: | pwd echo $(pwd) - cat pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go + cat $(pwd)/../../../github.com/replicatedhq/troubleshoot/pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go compile-preflight: runs-on: ubuntu-latest From d505a6fe51f4e5bbbe141d2a061aaded13fbd975 Mon Sep 17 00:00:00 2001 From: Dexter Yan Date: Wed, 16 Oct 2024 11:09:58 +1300 Subject: [PATCH 15/23] test 3 --- .github/workflows/build-test-deploy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-test-deploy.yaml b/.github/workflows/build-test-deploy.yaml index d416fbd39..de274f66e 100644 --- a/.github/workflows/build-test-deploy.yaml +++ b/.github/workflows/build-test-deploy.yaml @@ -85,6 +85,7 @@ jobs: cat pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go - run: | cd github.com/replicatedhq/troubleshoot + pwd make check-schemas - run: | pwd From ec4e3181af477885588cd93deae1de739286e90d Mon Sep 17 00:00:00 2001 From: Dexter Yan Date: Wed, 16 Oct 2024 11:14:25 +1300 Subject: [PATCH 16/23] test 3 --- .github/workflows/build-test-deploy.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/build-test-deploy.yaml b/.github/workflows/build-test-deploy.yaml index de274f66e..32e81acf2 100644 --- a/.github/workflows/build-test-deploy.yaml +++ b/.github/workflows/build-test-deploy.yaml @@ -80,9 +80,6 @@ jobs: with: fetch-depth: 0 path: github.com/replicatedhq/ - - name: check files - run: | - cat pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go - run: | cd github.com/replicatedhq/troubleshoot pwd From 05f336d3ca0fe4d56408b1cdf769c7399bbe67de Mon Sep 17 00:00:00 2001 From: Dexter Yan Date: Wed, 16 Oct 2024 11:16:02 +1300 Subject: [PATCH 17/23] test 3 --- .github/workflows/build-test-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test-deploy.yaml b/.github/workflows/build-test-deploy.yaml index 32e81acf2..d59fcc703 100644 --- a/.github/workflows/build-test-deploy.yaml +++ b/.github/workflows/build-test-deploy.yaml @@ -81,7 +81,7 @@ jobs: fetch-depth: 0 path: github.com/replicatedhq/ - run: | - cd github.com/replicatedhq/troubleshoot + ls -la pwd make check-schemas - run: | From 71c3bc5e7f57009a6d6e44bcae0faca82ea0a517 Mon Sep 17 00:00:00 2001 From: Dexter Yan Date: Wed, 16 Oct 2024 11:19:47 +1300 Subject: [PATCH 18/23] test 3 --- .github/workflows/build-test-deploy.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test-deploy.yaml b/.github/workflows/build-test-deploy.yaml index d59fcc703..bcb327805 100644 --- a/.github/workflows/build-test-deploy.yaml +++ b/.github/workflows/build-test-deploy.yaml @@ -79,10 +79,11 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - path: github.com/replicatedhq/ + path: github.com/replicatedhq/troubleshoot - run: | - ls -la + pwd + cd github.com/replicatedhq/troubleshoot make check-schemas - run: | pwd From 992eb86afdec29713fbcc70f94938fbd8a74aef7 Mon Sep 17 00:00:00 2001 From: Dexter Yan Date: Wed, 16 Oct 2024 11:22:06 +1300 Subject: [PATCH 19/23] test 3 --- .github/workflows/build-test-deploy.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/build-test-deploy.yaml b/.github/workflows/build-test-deploy.yaml index bcb327805..a196c35dd 100644 --- a/.github/workflows/build-test-deploy.yaml +++ b/.github/workflows/build-test-deploy.yaml @@ -81,14 +81,8 @@ jobs: fetch-depth: 0 path: github.com/replicatedhq/troubleshoot - run: | - - pwd cd github.com/replicatedhq/troubleshoot make check-schemas - - run: | - pwd - echo $(pwd) - cat $(pwd)/../../../github.com/replicatedhq/troubleshoot/pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go compile-preflight: runs-on: ubuntu-latest From 3060b32683a2a7f4d1efea1c195ba918b1bb20bc Mon Sep 17 00:00:00 2001 From: Dexter Yan Date: Wed, 16 Oct 2024 11:30:01 +1300 Subject: [PATCH 20/23] test 3 --- .github/workflows/build-test-deploy.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-test-deploy.yaml b/.github/workflows/build-test-deploy.yaml index a196c35dd..dcb33a6fe 100644 --- a/.github/workflows/build-test-deploy.yaml +++ b/.github/workflows/build-test-deploy.yaml @@ -80,6 +80,9 @@ jobs: with: fetch-depth: 0 path: github.com/replicatedhq/troubleshoot + - name: check file + run: | + cat github.com/replicatedhq/troubleshoot/pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go - run: | cd github.com/replicatedhq/troubleshoot make check-schemas From efe4106d55b1389d85219284f64e11bfdc66b661 Mon Sep 17 00:00:00 2001 From: Dexter Yan Date: Wed, 16 Oct 2024 11:36:45 +1300 Subject: [PATCH 21/23] test 3 --- .../typed/troubleshoot/v1beta2/supportbundle.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go b/pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go index c8fff5666..10a9377af 100644 --- a/pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go +++ b/pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go @@ -126,7 +126,7 @@ func (c *supportBundles) Update(ctx context.Context, supportBundle *v1beta2.Supp result = &v1beta2.SupportBundle{} err = c.client.Put(). Namespace(c.ns). - Resource("supportbundles"). + Resource("supportbundless"). Name(supportBundle.Metadata.Name). VersionedParams(&opts, scheme.ParameterCodec). Body(supportBundle). From 3f1b836b91b90e3d9c327800c65fe5c0a1ff79f4 Mon Sep 17 00:00:00 2001 From: Dexter Yan Date: Wed, 16 Oct 2024 11:40:54 +1300 Subject: [PATCH 22/23] test 3 --- .../typed/troubleshoot/v1beta2/supportbundle.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go b/pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go index 81c80674f..8cda57823 100644 --- a/pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go +++ b/pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go @@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by client-gen. DO NOT EDIT. -------------------------------- +// Code generated by client-gen. DO NOT EDIT. package v1beta2 @@ -141,8 +141,8 @@ func (c *supportBundles) UpdateStatus(ctx context.Context, supportBundle *v1beta result = &v1beta2.SupportBundle{} err = c.client.Put(). Namespace(c.ns). - Resource("supportbundles"). - Name(supportBundle.Name). + Resource("supportbundless"). + Name(supportBundle.Metadata.Name). SubResource("status"). VersionedParams(&opts, scheme.ParameterCodec). Body(supportBundle). From 2557961ea69a89b57141fa38735ad54ba1886a32 Mon Sep 17 00:00:00 2001 From: Dexter Yan Date: Wed, 16 Oct 2024 11:55:18 +1300 Subject: [PATCH 23/23] test 3 --- .github/workflows/build-test-deploy.yaml | 3 --- .../typed/troubleshoot/v1beta2/supportbundle.go | 10 +++++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-test-deploy.yaml b/.github/workflows/build-test-deploy.yaml index 51ec9d6d2..d35380708 100644 --- a/.github/workflows/build-test-deploy.yaml +++ b/.github/workflows/build-test-deploy.yaml @@ -82,9 +82,6 @@ jobs: with: fetch-depth: 0 path: github.com/replicatedhq/troubleshoot - - name: check file - run: | - cat github.com/replicatedhq/troubleshoot/pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go - run: | cd github.com/replicatedhq/troubleshoot make check-schemas diff --git a/pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go b/pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go index 8cda57823..4f68f7aaa 100644 --- a/pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go +++ b/pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go @@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by client-gen. DO NOT EDIT. +// Code generated by client-gen. DO NOT EDIT. ------------------------ package v1beta2 @@ -126,8 +126,8 @@ func (c *supportBundles) Update(ctx context.Context, supportBundle *v1beta2.Supp result = &v1beta2.SupportBundle{} err = c.client.Put(). Namespace(c.ns). - Resource("supportbundless"). - Name(supportBundle.Metadata.Name). + Resource("supportbundles"). + Name(supportBundle.Name). VersionedParams(&opts, scheme.ParameterCodec). Body(supportBundle). Do(ctx). @@ -141,8 +141,8 @@ func (c *supportBundles) UpdateStatus(ctx context.Context, supportBundle *v1beta result = &v1beta2.SupportBundle{} err = c.client.Put(). Namespace(c.ns). - Resource("supportbundless"). - Name(supportBundle.Metadata.Name). + Resource("supportbundles"). + Name(supportBundle.Name). SubResource("status"). VersionedParams(&opts, scheme.ParameterCodec). Body(supportBundle).