Skip to content

Commit 2a5e88c

Browse files
committed
Upgrade meshery-operator
Signed-off-by: Antonette Caldwell <[email protected]>
1 parent 9b5f3c4 commit 2a5e88c

File tree

3 files changed

+115
-120
lines changed

3 files changed

+115
-120
lines changed

api/v1alpha1/meshsync_types_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,9 @@ var _ = Describe("The test case for the meshsync CRDs", func() {
110110
},
111111
}
112112
By("Update the status of the meshsync CRDs")
113-
err := fakeClient.Status().Update(context, meshSync, &client.UpdateOptions{FieldManager: FileManager})
113+
err := fakeClient.Status().Update(context, meshSync, &client.SubResourceUpdateOptions{
114+
UpdateOptions: client.UpdateOptions{FieldManager: FileManager},
115+
})
114116

115117
Expect(err).NotTo(HaveOccurred())
116118
Expect(meshSync.Status.PublishingTo == PublishingTo).Should(BeTrue())

go.mod

Lines changed: 31 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,19 @@ module github.com/layer5io/meshery-operator
22

33
go 1.19
44

5-
replace (
6-
k8s.io/api => k8s.io/api v0.25.3
7-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.3
8-
k8s.io/apimachinery => k8s.io/apimachinery v0.25.3
9-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.3
10-
k8s.io/client-go => k8s.io/client-go v0.25.3
11-
k8s.io/kubectl => k8s.io/kubectl v0.25.3
12-
)
13-
145
require (
156
github.com/go-logr/logr v1.2.4
167
github.com/layer5io/meshkit v0.6.45
17-
github.com/onsi/ginkgo/v2 v2.6.0
18-
github.com/onsi/gomega v1.24.1
19-
k8s.io/api v0.26.1
20-
k8s.io/apiextensions-apiserver v0.26.1
21-
k8s.io/apimachinery v0.26.1
22-
k8s.io/client-go v0.26.1
23-
sigs.k8s.io/controller-runtime v0.13.0
8+
github.com/onsi/ginkgo/v2 v2.9.5
9+
github.com/onsi/gomega v1.27.7
10+
k8s.io/api v0.27.2
11+
k8s.io/apiextensions-apiserver v0.27.2
12+
k8s.io/apimachinery v0.27.2
13+
k8s.io/client-go v0.27.2
14+
sigs.k8s.io/controller-runtime v0.15.0
2415
)
2516

