From a384fe8f14ed96c5c48e5b1d5f1d12429719bc79 Mon Sep 17 00:00:00 2001 From: Jon Ayers Date: Tue, 13 Feb 2024 21:57:00 +0000 Subject: [PATCH] fix: support in-cluster config --- helm/templates/service.yaml | 3 ++- root.go | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/helm/templates/service.yaml b/helm/templates/service.yaml index 7371f41..b632819 100644 --- a/helm/templates/service.yaml +++ b/helm/templates/service.yaml @@ -59,7 +59,8 @@ spec: image: "{{ .Values.image.repo }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} command: - - /coder-xray scan + - /coder-xray + - scan env: - name: CODER_URL value: {{ .Values.coder.url }} diff --git a/root.go b/root.go index 3657905..592d19b 100644 --- a/root.go +++ b/root.go @@ -8,6 +8,7 @@ import ( "github.com/spf13/cobra" "golang.org/x/xerrors" "k8s.io/client-go/kubernetes" + restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" "cdr.dev/slog" @@ -59,7 +60,10 @@ func root() *cobra.Command { return xerrors.New("--artifactory-token is required") } - config, err := clientcmd.BuildConfigFromFlags("", kubeConfig) + config, err := restclient.InClusterConfig() + if xerrors.Is(err, restclient.ErrNotInCluster) { + config, err = clientcmd.BuildConfigFromFlags("", kubeConfig) + } if err != nil { return xerrors.Errorf("build kubeconfig: %w", err) }