Skip to content

Commit a637577

Browse files
authored
Update K8s & OpenShift versions + vendoring (#661)
* Update K8s & OpenShift versions + vendoring * Update debug.Dockerfile
1 parent cd1b858 commit a637577

File tree

330 files changed

+15713
-6576
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

330 files changed

+15713
-6576
lines changed

Diff for: debug.Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11 AS builder
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12 AS builder
22
RUN go get github.com/go-delve/delve/cmd/dlv
33
WORKDIR /go/src/github.com/openshift/insights-operator
44
COPY . .
55
RUN make build-debug
66

7-
FROM registry.ci.openshift.org/ocp/4.11:base
7+
FROM registry.ci.openshift.org/ocp/4.12:base
88
COPY --from=builder /go/src/github.com/openshift/insights-operator/bin/insights-operator /usr/bin/
99
COPY --from=builder /usr/bin/dlv /usr/bin/
1010
COPY config/pod.yaml /etc/insights-operator/server.yaml

Diff for: go.mod

+90-12
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,111 @@
11
module github.com/openshift/insights-operator
22

3-
go 1.16
3+
go 1.18
44

55
require (
66
github.com/blang/semver/v4 v4.0.0
77
github.com/evanphx/json-patch v4.12.0+incompatible
8-
github.com/go-logr/logr v1.2.2 // indirect
98
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
10-
github.com/google/go-cmp v0.5.6 // indirect
11-
github.com/google/gofuzz v1.2.0 // indirect
12-
github.com/openshift/api v0.0.0-20220525145417-ee5b62754c68
9+
github.com/openshift/api v0.0.0-20220818171529-0d6dbfdf392b
1310
github.com/openshift/build-machinery-go v0.0.0-20211213093930-7e33a7eb4ce3
14-
github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a
11+
github.com/openshift/client-go v0.0.0-20220818171251-cacee3f484a0
1512
github.com/openshift/installer v0.9.0-master.0.20191219195746-103098955ced
1613
github.com/openshift/library-go v0.0.0-20220525173854-9b950a41acdc
1714
github.com/prometheus/client_golang v1.12.1
1815
github.com/spf13/cobra v1.4.0
1916
github.com/spf13/pflag v1.0.5
2017
github.com/stretchr/testify v1.7.0
21-
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
2218
github.com/xeipuuv/gojsonschema v1.2.0
23-
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
19+
golang.org/x/net v0.0.0-20220812174116-3211cb980234
2420
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
25-
k8s.io/api v0.24.0
21+
k8s.io/api v0.24.4
2622
k8s.io/apiextensions-apiserver v0.24.0
27-
k8s.io/apimachinery v0.24.0
23+
k8s.io/apimachinery v0.24.4
2824
k8s.io/client-go v0.24.0
2925
k8s.io/component-base v0.24.0
30-
k8s.io/klog/v2 v2.60.1
31-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
26+
k8s.io/klog/v2 v2.70.1
27+
k8s.io/utils v0.0.0-20220812165043-ad590609e2e5
3228
sigs.k8s.io/yaml v1.2.0
3329
)
30+
31+
require (
32+
github.com/NYTimes/gziphandler v1.1.1 // indirect
33+
github.com/PuerkitoBio/purell v1.1.1 // indirect
34+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
35+
github.com/beorn7/perks v1.0.1 // indirect
36+
github.com/blang/semver v3.5.1+incompatible // indirect
37+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
38+
github.com/coreos/go-semver v0.3.0 // indirect
39+
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
40+
github.com/davecgh/go-spew v1.1.1 // indirect
41+
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
42+
github.com/felixge/httpsnoop v1.0.1 // indirect
43+
github.com/fsnotify/fsnotify v1.4.9 // indirect
44+
github.com/go-logr/logr v1.2.3 // indirect
45+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
46+
github.com/go-openapi/jsonreference v0.19.5 // indirect
47+
github.com/go-openapi/swag v0.19.14 // indirect
48+
github.com/gogo/protobuf v1.3.2 // indirect
49+
github.com/golang/protobuf v1.5.2 // indirect
50+
github.com/google/gnostic v0.5.7-v3refs // indirect
51+
github.com/google/go-cmp v0.5.6 // indirect
52+
github.com/google/gofuzz v1.2.0 // indirect
53+
github.com/google/uuid v1.1.2 // indirect
54+
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
55+
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
56+
github.com/imdario/mergo v0.3.7 // indirect
57+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
58+
github.com/josharian/intern v1.0.0 // indirect
59+
github.com/json-iterator/go v1.1.12 // indirect
60+
github.com/mailru/easyjson v0.7.6 // indirect
61+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
62+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
63+
github.com/modern-go/reflect2 v1.0.2 // indirect
64+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
65+
github.com/pkg/errors v0.9.1 // indirect
66+
github.com/pkg/profile v1.3.0 // indirect
67+
github.com/pmezard/go-difflib v1.0.0 // indirect
68+
github.com/prometheus/client_model v0.2.0 // indirect
69+
github.com/prometheus/common v0.32.1 // indirect
70+
github.com/prometheus/procfs v0.7.3 // indirect
71+
github.com/sirupsen/logrus v1.8.1 // indirect
72+
github.com/stretchr/objx v0.2.0 // indirect
73+
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
74+
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
75+
go.etcd.io/etcd/api/v3 v3.5.1 // indirect
76+
go.etcd.io/etcd/client/pkg/v3 v3.5.1 // indirect
77+
go.etcd.io/etcd/client/v3 v3.5.1 // indirect
78+
go.opentelemetry.io/contrib v0.20.0 // indirect
79+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
80+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
81+
go.opentelemetry.io/otel v0.20.0 // indirect
82+
go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
83+
go.opentelemetry.io/otel/metric v0.20.0 // indirect
84+
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
85+
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
86+
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
87+
go.opentelemetry.io/otel/trace v0.20.0 // indirect
88+
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
89+
go.uber.org/atomic v1.7.0 // indirect
90+
go.uber.org/multierr v1.6.0 // indirect
91+
go.uber.org/zap v1.19.0 // indirect
92+
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
93+
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
94+
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
95+
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
96+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
97+
golang.org/x/text v0.3.7 // indirect
98+
google.golang.org/appengine v1.6.7 // indirect
99+
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
100+
google.golang.org/grpc v1.40.0 // indirect
101+
google.golang.org/protobuf v1.27.1 // indirect
102+
gopkg.in/inf.v0 v0.9.1 // indirect
103+
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
104+
gopkg.in/yaml.v2 v2.4.0 // indirect
105+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
106+
k8s.io/apiserver v0.24.0 // indirect
107+
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
108+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30 // indirect
109+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
110+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
111+
)

0 commit comments

Comments
 (0)