Skip to content
This repository was archived by the owner on Jun 11, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
5 changes: 3 additions & 2 deletions client/k8sClient.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package client

import (
"context"
"flag"
"fmt"
"github.com/caarlos0/env/v6"
Expand Down Expand Up @@ -97,11 +98,11 @@ func (impl *K8sClient) GetArgoConfig() (secret *v1.Secret, cm *v1.ConfigMap, err
if err != nil {
return nil, nil, err
}
secret, err = clientSet.CoreV1().Secrets(ArgocdNamespaceName).Get(ArgoCDSecretName, v12.GetOptions{})
secret, err = clientSet.CoreV1().Secrets(ArgocdNamespaceName).Get(context.Background(), ArgoCDSecretName, v12.GetOptions{})
if err != nil {
return nil, nil, err
}
cm, err = clientSet.CoreV1().ConfigMaps(ArgocdNamespaceName).Get(ArgoCDConfigMapName, v12.GetOptions{})
cm, err = clientSet.CoreV1().ConfigMaps(ArgocdNamespaceName).Get(context.Background(), ArgoCDConfigMapName, v12.GetOptions{})
if err != nil {
return nil, nil, err
}
Expand Down
15 changes: 5 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,21 @@ require (
github.com/golang-jwt/jwt/v4 v4.1.0
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0
github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d // indirect
github.com/gorilla/mux v1.8.0
github.com/imdario/mergo v0.3.12 // indirect
github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da // indirect
github.com/pquerna/cachecontrol v0.1.0 // indirect
github.com/sirupsen/logrus v1.8.1
github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff // indirect
golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
google.golang.org/grpc v1.31.0
google.golang.org/grpc v1.36.1
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
k8s.io/api v0.0.0-20191004102349-159aefb8556b
k8s.io/apimachinery v0.0.0-20190816221834-a9f1d8a9c101
k8s.io/client-go v11.0.1-0.20190820062731-7e43eff7c80a+incompatible
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
k8s.io/api v0.23.1
k8s.io/apimachinery v0.23.1
k8s.io/client-go v0.23.1
k8s.io/klog v1.0.0 // indirect
k8s.io/utils v0.0.0-20191010214722-8d271d903fe4 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect

)
223 changes: 223 additions & 0 deletions go.sum

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions util/k8sUtil.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package kube
//code copied from argocd

import (
"context"
apiv1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up @@ -33,7 +34,7 @@ func (ku *KubeUtil) CreateOrUpdateSecret(ns string, name string, update updateFn
var err error
var new bool

s, err = ku.client.CoreV1().Secrets(ns).Get(name, metav1.GetOptions{})
s, err = ku.client.CoreV1().Secrets(ns).Get(context.Background(), name, metav1.GetOptions{})
if err != nil {
if !errors.IsNotFound(err) {
return err
Expand All @@ -59,9 +60,9 @@ func (ku *KubeUtil) CreateOrUpdateSecret(ns string, name string, update updateFn
}

if new {
_, err = ku.client.CoreV1().Secrets(ns).Create(s) //(ku.ctx, s, metav1.CreateOptions{})
_, err = ku.client.CoreV1().Secrets(ns).Create(context.Background(), s, metav1.CreateOptions{}) //(ku.ctx, s, metav1.CreateOptions{})
} else {
_, err = ku.client.CoreV1().Secrets(ns).Update(s) //(ku.ctx, s, metav1.UpdateOptions{})
_, err = ku.client.CoreV1().Secrets(ns).Update(context.Background(), s, metav1.UpdateOptions{}) //(ku.ctx, s, metav1.UpdateOptions{})
}

return err
Expand Down
4 changes: 4 additions & 0 deletions vendor/github.com/caarlos0/env/v6/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions vendor/github.com/caarlos0/env/v6/LICENSE.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 37 additions & 0 deletions vendor/github.com/caarlos0/env/v6/Makefile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading