Skip to content

Commit 63a2b94

Browse files
laoj2laoj2
authored
Merge pull request #494 from bryan-hz/zhu/update-stackdriver-adapter-tag
Bring Go version up-to-date & bump stackdriver adapter tag
2 parents b2e8c2a + df08c5a commit 63a2b94

File tree

4 files changed

+87
-6
lines changed

4 files changed

+87
-6
lines changed

‎custom-metrics-stackdriver-adapter/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM golang:1.16-alpine as builder
15+
FROM golang:1.19-alpine as builder
1616
WORKDIR ${GOPATH}/src/github.com/GoogleCloudPlatform/k8s-stackdriver/custom-metrics-stackdriver-adapter
1717
COPY . ./
1818
RUN CGO_ENABLED=0 GOOS=linux go build -mod=readonly -o /adapter

‎custom-metrics-stackdriver-adapter/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ GOOS?=linux
33
OUT_DIR?=build
44
PACKAGE=github.com/GoogleCloudPlatform/k8s-stackdriver/custom-metrics-stackdriver-adapter
55
PREFIX?=staging-k8s.gcr.io
6-
TAG = v0.12.2
6+
TAG = v0.13.1
77
PKG := $(shell find pkg/* -type f)
88

99
.PHONY: build docker push test clean

‎custom-metrics-stackdriver-adapter/go.mod

Lines changed: 85 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/GoogleCloudPlatform/k8s-stackdriver/custom-metrics-stackdriver-adapter
22

3-
go 1.16
3+
go 1.19
44

55
require (
66
cloud.google.com/go v0.84.0
@@ -17,3 +17,87 @@ require (
1717
sigs.k8s.io/custom-metrics-apiserver v1.22.0
1818
sigs.k8s.io/metrics-server v0.5.0
1919
)
20+
21+
require (
22+
github.com/NYTimes/gziphandler v1.1.1 // indirect
23+
github.com/PuerkitoBio/purell v1.1.1 // indirect
24+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
25+
github.com/beorn7/perks v1.0.1 // indirect
26+
github.com/blang/semver v3.5.1+incompatible // indirect
27+
github.com/cespare/xxhash/v2 v2.1.1 // indirect
28+
github.com/coreos/go-semver v0.3.0 // indirect
29+
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
30+
github.com/davecgh/go-spew v1.1.1 // indirect
31+
github.com/emicklei/go-restful v2.15.0+incompatible // indirect
32+
github.com/emicklei/go-restful-swagger12 v0.0.0-20201014110547-68ccff494617 // indirect
33+
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
34+
github.com/felixge/httpsnoop v1.0.1 // indirect
35+
github.com/go-logr/logr v0.4.0 // indirect
36+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
37+
github.com/go-openapi/jsonreference v0.19.5 // indirect
38+
github.com/go-openapi/swag v0.19.14 // indirect
39+
github.com/gogo/protobuf v1.3.2 // indirect
40+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
41+
github.com/golang/protobuf v1.5.2 // indirect
42+
github.com/google/go-cmp v0.5.6 // indirect
43+
github.com/google/gofuzz v1.1.0 // indirect
44+
github.com/google/uuid v1.1.2 // indirect
45+
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
46+
github.com/googleapis/gnostic v0.5.5 // indirect
47+
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
48+
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
49+
github.com/imdario/mergo v0.3.5 // indirect
50+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
51+
github.com/josharian/intern v1.0.0 // indirect
52+
github.com/json-iterator/go v1.1.11 // indirect
53+
github.com/mailru/easyjson v0.7.7 // indirect
54+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
55+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
56+
github.com/modern-go/reflect2 v1.0.1 // indirect
57+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
58+
github.com/pkg/errors v0.9.1 // indirect
59+
github.com/prometheus/client_model v0.2.0 // indirect
60+
github.com/prometheus/common v0.26.0 // indirect
61+
github.com/prometheus/procfs v0.6.0 // indirect
62+
github.com/spf13/cobra v1.1.3 // indirect
63+
github.com/spf13/pflag v1.0.5 // indirect
64+
go.etcd.io/etcd/api/v3 v3.5.0 // indirect
65+
go.etcd.io/etcd/client/pkg/v3 v3.5.0 // indirect
66+
go.etcd.io/etcd/client/v3 v3.5.0 // indirect
67+
go.opencensus.io v0.23.0 // indirect
68+
go.opentelemetry.io/contrib v0.20.0 // indirect
69+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
70+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
71+
go.opentelemetry.io/otel v0.20.0 // indirect
72+
go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
73+
go.opentelemetry.io/otel/metric v0.20.0 // indirect
74+
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
75+
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
76+
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
77+
go.opentelemetry.io/otel/trace v0.20.0 // indirect
78+
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
79+
go.uber.org/atomic v1.7.0 // indirect
80+
go.uber.org/multierr v1.6.0 // indirect
81+
go.uber.org/zap v1.17.0 // indirect
82+
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect
83+
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
84+
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 // indirect
85+
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
86+
golang.org/x/text v0.3.6 // indirect
87+
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
88+
google.golang.org/appengine v1.6.7 // indirect
89+
google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84 // indirect
90+
google.golang.org/grpc v1.38.0 // indirect
91+
google.golang.org/protobuf v1.26.0 // indirect
92+
gopkg.in/inf.v0 v0.9.1 // indirect
93+
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
94+
gopkg.in/yaml.v2 v2.4.0 // indirect
95+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
96+
k8s.io/apiserver v0.22.0 // indirect
97+
k8s.io/klog/v2 v2.9.0 // indirect
98+
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect
99+
k8s.io/utils v0.0.0-20210802155522-efc7438f0176 // indirect
100+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22 // indirect
101+
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
102+
sigs.k8s.io/yaml v1.2.0 // indirect
103+
)

‎custom-metrics-stackdriver-adapter/go.sum

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QH
105105
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
106106
github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
107107
github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
108-
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
109108
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
110109
github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
111110
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -129,7 +128,6 @@ github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee
129128
github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
130129
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
131130
github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
132-
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e h1:Wf6HqHfScWJN9/ZjdUKyjop4mf3Qdd+1TvvltAvM3m8=
133131
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
134132
github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI=
135133
github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
@@ -308,7 +306,6 @@ github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
308306
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
309307
github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
310308
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
311-
github.com/googleapis/gax-go v0.0.0-20161107002406-da06d194a00e h1:CYRpN206UTHUinz3VJoLaBdy1gEGeJNsqT0mvswDcMw=
312309
github.com/googleapis/gax-go v0.0.0-20161107002406-da06d194a00e/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
313310
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
314311
github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM=

0 commit comments

Comments
 (0)