Skip to content

Commit

Permalink
Bump kubernetes modules to v0.27 (#163)
Browse files Browse the repository at this point in the history
  • Loading branch information
martin-helmich committed May 25, 2023
1 parent 28ec8d3 commit 087850e
Show file tree
Hide file tree
Showing 4 changed files with 443 additions and 71 deletions.
7 changes: 3 additions & 4 deletions cmd/kube-httpcache/main.go
Expand Up @@ -47,6 +47,7 @@ func main() {
}

client = kubernetes.NewForConfigOrDie(config)
ctx, cancel := context.WithCancel(context.Background())

var frontendUpdates chan *watcher.EndpointConfig
var frontendErrors chan error
Expand All @@ -58,7 +59,7 @@ func main() {
opts.Frontend.PortName,
opts.Kubernetes.RetryBackoff,
)
frontendUpdates, frontendErrors = frontendWatcher.Run()
frontendUpdates, frontendErrors = frontendWatcher.Run(ctx)
}

var backendUpdates chan *watcher.EndpointConfig
Expand All @@ -71,7 +72,7 @@ func main() {
opts.Backend.PortName,
opts.Kubernetes.RetryBackoff,
)
backendUpdates, backendErrors = backendWatcher.Run()
backendUpdates, backendErrors = backendWatcher.Run(ctx)
}

templateWatcher := watcher.MustNewTemplateWatcher(opts.Varnish.VCLTemplate, opts.Varnish.VCLTemplatePoll)
Expand Down Expand Up @@ -137,8 +138,6 @@ func main() {
panic(err)
}

ctx, cancel := context.WithCancel(context.Background())

signals := make(chan os.Signal, 1)

signal.Notify(signals, syscall.SIGINT)
Expand Down
58 changes: 36 additions & 22 deletions go.mod
Expand Up @@ -7,39 +7,53 @@ require (
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
github.com/martin-helmich/go-varnish-client v0.2.2
github.com/prometheus/client_golang v1.11.1
k8s.io/api v0.0.0-20181013054003-e94254e9898f
k8s.io/apimachinery v0.0.0-20181013010248-dcb88206cd7f
k8s.io/client-go v9.0.0+incompatible
k8s.io/api v0.27.2
k8s.io/apimachinery v0.27.2
k8s.io/client-go v0.27.2
)

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.1 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.4.3 // indirect
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c // indirect
github.com/google/gofuzz v1.0.0 // indirect
github.com/googleapis/gnostic v0.2.0 // indirect
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/imdario/mergo v0.3.6 // indirect
github.com/json-iterator/go v1.1.11 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.26.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
github.com/spf13/pflag v1.0.3 // indirect
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect
golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421 // indirect
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
golang.org/x/text v0.3.8 // indirect
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 // indirect
google.golang.org/appengine v1.4.0 // indirect
google.golang.org/protobuf v1.26.0-rc.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/net v0.8.0 // indirect
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
golang.org/x/sys v0.6.0 // indirect
golang.org/x/term v0.6.0 // indirect
golang.org/x/text v0.8.0 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.3.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.90.1 // indirect
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

0 comments on commit 087850e

Please sign in to comment.