Skip to content

Commit 7b51527

Browse files
adracusadracus
authored
Update to k8s v0.27.2 (#243)
Breaking: Remove `memorystore`
1 parent 975a529 commit 7b51527

File tree

8 files changed

+137
-946
lines changed

8 files changed

+137
-946
lines changed

‎clientutils/clientutils.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ import (
3737
type clientMeta interface {
3838
Scheme() *runtime.Scheme
3939
RESTMapper() meta.RESTMapper
40+
GroupVersionKindFor(obj runtime.Object) (schema.GroupVersionKind, error)
41+
IsObjectNamespaced(obj runtime.Object) (bool, error)
4042
}
4143

4244
type nonReaderClient interface {

‎configutils/configutils_test.go‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,30 +22,19 @@ import (
2222
"github.com/onsi/ginkgo/v2"
2323
. "github.com/onsi/gomega"
2424
corev1 "k8s.io/api/core/v1"
25-
"k8s.io/apiextensions-apiserver/pkg/apiserver"
2625
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
27-
"k8s.io/apimachinery/pkg/runtime"
28-
"k8s.io/apimachinery/pkg/runtime/serializer/json"
2926
apiserverv1beta1 "k8s.io/apiserver/pkg/apis/apiserver/v1beta1"
3027
"k8s.io/client-go/rest"
3128
"k8s.io/client-go/tools/clientcmd"
3229
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
30+
"sigs.k8s.io/yaml"
3331
)
3432

3533
func setKubeconfigFlag(kubeconfig string) {
3634
ExpectWithOffset(1, flag.CommandLine.Set("kubeconfig", kubeconfig)).To(Succeed())
3735
}
3836

3937
var _ = ginkgo.Describe("Configutils", func() {
40-
apiServerSerializer := json.NewSerializerWithOptions(
41-
json.DefaultMetaFactory,
42-
apiserver.Scheme,
43-
apiserver.Scheme,
44-
json.SerializerOptions{
45-
Yaml: true,
46-
},
47-
)
48-
4938
ginkgo.Describe("GetConfig", func() {
5039

5140
var (
@@ -111,7 +100,7 @@ var _ = ginkgo.Describe("Configutils", func() {
111100
configFile = filepath.Join(tempDir, "kubeconfig")
112101
Expect(clientcmd.WriteToFile(*apiConfig, configFile)).To(Succeed())
113102

114-
egressConfigData, err := runtime.Encode(apiServerSerializer, egressConfig)
103+
egressConfigData, err := yaml.Marshal(egressConfig)
115104
Expect(err).NotTo(HaveOccurred())
116105

117106
egressConfigFile = filepath.Join(tempDir, "egress-config.yaml")

‎go.mod‎

Lines changed: 33 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,27 @@ go 1.20
44

55
require (
66
github.com/golang/mock v1.6.0
7-
github.com/onsi/ginkgo/v2 v2.9.4
8-
github.com/onsi/gomega v1.27.6
7+
github.com/onsi/ginkgo/v2 v2.9.5
8+
github.com/onsi/gomega v1.27.7
99
github.com/spf13/pflag v1.0.5
10-
github.com/stretchr/testify v1.8.2
11-
k8s.io/api v0.26.3
12-
k8s.io/apiextensions-apiserver v0.26.3
13-
k8s.io/apimachinery v0.26.3
14-
k8s.io/apiserver v0.26.3
15-
k8s.io/client-go v0.26.3
16-
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
17-
sigs.k8s.io/controller-runtime v0.14.6
10+
github.com/stretchr/testify v1.8.3
11+
k8s.io/api v0.27.2
12+
k8s.io/apiextensions-apiserver v0.27.2
13+
k8s.io/apimachinery v0.27.2
14+
k8s.io/apiserver v0.27.2
15+
k8s.io/client-go v0.27.2
16+
k8s.io/utils v0.0.0-20230209194617-a36077c30491
17+
sigs.k8s.io/controller-runtime v0.15.0
1818
sigs.k8s.io/kustomize/api v0.13.4
1919
sigs.k8s.io/kustomize/kyaml v0.14.2
20+
sigs.k8s.io/yaml v1.3.0
2021
)
2122

2223
require (
23-
github.com/NYTimes/gziphandler v1.1.1 // indirect
24-
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
25-
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
2624
github.com/beorn7/perks v1.0.1 // indirect
2725
github.com/blang/semver/v4 v4.0.0 // indirect
2826
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
29-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
30-
github.com/coreos/go-semver v0.3.0 // indirect
31-
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
27+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
3228
github.com/davecgh/go-spew v1.1.1 // indirect
3329
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
3430
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
@@ -45,41 +41,31 @@ require (
4541
github.com/gogo/protobuf v1.3.2 // indirect
4642
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4743
github.com/golang/protobuf v1.5.3 // indirect
48-
github.com/google/cel-go v0.12.6 // indirect
4944
github.com/google/gnostic v0.5.7-v3refs // indirect
5045
github.com/google/go-cmp v0.5.9 // indirect
5146
github.com/google/gofuzz v1.1.0 // indirect
52-
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
47+
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
5348
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
54-
github.com/google/uuid v1.1.2 // indirect
55-
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
49+
github.com/google/uuid v1.3.0 // indirect
5650
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
5751
github.com/imdario/mergo v0.3.12 // indirect
58-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
5952
github.com/josharian/intern v1.0.0 // indirect
6053
github.com/json-iterator/go v1.1.12 // indirect
6154
github.com/mailru/easyjson v0.7.7 // indirect
62-
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
63-
github.com/mitchellh/mapstructure v1.4.1 // indirect
55+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
6456
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6557
github.com/modern-go/reflect2 v1.0.2 // indirect
6658
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
6759
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6860
github.com/pkg/errors v0.9.1 // indirect
6961
github.com/pmezard/go-difflib v1.0.0 // indirect
70-
github.com/prometheus/client_golang v1.14.0 // indirect
71-
github.com/prometheus/client_model v0.3.0 // indirect
72-
github.com/prometheus/common v0.37.0 // indirect
73-
github.com/prometheus/procfs v0.8.0 // indirect
74-
github.com/spf13/cobra v1.6.0 // indirect
75-
github.com/stoewer/go-strcase v1.2.0 // indirect
62+
github.com/prometheus/client_golang v1.15.1 // indirect
63+
github.com/prometheus/client_model v0.4.0 // indirect
64+
github.com/prometheus/common v0.42.0 // indirect
65+
github.com/prometheus/procfs v0.9.0 // indirect
7666
github.com/stretchr/objx v0.5.0 // indirect
7767
github.com/xlab/treeprint v1.1.0 // indirect
78-
go.etcd.io/etcd/api/v3 v3.5.5 // indirect
79-
go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect
80-
go.etcd.io/etcd/client/v3 v3.5.5 // indirect
81-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
82-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0 // indirect
68+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
8369
go.opentelemetry.io/otel v1.10.0 // indirect
8470
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
8571
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
@@ -89,30 +75,25 @@ require (
8975
go.opentelemetry.io/otel/trace v1.10.0 // indirect
9076
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
9177
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
92-
go.uber.org/atomic v1.7.0 // indirect
93-
go.uber.org/multierr v1.6.0 // indirect
94-
go.uber.org/zap v1.24.0 // indirect
95-
golang.org/x/net v0.9.0 // indirect
96-
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
97-
golang.org/x/sync v0.1.0 // indirect
98-
golang.org/x/sys v0.7.0 // indirect
99-
golang.org/x/term v0.7.0 // indirect
78+
golang.org/x/net v0.10.0 // indirect
79+
golang.org/x/oauth2 v0.5.0 // indirect
80+
golang.org/x/sys v0.8.0 // indirect
81+
golang.org/x/term v0.8.0 // indirect
10082
golang.org/x/text v0.9.0 // indirect
10183
golang.org/x/time v0.3.0 // indirect
102-
golang.org/x/tools v0.8.0 // indirect
103-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
84+
golang.org/x/tools v0.9.1 // indirect
85+
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
10486
google.golang.org/appengine v1.6.7 // indirect
10587
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
106-
google.golang.org/grpc v1.49.0 // indirect
107-
google.golang.org/protobuf v1.28.1 // indirect
88+
google.golang.org/grpc v1.51.0 // indirect
89+
google.golang.org/protobuf v1.30.0 // indirect
10890
gopkg.in/inf.v0 v0.9.1 // indirect
10991
gopkg.in/yaml.v2 v2.4.0 // indirect
11092
gopkg.in/yaml.v3 v3.0.1 // indirect
111-
k8s.io/component-base v0.26.3 // indirect
112-
k8s.io/klog/v2 v2.80.1 // indirect
113-
k8s.io/kube-openapi v0.0.0-20230109183929-3758b55a6596 // indirect
114-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.36 // indirect
115-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
93+
k8s.io/component-base v0.27.2 // indirect
94+
k8s.io/klog/v2 v2.90.1 // indirect
95+
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
96+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
97+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
11698
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
117-
sigs.k8s.io/yaml v1.3.0 // indirect
11899
)

0 commit comments

Comments
 (0)