Skip to content

Commit 0204698

Browse files
authored
velero crd and golang dep updates for 1.9.5 (#883)
1 parent 2487332 commit 0204698

6 files changed

Lines changed: 451 additions & 236 deletions

File tree

.ci-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: release
33
namespace: openshift
4-
tag: rhel-8-release-golang-1.17-openshift-4.9
4+
tag: rhel-8-golang-1.19-openshift-4.12

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM quay.io/konveyor/builder:v1.17.2 as builder
2+
FROM quay.io/konveyor/builder:v1.18 as builder
33

44
WORKDIR /go/src/github.com/openshift/oadp-operator
55
# Copy the Go Modules manifests

bundle/manifests/velero.io_restores.yaml

Lines changed: 156 additions & 77 deletions
Large diffs are not rendered by default.

config/crd/bases/velero.io_restores.yaml

Lines changed: 156 additions & 77 deletions
Large diffs are not rendered by default.

go.mod

Lines changed: 32 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
module github.com/openshift/oadp-operator
22

3-
go 1.17
3+
go 1.19
44

55
require (
66
github.com/aws/aws-sdk-go v1.34.11
77
github.com/go-logr/logr v1.2.3
8-
github.com/google/uuid v1.2.0
8+
github.com/google/uuid v1.3.0
99
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0
1010
github.com/onsi/ginkgo v1.16.5
1111
github.com/onsi/ginkgo/v2 v2.4.0
@@ -16,12 +16,12 @@ require (
1616
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.51.2
1717
github.com/sirupsen/logrus v1.8.1
1818
github.com/vmware-tanzu/velero v1.9.2-rc.1 // TODO: Update this to a pinned version
19-
k8s.io/api v0.23.0
20-
k8s.io/apiextensions-apiserver v0.23.0
21-
k8s.io/apimachinery v0.23.0
22-
k8s.io/client-go v0.23.0
23-
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
24-
sigs.k8s.io/controller-runtime v0.11.0
19+
k8s.io/api v0.24.2
20+
k8s.io/apiextensions-apiserver v0.24.2
21+
k8s.io/apimachinery v0.24.2
22+
k8s.io/client-go v0.24.2
23+
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
24+
sigs.k8s.io/controller-runtime v0.12.2
2525
)
2626

2727
require (
@@ -48,27 +48,33 @@ require (
4848
github.com/cespare/xxhash/v2 v2.1.2 // indirect
4949
github.com/davecgh/go-spew v1.1.1 // indirect
5050
github.com/dimchansky/utfbom v1.1.1 // indirect
51-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
51+
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
52+
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
5253
github.com/fatih/color v1.13.0 // indirect
5354
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
54-
github.com/fsnotify/fsnotify v1.5.1 // indirect
55+
github.com/fsnotify/fsnotify v1.5.4 // indirect
5556
github.com/go-logr/zapr v1.2.0 // indirect
57+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
58+
github.com/go-openapi/jsonreference v0.20.0 // indirect
59+
github.com/go-openapi/swag v0.21.1 // indirect
5660
github.com/gobwas/glob v0.2.3 // indirect
5761
github.com/gofrs/uuid v3.2.0+incompatible // indirect
5862
github.com/gogo/protobuf v1.3.2 // indirect
5963
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6064
github.com/golang/protobuf v1.5.2 // indirect
65+
github.com/google/gnostic v0.6.9 // indirect
6166
github.com/google/gofuzz v1.2.0 // indirect
62-
github.com/googleapis/gnostic v0.5.5 // indirect
6367
github.com/hashicorp/go-hclog v0.14.1 // indirect
6468
github.com/hashicorp/go-plugin v1.4.3 // indirect
6569
github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb // indirect
66-
github.com/imdario/mergo v0.3.12 // indirect
70+
github.com/imdario/mergo v0.3.13 // indirect
6771
github.com/inconshreveable/mousetrap v1.0.0 // indirect
6872
github.com/jmespath/go-jmespath v0.3.0 // indirect
6973
github.com/joho/godotenv v1.3.0 // indirect
74+
github.com/josharian/intern v1.0.0 // indirect
7075
github.com/json-iterator/go v1.1.12 // indirect
7176
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
77+
github.com/mailru/easyjson v0.7.7 // indirect
7278
github.com/mattn/go-colorable v0.1.9 // indirect
7379
github.com/mattn/go-isatty v0.0.14 // indirect
7480
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
@@ -77,43 +83,44 @@ require (
7783
github.com/moby/spdystream v0.2.0 // indirect
7884
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7985
github.com/modern-go/reflect2 v1.0.2 // indirect
86+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8087
github.com/nxadm/tail v1.4.8 // indirect
8188
github.com/oklog/run v1.0.0 // indirect
8289
github.com/pkg/errors v0.9.1 // indirect
8390
github.com/prometheus/client_golang v1.12.2 // indirect
8491
github.com/prometheus/client_model v0.2.0 // indirect
85-
github.com/prometheus/common v0.32.1 // indirect
92+
github.com/prometheus/common v0.34.0 // indirect
8693
github.com/prometheus/procfs v0.7.3 // indirect
87-
github.com/spf13/cobra v1.2.1 // indirect
94+
github.com/spf13/cobra v1.4.0 // indirect
8895
github.com/spf13/pflag v1.0.5 // indirect
8996
go.uber.org/atomic v1.7.0 // indirect
9097
go.uber.org/multierr v1.6.0 // indirect
9198
go.uber.org/zap v1.19.1 // indirect
92-
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
99+
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
93100
golang.org/x/net v0.1.0 // indirect
94-
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
101+
golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb // indirect
95102
golang.org/x/sys v0.2.0 // indirect
96103
golang.org/x/term v0.1.0 // indirect
97104
golang.org/x/text v0.4.0 // indirect
98-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
105+
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
99106
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
100107
google.golang.org/appengine v1.6.7 // indirect
101-
google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0 // indirect
108+
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
102109
google.golang.org/grpc v1.40.0 // indirect
103110
google.golang.org/protobuf v1.28.0 // indirect
104111
gopkg.in/inf.v0 v0.9.1 // indirect
105112
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
106113
gopkg.in/yaml.v2 v2.4.0 // indirect
107114
gopkg.in/yaml.v3 v3.0.1 // indirect
108-
k8s.io/cli-runtime v0.22.2 // indirect
109-
k8s.io/component-base v0.23.0 // indirect
110-
k8s.io/klog/v2 v2.30.0 // indirect
115+
k8s.io/cli-runtime v0.24.0 // indirect
116+
k8s.io/component-base v0.24.2 // indirect
117+
k8s.io/klog/v2 v2.60.1 // indirect
111118
k8s.io/kube-aggregator v0.19.12 // indirect
112-
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
113-
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
114-
sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
119+
k8s.io/kube-openapi v0.0.0-20220614142933-1062c7ade5f8 // indirect
120+
sigs.k8s.io/json v0.0.0-20220525155127-227cbc7cc124 // indirect
121+
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
115122
sigs.k8s.io/yaml v1.3.0 // indirect
116123
)
117124

118125
// replace with https://github.com/openshift/velero/tree/oadp-1.1
119-
replace github.com/vmware-tanzu/velero => github.com/openshift/velero v0.10.2-0.20220915155627-5fc1e6615f62
126+
replace github.com/vmware-tanzu/velero => github.com/openshift/velero v0.10.2-0.20230124191620-7c2f85743d78

0 commit comments

Comments
 (0)