Merge pull request #529 from kwiesmueller/master

update kubelet-to-gcm dependencies

kubelet-to-gcm/Makefile

@@ -15,7 +15,7 @@
 OUT_DIR = build
 PACKAGE = github.com/GoogleCloudPlatform/k8s-stackdriver/kubelet-to-gcm
 PREFIX = staging-k8s.gcr.io
-TAG = 1.4.0
+TAG = 1.4.1
 
 # Rules for building the real image for deployment to gcr.io
 

kubelet-to-gcm/go.mod

@@ -1,31 +1,45 @@
 module github.com/GoogleCloudPlatform/k8s-stackdriver/kubelet-to-gcm
 
-go 1.13
+go 1.20
 
 require (
-	cloud.google.com/go v0.58.0 // indirect
-	github.com/gogo/protobuf v1.3.1 // indirect
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
 	github.com/google/gofuzz v1.1.0
-	github.com/prometheus/client_golang v1.7.0
-	github.com/prometheus/common v0.10.0
-	golang.org/x/net v0.0.0-20200602114024-627f9648deb9
-	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
-	google.golang.org/api v0.28.0
-	k8s.io/apimachinery v0.17.3
-	k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1 v0.0.0
+	github.com/prometheus/client_golang v1.14.0
+	github.com/prometheus/common v0.37.0
+	golang.org/x/net v0.8.0
+	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b
+	google.golang.org/api v0.30.0
+	k8s.io/apimachinery v0.26.3
+	k8s.io/kubelet v0.26.3
 )
 
-replace (
-	cloud.google.com/go => cloud.google.com/go v0.58.0
-	github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.1
-	github.com/golang/glog => github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
-	github.com/google/gofuzz => github.com/google/gofuzz v1.1.0
-	github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.7.0
-	github.com/prometheus/common => github.com/prometheus/common v0.10.0
-	golang.org/x/net => golang.org/x/net v0.0.0-20200602114024-627f9648deb9
-	golang.org/x/oauth2 => golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
-	google.golang.org/api => google.golang.org/api v0.28.0
-	k8s.io/apimachinery => k8s.io/apimachinery v0.17.3
-	k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1 => ./vendor/k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1
+require (
+	cloud.google.com/go v0.65.0 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/googleapis/gax-go/v2 v2.0.5 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/prometheus/client_model v0.3.0 // indirect
+	github.com/prometheus/procfs v0.8.0 // indirect
+	go.opencensus.io v0.22.4 // indirect
+	golang.org/x/sys v0.6.0 // indirect
+	golang.org/x/text v0.8.0 // indirect
+	google.golang.org/appengine v1.6.6 // indirect
+	google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
+	google.golang.org/grpc v1.49.0 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	k8s.io/klog/v2 v2.80.1 // indirect
+	k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
+	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 )

kubelet-to-gcm/monitor/kubelet/client.go

@@ -23,7 +23,7 @@ import (
 	"net/http"
 	"net/url"
 
-	stats "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
+	stats "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
 )
 
 // Client contains all the information and methods to encapsulate

kubelet-to-gcm/monitor/kubelet/translate.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/golang/glog"
 	v3 "google.golang.org/api/monitoring/v3"
-	stats "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
+	stats "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
 
 	"github.com/GoogleCloudPlatform/k8s-stackdriver/kubelet-to-gcm/monitor"
 )

kubelet-to-gcm/monitor/kubelet/translate_test.go

@@ -24,7 +24,7 @@ import (
 	fuzz "github.com/google/gofuzz"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	stats "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
+	stats "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
 )
 
 const (