2617
require (
27-
cloud.google.com/go/compute v1.15.1 // indirect
28-
cloud.google.com/go/compute/metadata v0.2.3 // indirect
2918
cuelang.org/go v0.4.3 // indirect
3019
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
3120
github.com/BurntSushi/toml v1.2.1 // indirect
@@ -49,26 +38,28 @@ require (
4938
github.com/docker/go-connections v0.4.0 // indirect
5039
github.com/docker/go-metrics v0.0.1 // indirect
5140
github.com/docker/go-units v0.5.0 // indirect
52-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
41+
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
5342
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
5443
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
5544
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
5645
github.com/fatih/color v1.13.0 // indirect
5746
github.com/fsnotify/fsnotify v1.6.0 // indirect
5847
github.com/go-errors/errors v1.0.1 // indirect
5948
github.com/go-gorp/gorp/v3 v3.0.2 // indirect
60-
github.com/go-logr/zapr v1.2.3 // indirect
49+
github.com/go-logr/zapr v1.2.4 // indirect
6150
github.com/go-openapi/jsonpointer v0.19.6 // indirect
62-
github.com/go-openapi/jsonreference v0.20.1 // indirect
51+
github.com/go-openapi/jsonreference v0.20.2 // indirect
6352
github.com/go-openapi/swag v0.22.3 // indirect
53+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
6454
github.com/gobwas/glob v0.2.3 // indirect
6555
github.com/gogo/protobuf v1.3.2 // indirect
6656
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6757
github.com/golang/protobuf v1.5.3 // indirect
6858
github.com/google/btree v1.0.1 // indirect
69-
github.com/google/gnostic v0.5.7-v3refs // indirect
59+
github.com/google/gnostic v0.6.9 // indirect
7060
github.com/google/go-cmp v0.5.9 // indirect
7161
github.com/google/gofuzz v1.2.0 // indirect
62+
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
7263
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
7364
github.com/google/uuid v1.3.0 // indirect
7465
github.com/gorilla/mux v1.8.0 // indirect
@@ -112,13 +103,12 @@ require (
112103
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
113104
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
114105
github.com/pkg/errors v0.9.1 // indirect
115-
github.com/prometheus/client_golang v1.15.0 // indirect
116-
github.com/prometheus/client_model v0.3.0 // indirect
117-
github.com/prometheus/common v0.42.0 // indirect
118-
github.com/prometheus/procfs v0.9.0 // indirect
119-
github.com/rogpeppe/go-internal v1.9.0 // indirect
106+
github.com/prometheus/client_golang v1.15.1 // indirect
107+
github.com/prometheus/client_model v0.4.0 // indirect
108+
github.com/prometheus/common v0.44.0 // indirect
109+
github.com/prometheus/procfs v0.10.0 // indirect
120110
github.com/rubenv/sql-migrate v1.2.0 // indirect
121-
github.com/russross/blackfriday v1.6.0 // indirect
111+
github.com/russross/blackfriday/v2 v2.1.0 // indirect
122112
github.com/shopspring/decimal v1.2.0 // indirect
123113
github.com/sirupsen/logrus v1.9.0 // indirect
124114
github.com/spf13/cast v1.5.0 // indirect
@@ -133,14 +123,15 @@ require (
133123
go.uber.org/multierr v1.6.0 // indirect
134124
go.uber.org/zap v1.24.0 // indirect
135125
golang.org/x/crypto v0.5.0 // indirect
136-
golang.org/x/net v0.9.0 // indirect
137-
golang.org/x/oauth2 v0.5.0 // indirect
138-
golang.org/x/sync v0.1.0 // indirect
139-
golang.org/x/sys v0.7.0 // indirect
140-
golang.org/x/term v0.7.0 // indirect
126+
golang.org/x/net v0.10.0 // indirect
127+
golang.org/x/oauth2 v0.8.0 // indirect
128+
golang.org/x/sync v0.2.0 // indirect
129+
golang.org/x/sys v0.8.0 // indirect
130+
golang.org/x/term v0.8.0 // indirect
141131
golang.org/x/text v0.9.0 // indirect
142132
golang.org/x/time v0.3.0 // indirect
143-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
133+
golang.org/x/tools v0.9.1 // indirect
134+
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
144135
google.golang.org/appengine v1.6.7 // indirect
145136
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
146137
google.golang.org/grpc v1.54.0 // indirect
@@ -152,15 +143,15 @@ require (
152143
gorm.io/driver/sqlite v1.4.4 // indirect
153144
gorm.io/gorm v1.24.3 // indirect
154145
helm.sh/helm/v3 v3.11.1 // indirect
155-
k8s.io/apiserver v0.26.0 // indirect
146+
k8s.io/apiserver v0.27.2 // indirect
156147
k8s.io/cli-runtime v0.26.0 // indirect
157-
k8s.io/component-base v0.26.1 // indirect
158-
k8s.io/klog/v2 v2.90.0 // indirect
159-
k8s.io/kube-openapi v0.0.0-20230109183929-3758b55a6596 // indirect
148+
k8s.io/component-base v0.27.2 // indirect
149+
k8s.io/klog/v2 v2.100.1 // indirect
150+
k8s.io/kube-openapi v0.0.0-20230523194449-df37dd07aa00 // indirect
160151
k8s.io/kubectl v0.26.0 // indirect
161-
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
152+
k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect
162153
oras.land/oras-go v1.2.2 // indirect
163-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
154+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
164155
sigs.k8s.io/kustomize/api v0.12.1 // indirect
165156
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
166157
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect

0 commit comments

Comments
 (0)