Skip to content

Commit a67c115

Browse files
awgreeneawgreene
authored
bump-k8s-v0.25.3 (#2885)
This commit performs a number of small changes to support upgrading our kubernetes dependencies to v0.25.3 Signed-off-by: Alexander Greene <greene.al1991@gmail.com> Signed-off-by: Alexander Greene <greene.al1991@gmail.com>
1 parent b833ecb commit a67c115

File tree

1,265 files changed

+64860
-14162
lines changed

Some content is hidden

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

1,265 files changed

+64860
-14162
lines changed

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ WORKDIR /build
66

77
# copy just enough of the git repo to parse HEAD, used to record version in OLM binaries
88
RUN dnf update -y && dnf install -y bash make git mercurial jq wget && dnf upgrade -y
9-
RUN curl -sSL https://go.dev/dl/go1.17.6.linux-amd64.tar.gz | tar -xzf - -C /usr/local
9+
RUN curl -sSL https://go.dev/dl/go1.19.linux-amd64.tar.gz | tar -xzf - -C /usr/local
1010
ENV PATH=/usr/local/go/bin:$PATH
1111
COPY .git/HEAD .git/HEAD
1212
COPY .git/refs/heads/. .git/refs/heads

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ endif
1111
SHELL := /bin/bash
1212
ORG := github.com/operator-framework
1313
PKG := $(ORG)/operator-lifecycle-manager
14-
MOD_FLAGS := $(shell (go version | grep -q -E "1\.1[1-9]") && echo -mod=vendor)
14+
MOD_FLAGS := $(shell (go version | grep -q -E "1\.1[1-9]") && echo -mod=vendor && echo -buildvcs=false)
1515
BUILD_TAGS := "json1"
1616
CMDS := $(shell go list $(MOD_FLAGS) ./cmd/...)
1717
TCMDS := $(shell go list $(MOD_FLAGS) ./test/e2e/...)
@@ -100,7 +100,7 @@ build-util-linux: build-util
100100
build-util: bin/cpb
101101

102102
bin/cpb: FORCE
103-
CGO_ENABLED=0 $(arch_flags) go build $(MOD_FLAGS) -ldflags '-extldflags "-static"' -o $@ ./util/cpb
103+
CGO_ENABLED=0 $(arch_flags) go build -buildvcs=false $(MOD_FLAGS) -ldflags '-extldflags "-static"' -o $@ ./util/cpb
104104

105105
$(CMDS): version_flags=-ldflags "-X $(PKG)/pkg/version.GitCommit=$(GIT_COMMIT) -X $(PKG)/pkg/version.OLMVersion=`cat OLM_VERSION`"
106106
$(CMDS):

‎go.mod‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ require (
1111
github.com/ghodss/yaml v1.0.0
1212
github.com/go-air/gini v1.0.4
1313
github.com/go-bindata/go-bindata/v3 v3.1.3
14-
github.com/go-logr/logr v1.2.2
14+
github.com/go-logr/logr v1.2.3
1515
github.com/golang/mock v1.6.0
16-
github.com/google/go-cmp v0.5.6
16+
github.com/google/go-cmp v0.5.8
1717
github.com/googleapis/gnostic v0.5.5
1818
github.com/itchyny/gojq v0.11.0
1919
github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2
2020
github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37
2121
github.com/mitchellh/hashstructure v1.0.0
2222
github.com/mitchellh/mapstructure v1.4.1
23-
github.com/onsi/ginkgo/v2 v2.1.3
24-
github.com/onsi/gomega v1.18.1
25-
github.com/openshift/api v0.0.0-20200331152225-585af27e34fd
23+
github.com/onsi/ginkgo/v2 v2.1.6
24+
github.com/onsi/gomega v1.20.1
25+
github.com/openshift/api v3.9.0+incompatible
2626
github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0
2727
github.com/operator-framework/api v0.17.1
2828
github.com/operator-framework/operator-registry v1.17.5
@@ -34,23 +34,23 @@ require (
3434
github.com/sirupsen/logrus v1.8.1
3535
github.com/spf13/cobra v1.4.0
3636
github.com/spf13/pflag v1.0.5
37-
github.com/stretchr/testify v1.7.1
38-
golang.org/x/net v0.0.0-20220225172249-27dd8689420f
37+
github.com/stretchr/testify v1.8.0
38+
golang.org/x/net v0.0.0-20220909164309-bea034e7d591
3939
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
40-
google.golang.org/grpc v1.43.0
40+
google.golang.org/grpc v1.47.0
4141
gopkg.in/yaml.v2 v2.4.0
4242
helm.sh/helm/v3 v3.9.0
43-
k8s.io/api v0.24.0
44-
k8s.io/apiextensions-apiserver v0.24.0
45-
k8s.io/apimachinery v0.24.0
46-
k8s.io/apiserver v0.24.0
47-
k8s.io/client-go v0.24.0
48-
k8s.io/code-generator v0.24.0
49-
k8s.io/component-base v0.24.0
43+
k8s.io/api v0.25.3
44+
k8s.io/apiextensions-apiserver v0.25.3
45+
k8s.io/apimachinery v0.25.3
46+
k8s.io/apiserver v0.25.3
47+
k8s.io/client-go v0.25.3
48+
k8s.io/code-generator v0.25.3
49+
k8s.io/component-base v0.25.3
5050
k8s.io/klog v1.0.0
51-
k8s.io/kube-aggregator v0.24.0
52-
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42
53-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
51+
k8s.io/kube-aggregator v0.25.3
52+
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1
53+
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73
5454
sigs.k8s.io/controller-runtime v0.12.1
5555
sigs.k8s.io/controller-tools v0.8.0
5656
sigs.k8s.io/kind v0.14.0
@@ -74,8 +74,8 @@ require (
7474
cloud.google.com/go v0.99.0 // indirect
7575
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
7676
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
77-
github.com/Azure/go-autorest/autorest v0.11.20 // indirect
78-
github.com/Azure/go-autorest/autorest/adal v0.9.15 // indirect
77+
github.com/Azure/go-autorest/autorest v0.11.27 // indirect
78+
github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
7979
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
8080
github.com/Azure/go-autorest/logger v0.2.1 // indirect
8181
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
@@ -92,7 +92,7 @@ require (
9292
github.com/PuerkitoBio/purell v1.1.1 // indirect
9393
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
9494
github.com/alessio/shellescape v1.4.1 // indirect
95-
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e // indirect
95+
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed // indirect
9696
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
9797
github.com/beorn7/perks v1.0.1 // indirect
9898
github.com/blang/semver v3.5.1+incompatible // indirect
@@ -112,15 +112,15 @@ require (
112112
github.com/docker/go-connections v0.4.0 // indirect
113113
github.com/docker/go-metrics v0.0.1 // indirect
114114
github.com/docker/go-units v0.4.0 // indirect
115-
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
115+
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
116116
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
117117
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
118118
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
119119
github.com/fatih/color v1.13.0 // indirect
120120
github.com/felixge/httpsnoop v1.0.1 // indirect
121121
github.com/go-errors/errors v1.0.1 // indirect
122122
github.com/go-gorp/gorp/v3 v3.0.2 // indirect
123-
github.com/go-logr/zapr v1.2.0 // indirect
123+
github.com/go-logr/zapr v1.2.3 // indirect
124124
github.com/go-openapi/jsonpointer v0.19.5 // indirect
125125
github.com/go-openapi/jsonreference v0.19.5 // indirect
126126
github.com/go-openapi/swag v0.19.14 // indirect
@@ -130,12 +130,12 @@ require (
130130
github.com/goccy/go-yaml v1.8.1 // indirect
131131
github.com/gofrs/flock v0.8.1 // indirect
132132
github.com/gogo/protobuf v1.3.2 // indirect
133-
github.com/golang-jwt/jwt/v4 v4.0.0 // indirect
133+
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
134134
github.com/golang-migrate/migrate/v4 v4.6.2 // indirect
135135
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
136136
github.com/golang/protobuf v1.5.2 // indirect
137137
github.com/google/btree v1.0.1 // indirect
138-
github.com/google/cel-go v0.10.1 // indirect
138+
github.com/google/cel-go v0.12.5 // indirect
139139
github.com/google/gnostic v0.5.7-v3refs // indirect
140140
github.com/google/gofuzz v1.2.0 // indirect
141141
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
@@ -199,9 +199,9 @@ require (
199199
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
200200
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
201201
go.etcd.io/bbolt v1.3.6 // indirect
202-
go.etcd.io/etcd/api/v3 v3.5.1 // indirect
203-
go.etcd.io/etcd/client/pkg/v3 v3.5.1 // indirect
204-
go.etcd.io/etcd/client/v3 v3.5.1 // indirect
202+
go.etcd.io/etcd/api/v3 v3.5.4 // indirect
203+
go.etcd.io/etcd/client/pkg/v3 v3.5.4 // indirect
204+
go.etcd.io/etcd/client/v3 v3.5.4 // indirect
205205
go.opencensus.io v0.23.0 // indirect
206206
go.opentelemetry.io/contrib v1.3.0 // indirect
207207
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0 // indirect
@@ -220,40 +220,40 @@ require (
220220
go.uber.org/zap v1.19.1 // indirect
221221
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
222222
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
223-
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
224-
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
225-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
226-
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
223+
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
224+
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
225+
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
226+
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
227227
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
228228
golang.org/x/text v0.3.7 // indirect
229-
golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717 // indirect
229+
golang.org/x/tools v0.1.12 // indirect
230230
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
231231
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
232232
google.golang.org/appengine v1.6.7 // indirect
233-
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
234-
google.golang.org/protobuf v1.27.1 // indirect
233+
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
234+
google.golang.org/protobuf v1.28.0 // indirect
235235
gopkg.in/inf.v0 v0.9.1 // indirect
236236
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
237237
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
238-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
238+
gopkg.in/yaml.v3 v3.0.1 // indirect
239239
k8s.io/cli-runtime v0.24.0 // indirect
240240
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
241-
k8s.io/klog/v2 v2.60.1 // indirect
241+
k8s.io/klog/v2 v2.80.1 // indirect
242242
k8s.io/kubectl v0.24.0 // indirect
243243
oras.land/oras-go v1.1.0 // indirect
244244
rsc.io/letsencrypt v0.0.3 // indirect
245-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30 // indirect
246-
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
245+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 // indirect
246+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
247247
sigs.k8s.io/kustomize/api v0.11.4 // indirect
248248
sigs.k8s.io/kustomize/kyaml v0.13.6 // indirect
249-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
249+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
250250
sigs.k8s.io/yaml v1.3.0 // indirect
251251
)
252252

253253
replace (
254254
// controller runtime
255-
github.com/openshift/api => github.com/openshift/api v0.0.0-20211014063134-be2a7fb8aa44
256-
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0 // release-4.5
255+
github.com/openshift/api => github.com/openshift/api v0.0.0-20221021112143-4226c2167e40 // release-4.12
256+
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c // release-4.12
257257
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0
258258
go.opentelemetry.io/otel => go.opentelemetry.io/otel v0.20.0
259259
go.opentelemetry.io/otel/sdk => go.opentelemetry.io/otel/sdk v0.20.0

0 commit comments

Comments
 (0)