Skip to content

Commit

Permalink
Update go deps (#70)
Browse files Browse the repository at this point in the history
* update go dependencies and fix incompatible funcs
  • Loading branch information
cotocisternas authored May 6, 2021
1 parent 72be193 commit c2dc224
Show file tree
Hide file tree
Showing 2,516 changed files with 265,533 additions and 197,513 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.vscode/
.idea/
.ijwb/
.DS_Store
Thumbs.db
bazel-*
43 changes: 7 additions & 36 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,41 +3,12 @@ module github.com/adobe/rules_gitops
go 1.12

require (
github.com/alessio/shellescape v1.2.2 // indirect
github.com/coreos/go-etcd v2.0.0+incompatible // indirect
github.com/cpuguy83/go-md2man v1.0.10 // indirect
github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153 // indirect
github.com/evanphx/json-patch v4.9.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.1.0 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
github.com/gogo/protobuf v1.3.1 // indirect
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7 // indirect
github.com/golang/protobuf v1.4.2
github.com/google/go-cmp v0.4.0
github.com/ghodss/yaml v1.0.0
github.com/golang/protobuf v1.5.2
github.com/google/go-cmp v0.5.5
github.com/google/go-github/v32 v32.1.0
github.com/google/gofuzz v1.1.0 // indirect
github.com/imdario/mergo v0.3.9 // indirect
github.com/json-iterator/go v1.1.10 // indirect
github.com/mattn/go-isatty v0.0.12 // indirect
github.com/onsi/ginkgo v1.11.0 // indirect
github.com/pelletier/go-toml v1.8.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/spf13/cobra v1.0.0 // indirect
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8 // indirect
golang.org/x/net v0.0.0-20200707034311-ab3426394381 // indirect
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
golang.org/x/sys v0.0.0-20200928205150-006507a75852 // indirect
golang.org/x/text v0.3.3 // indirect
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
google.golang.org/protobuf v1.24.0 // indirect
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
k8s.io/api v0.17.0
k8s.io/apimachinery v0.17.0
k8s.io/client-go v0.17.0
k8s.io/klog/v2 v2.2.0 // indirect
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 // indirect
sigs.k8s.io/kind v0.7.0 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
golang.org/x/oauth2 v0.0.0-20210427180440-81ed05c6b58c
k8s.io/api v0.21.0
k8s.io/apimachinery v0.21.0
k8s.io/client-go v0.21.0
)
629 changes: 331 additions & 298 deletions go.sum

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions testing/it_sidecar/it_sidecar.go
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ func portForward(ctx context.Context, clientset *kubernetes.Clientset, config *r
var wg sync.WaitGroup
wg.Add(len(ports))
for _, port := range ports {
ep, err := clientset.CoreV1().Endpoints(*namespace).Get(serviceName, meta_v1.GetOptions{})
ep, err := clientset.CoreV1().Endpoints(*namespace).Get(ctx, serviceName, meta_v1.GetOptions{})
if err != nil {
return fmt.Errorf("error listing endpoints for service %s: %v", serviceName, err)
}
Expand Down Expand Up @@ -301,8 +301,7 @@ func cleanup(clientset *kubernetes.Clientset) {
if *deleteNamespace && *namespace != "" {
log.Printf("deleting namespace %s", *namespace)
s := meta_v1.DeletePropagationBackground
err := clientset.CoreV1().Namespaces().Delete(*namespace, &meta_v1.DeleteOptions{PropagationPolicy: &s})
if err != nil {
if err := clientset.CoreV1().Namespaces().Delete(context.Background(), *namespace, meta_v1.DeleteOptions{PropagationPolicy: &s}); err != nil {
log.Printf("Unable to delete namespace %s: %v", *namespace, err)
}
}
Expand Down
2 changes: 1 addition & 1 deletion testing/it_sidecar/stern/tail.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func (t *Tail) Start(ctx context.Context, i v1.PodInterface) {
Container: t.ContainerName,
})

stream, err := req.Stream()
stream, err := req.Stream(ctx)
if err != nil {
log.Printf("Error opening stream to %s/%s/%s: %s", t.Namespace, t.PodName, t.ContainerName, err)
return
Expand Down
2 changes: 1 addition & 1 deletion testing/it_sidecar/stern/watch.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func (t *Target) GetID() string {
// containers/pods. The first result is targets added, the second is targets
// removed
func Watch(ctx context.Context, i v1.PodInterface, podFilter *regexp.Regexp, containerFilter *regexp.Regexp, containerState ContainerState, labelSelector labels.Selector) (chan *Target, chan *Target, error) {
watcher, err := i.Watch(metav1.ListOptions{Watch: true, LabelSelector: labelSelector.String()})
watcher, err := i.Watch(ctx, metav1.ListOptions{Watch: true, LabelSelector: labelSelector.String()})
if err != nil {
return nil, nil, fmt.Errorf("failed to set up watch: %s", err)
}
Expand Down
16 changes: 0 additions & 16 deletions vendor/github.com/docker/spdystream/BUILD

This file was deleted.

13 changes: 0 additions & 13 deletions vendor/github.com/docker/spdystream/CONTRIBUTING.md

This file was deleted.

191 changes: 0 additions & 191 deletions vendor/github.com/docker/spdystream/LICENSE

This file was deleted.

Loading

0 comments on commit c2dc224

Please sign in to comment.