Skip to content

Commit

Permalink
Merge pull request #1 from devtron-labs/k8s-lib-update-v0.4.20
Browse files Browse the repository at this point in the history
K8s lib update
  • Loading branch information
nishant-d authored Jul 8, 2022
2 parents 9a4123d + dcd017c commit b2fa0f2
Show file tree
Hide file tree
Showing 2,715 changed files with 954,480 additions and 53 deletions.
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"
"github.com/caarlos0/env/v6"
v1 "k8s.io/api/core/v1"
Expand Down Expand Up @@ -86,11 +87,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
18 changes: 4 additions & 14 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,22 @@ module github.com/devtron-labs/authenticator
go 1.16

require (
github.com/caarlos0/env v3.5.0+incompatible // indirect
github.com/caarlos0/env/v6 v6.7.2
github.com/coreos/go-oidc v2.2.1+incompatible
github.com/gogo/protobuf v1.3.2 // indirect
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
gopkg.in/inf.v0 v0.9.1 // indirect
google.golang.org/grpc v1.36.1
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
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
k8s.io/klog v1.0.0 // indirect
k8s.io/utils v0.0.0-20191010214722-8d271d903fe4 // indirect
k8s.io/api v0.23.1
k8s.io/apimachinery v0.23.1
k8s.io/client-go v0.23.1
sigs.k8s.io/yaml v1.3.0 // indirect

)
269 changes: 232 additions & 37 deletions go.sum

Large diffs are not rendered by default.

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.

8 changes: 8 additions & 0 deletions vendor/github.com/caarlos0/env/v6/.golangci.yml

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

3 changes: 3 additions & 0 deletions vendor/github.com/caarlos0/env/v6/.goreleaser.yml

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

0 comments on commit b2fa0f2

Please sign in to comment.