From cbe6f27c05e82f55f41b648b01972ba2c43f1534 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 12 Apr 2023 19:45:08 +0000 Subject: [PATCH 1/4] chore(deps): update actions/checkout digest to 83b7061 Signed-off-by: Renovate Bot --- .github/workflows/build_container.yaml | 6 +++--- .github/workflows/release.yaml | 6 +++--- .github/workflows/test.yaml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_container.yaml b/.github/workflows/build_container.yaml index e8e8cdadba..c3f0558bd0 100644 --- a/.github/workflows/build_container.yaml +++ b/.github/workflows/build_container.yaml @@ -33,7 +33,7 @@ jobs: steps: - name: Check out code - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3 + uses: actions/checkout@83b7061638ee4956cf7545a6f7efe594e5ad0247 # v3 - name: Extract branch name id: extract_branch @@ -70,7 +70,7 @@ jobs: RELEASE_REGISTRY: "localhost:5000/k8sgpt" steps: - name: Check out code - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3 + uses: actions/checkout@83b7061638ee4956cf7545a6f7efe594e5ad0247 # v3 - name: Set up Docker Buildx id: buildx @@ -115,7 +115,7 @@ jobs: contents: read # Needed for checking out the repository steps: - name: Check out code - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3 + uses: actions/checkout@83b7061638ee4956cf7545a6f7efe594e5ad0247 # v3 - name: Login to GitHub Container Registry uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 63e8272300..4cc4fc644e 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -23,7 +23,7 @@ jobs: # Release-please creates a PR that tracks all changes steps: - name: Checkout - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3 + uses: actions/checkout@83b7061638ee4956cf7545a6f7efe594e5ad0247 # v3 - uses: google-github-actions/release-please-action@c078ea33917ab8cfa5300e48f4b7e6b16606aede # v3 id: release @@ -41,7 +41,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3 + uses: actions/checkout@83b7061638ee4956cf7545a6f7efe594e5ad0247 # v3 with: fetch-depth: 0 - name: Set up Go @@ -74,7 +74,7 @@ jobs: IMAGE_NAME: k8sgpt steps: - name: Checkout - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3 + uses: actions/checkout@83b7061638ee4956cf7545a6f7efe594e5ad0247 # v3 with: submodules: recursive diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index eb15918c0b..52ed1db86f 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3 + - uses: actions/checkout@83b7061638ee4956cf7545a6f7efe594e5ad0247 # v3 - name: Set up Go uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4 From 4dd91ed8263292476054bc70d3d6a3149f88f1b3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 13 Apr 2023 06:13:06 +0000 Subject: [PATCH 2/4] fix(deps): update module helm.sh/helm/v3 to v3.11.3 Signed-off-by: Renovate Bot --- go.mod | 6 ++++-- go.sum | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 2e6b3ce7b7..53946300f6 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/spf13/viper v1.15.0 github.com/stretchr/testify v1.8.2 golang.org/x/term v0.7.0 - helm.sh/helm/v3 v3.11.2 + helm.sh/helm/v3 v3.11.3 k8s.io/api v0.26.3 k8s.io/apimachinery v0.26.3 k8s.io/client-go v0.26.3 @@ -74,6 +74,8 @@ require ( github.com/gorilla/mux v1.8.0 // indirect github.com/gosuri/uitable v0.0.4 // indirect github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect + github.com/hashicorp/errwrap v1.1.0 // indirect + github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/huandu/xstrings v1.4.0 // indirect github.com/imdario/mergo v0.3.15 // indirect @@ -143,7 +145,7 @@ require ( golang.org/x/oauth2 v0.6.0 // indirect golang.org/x/sync v0.1.0 // indirect golang.org/x/sys v0.7.0 // indirect - golang.org/x/text v0.8.0 // indirect + golang.org/x/text v0.9.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/appengine v1.6.7 // indirect diff --git a/go.sum b/go.sum index 24fb5fcd61..ddf6406be5 100644 --- a/go.sum +++ b/go.sum @@ -976,8 +976,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= -golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1193,8 +1193,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= -helm.sh/helm/v3 v3.11.2 h1:P3cLaFxfoxaGLGJVnoPrhf1j86LC5EDINSpYSpMUkkA= -helm.sh/helm/v3 v3.11.2/go.mod h1:Hw+09mfpDiRRKAgAIZlFkPSeOkvv7Acl5McBvQyNPVw= +helm.sh/helm/v3 v3.11.3 h1:n1X5yaQTP5DYywlBOZMl2gX398Gp6YwFp/IAVj6+5D4= +helm.sh/helm/v3 v3.11.3/go.mod h1:S+sOdQc3BLvt09a9rSlKKVs9x0N/yx+No0y3qFw+FQ8= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= From bffad41134d231b16f136a619174ff3bee61765a Mon Sep 17 00:00:00 2001 From: Alex Jones Date: Thu, 13 Apr 2023 07:18:19 +0100 Subject: [PATCH 3/4] chore: added oidc Signed-off-by: Alex Jones --- pkg/kubernetes/kubernetes.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/kubernetes/kubernetes.go b/pkg/kubernetes/kubernetes.go index f0322c0586..542c8afc69 100644 --- a/pkg/kubernetes/kubernetes.go +++ b/pkg/kubernetes/kubernetes.go @@ -3,6 +3,7 @@ package kubernetes import ( "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/client-go/kubernetes" + _ "k8s.io/client-go/plugin/pkg/client/auth/oidc" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" "k8s.io/kubectl/pkg/scheme" From 57790e5bc7037f57a4f73248fe05cac192511470 Mon Sep 17 00:00:00 2001 From: Harshit Mehta Date: Thu, 13 Apr 2023 11:54:21 +0530 Subject: [PATCH 4/4] feat: check for auth only in case of --explain Signed-off-by: Harshit Mehta --- cmd/analyze/analyze.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/analyze/analyze.go b/cmd/analyze/analyze.go index a1b371a549..f001a1bcb9 100644 --- a/cmd/analyze/analyze.go +++ b/cmd/analyze/analyze.go @@ -41,11 +41,6 @@ var AnalyzeCmd = &cobra.Command{ os.Exit(1) } - if len(configAI.Providers) == 0 { - color.Red("Error: AI provider not specified in configuration. Please run k8sgpt auth") - os.Exit(1) - } - var aiProvider ai.AIProvider for _, provider := range configAI.Providers { if backend == provider.Name { @@ -94,6 +89,11 @@ var AnalyzeCmd = &cobra.Command{ } if explain { + if len(configAI.Providers) == 0 { + color.Red("Error: AI provider not specified in configuration. Please run k8sgpt auth") + os.Exit(1) + } + err := config.GetAIResults(output, anonymize) if err != nil { color.Red("Error: %v", err)