Merge pull request #989 from caos/fix-writesecret-nilpointer

fix: omit k8s client when gitops mode, not crd
caos · May 4, 2022 · 6ffb758 · 6ffb758
2 parents 61a76ea + fce966a
commit 6ffb758
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,7 +13,7 @@ sandbox*
 *.dll
 *.so
 *.dylib
-orbctl
+/orbctl
 
 # Test binary, built with `go test -c`
 *.test

diff --git a/cmd/orbctl/readsecret.go b/cmd/orbctl/readsecret.go
@@ -31,7 +31,7 @@ orbctl readsecret orbiter.k8s.kubeconfig.encrypted > ~/.kube/config`,
  rv := getRv("readsecret", "", map[string]interface{}{"path": path})
  defer rv.ErrFunc(err)
 
- k8sClient, err := cli.Init(monitor, rv.OrbConfig, rv.GitClient, rv.Kubeconfig, rv.Gitops, rv.Gitops, !rv.Gitops)
+ k8sClient, err := cli.Init(monitor, rv.OrbConfig, rv.GitClient, rv.Kubeconfig, rv.Gitops, rv.Gitops, rv.Gitops)
  if err != nil && (!rv.Gitops || !errors.Is(err, cli.ErrNotInitialized)) {
  return err
  }

diff --git a/cmd/orbctl/writesecret.go b/cmd/orbctl/writesecret.go
@@ -55,7 +55,7 @@ orbctl writesecret mygceprovider.google_application_credentials_value.encrypted
 
  defer rv.ErrFunc(err)
 
- k8sClient, err := cli.Init(monitor, rv.OrbConfig, rv.GitClient, rv.Kubeconfig, rv.Gitops, rv.Gitops, !rv.Gitops)
+ k8sClient, err := cli.Init(monitor, rv.OrbConfig, rv.GitClient, rv.Kubeconfig, rv.Gitops, rv.Gitops, rv.Gitops)
  if err != nil && (!rv.Gitops || !errors.Is(err, cli.ErrNotInitialized)) {
  return err
  }