Merge pull request #577 from wewark/master

Update dependencies
kubernetes · Feb 17, 2023 · 86078b1 · 86078b1
2 parents eba8508 + 7e6790a
commit 86078b1
Show file tree

Hide file tree

Showing 115 changed files with 4,261 additions and 1,896 deletions.
diff --git a/Makefile b/Makefile
@@ -40,7 +40,7 @@ REGISTRY ?= gcr.io/k8s-staging-dns
 # Default architecture to build for.
 ARCH ?= amd64
 # Image to use for building.
-BUILD_IMAGE ?= golang:1.18-bullseye
+BUILD_IMAGE ?= golang:1.20-bullseye
 # Containers will be named: $(CONTAINER_PREFIX)-$(BINARY)-$(ARCH):$(VERSION)
 CONTAINER_PREFIX ?= k8s-dns
 # Caching for go builds, disabled for CI

diff --git a/build/test.sh b/build/test.sh
@@ -22,7 +22,6 @@ export CGO_ENABLED=0
 TARGETS=$(for d in "$@"; do echo ./$d/...; done)
 
 echo "Running tests:"
-go test -i -installsuffix "static" ${TARGETS}
 go test -installsuffix "static" ${TARGETS}
 echo
 

diff --git a/cmd/node-cache/app/configmap.go b/cmd/node-cache/app/configmap.go
@@ -33,7 +33,7 @@ const (
     bind {{.LocalIP}}
     forward . {{.UpstreamServers}}
 }
-`  // cache TTL is 30s by default
+` // cache TTL is 30s by default
 	defaultTTL       = 30
 	upstreamTCPBlock = `
     forward . __PILLAR__UPSTREAM__SERVERS__ {

diff --git a/cmd/sidecar-e2e/main.go b/cmd/sidecar-e2e/main.go
@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-    http://www.apache.org/licenses/LICENSE-2.0
+	http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module k8s.io/dns
 
-go 1.18
+go 1.20
 
 require (
 	github.com/coredns/caddy v1.1.1
@@ -17,13 +17,13 @@ require (
 	go.etcd.io/etcd/api/v3 v3.5.5
 	go.etcd.io/etcd/client/v2 v2.305.5
 	go.etcd.io/etcd/client/v3 v3.5.4
-	golang.org/x/net v0.1.0
+	golang.org/x/net v0.7.0
 	k8s.io/api v0.25.0
 	k8s.io/apimachinery v0.25.0
 	k8s.io/client-go v0.24.7
 	k8s.io/component-base v0.24.7
 	k8s.io/klog/v2 v2.80.1
-	k8s.io/kubernetes v1.24.7
+	k8s.io/kubernetes v1.24.10
 	k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
 )
 
@@ -92,9 +92,9 @@ require (
 	go.uber.org/zap v1.19.0 // indirect
 	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
 	golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094 // indirect
-	golang.org/x/sys v0.1.0 // indirect
-	golang.org/x/term v0.1.0 // indirect
-	golang.org/x/text v0.4.0 // indirect
+	golang.org/x/sys v0.5.0 // indirect
+	golang.org/x/term v0.5.0 // indirect
+	golang.org/x/text v0.7.0 // indirect
 	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
 	golang.org/x/tools v0.1.12 // indirect
 	golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect

diff --git a/go.sum b/go.sum
diff --git a/pkg/e2e/util.go b/pkg/e2e/util.go
@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-    http://www.apache.org/licenses/LICENSE-2.0
+	http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

diff --git a/vendor/golang.org/x/net/html/parse.go b/vendor/golang.org/x/net/html/parse.go
diff --git a/vendor/golang.org/x/net/html/token.go b/vendor/golang.org/x/net/html/token.go
diff --git a/vendor/golang.org/x/net/http2/flow.go b/vendor/golang.org/x/net/http2/flow.go
diff --git a/vendor/golang.org/x/net/http2/frame.go b/vendor/golang.org/x/net/http2/frame.go
diff --git a/vendor/golang.org/x/net/http2/headermap.go b/vendor/golang.org/x/net/http2/headermap.go
diff --git a/vendor/golang.org/x/net/http2/hpack/encode.go b/vendor/golang.org/x/net/http2/hpack/encode.go