Bug 2033720: Bump k8 dependencies to v0.23.1 #409
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| build_root_image: | ||
| name: release | ||
| namespace: openshift | ||
| tag: rhel-8-release-golang-1.17-openshift-4.10 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| module github.com/openshift/cluster-samples-operator | ||
|
|
||
| go 1.17 | ||
|
|
||
| require ( | ||
| github.com/emicklei/go-restful v2.11.1+incompatible // indirect | ||
|
|
@@ -14,8 +14,87 @@ require ( | |
| github.com/prometheus/common v0.28.0 | ||
| github.com/sirupsen/logrus v1.8.1 | ||
| github.com/spf13/cobra v1.2.1 | ||
| k8s.io/api v0.23.1 | ||
| k8s.io/apimachinery v0.23.1 | ||
| k8s.io/apiserver v0.23.1 // indirect | ||
| k8s.io/client-go v0.23.1 | ||
| ) | ||
|
|
||
| require ( | ||
|
Contributor
There was a problem hiding this comment. I tried the bump locally and did not need all this require stuff @dperaza4dustbit remove it and re-run if for some reason you can't do this on your Mac without this, then I'll submit an alternative PR
Contributor
Author
There was a problem hiding this comment. Did you move go to 1.7 at the top of go.mod?
Contributor
There was a problem hiding this comment. yep your are right @dperaza4dustbit and now looking at it again, I see it now does 1 require blocks ... the top one with direct dependencies and the bottom one with indirect one let's leave as is and retest after merging the release PRs |
||
| cloud.google.com/go v0.81.0 // indirect | ||
| github.com/NYTimes/gziphandler v1.1.1 // indirect | ||
| github.com/PuerkitoBio/purell v1.1.1 // indirect | ||
| github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect | ||
| github.com/beorn7/perks v1.0.1 // indirect | ||
| github.com/blang/semver v3.5.1+incompatible // indirect | ||
| github.com/cespare/xxhash/v2 v2.1.1 // indirect | ||
| github.com/coreos/go-semver v0.3.0 // indirect | ||
| github.com/coreos/go-systemd/v22 v22.3.2 // indirect | ||
| github.com/davecgh/go-spew v1.1.1 // indirect | ||
| github.com/evanphx/json-patch v4.12.0+incompatible // indirect | ||
| github.com/felixge/httpsnoop v1.0.1 // indirect | ||
| github.com/fsnotify/fsnotify v1.4.9 // indirect | ||
| github.com/go-logr/logr v1.2.0 // indirect | ||
| github.com/go-openapi/jsonpointer v0.19.5 // indirect | ||
| github.com/go-openapi/jsonreference v0.19.5 // indirect | ||
| github.com/go-openapi/swag v0.19.14 // indirect | ||
| github.com/gogo/protobuf v1.3.2 // indirect | ||
| github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect | ||
| github.com/golang/protobuf v1.5.2 // indirect | ||
| github.com/google/go-cmp v0.5.5 // indirect | ||
| github.com/google/uuid v1.1.2 // indirect | ||
| github.com/googleapis/gnostic v0.5.5 // indirect | ||
| github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect | ||
| github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect | ||
| github.com/imdario/mergo v0.3.7 // indirect | ||
| github.com/inconshreveable/mousetrap v1.0.0 // indirect | ||
| github.com/josharian/intern v1.0.0 // indirect | ||
| github.com/json-iterator/go v1.1.12 // indirect | ||
| github.com/mailru/easyjson v0.7.6 // indirect | ||
| github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect | ||
| github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect | ||
| github.com/modern-go/reflect2 v1.0.2 // indirect | ||
| github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect | ||
| github.com/pkg/errors v0.9.1 // indirect | ||
| github.com/prometheus/procfs v0.6.0 // indirect | ||
| github.com/spf13/pflag v1.0.5 // indirect | ||
| go.etcd.io/etcd/api/v3 v3.5.0 // indirect | ||
| go.etcd.io/etcd/client/pkg/v3 v3.5.0 // indirect | ||
| go.etcd.io/etcd/client/v3 v3.5.0 // indirect | ||
| go.opentelemetry.io/contrib v0.20.0 // indirect | ||
| go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect | ||
| go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect | ||
| go.opentelemetry.io/otel v0.20.0 // indirect | ||
| go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect | ||
| go.opentelemetry.io/otel/metric v0.20.0 // indirect | ||
| go.opentelemetry.io/otel/sdk v0.20.0 // indirect | ||
| go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect | ||
| go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect | ||
| go.opentelemetry.io/otel/trace v0.20.0 // indirect | ||
| go.opentelemetry.io/proto/otlp v0.7.0 // indirect | ||
| go.uber.org/atomic v1.7.0 // indirect | ||
| go.uber.org/multierr v1.6.0 // indirect | ||
| go.uber.org/zap v1.19.0 // indirect | ||
| golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect | ||
| golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect | ||
| golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect | ||
| golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e // indirect | ||
| golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect | ||
| golang.org/x/text v0.3.7 // indirect | ||
| golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect | ||
| google.golang.org/appengine v1.6.7 // indirect | ||
| google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 // indirect | ||
| google.golang.org/grpc v1.40.0 // indirect | ||
| google.golang.org/protobuf v1.27.1 // indirect | ||
| gopkg.in/inf.v0 v0.9.1 // indirect | ||
| gopkg.in/yaml.v2 v2.4.0 // indirect | ||
| gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect | ||
| k8s.io/component-base v0.23.1 // indirect | ||
| k8s.io/klog/v2 v2.30.0 // indirect | ||
| k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect | ||
| k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect | ||
| sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25 // indirect | ||
| sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect | ||
| sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect | ||
| sigs.k8s.io/yaml v1.2.0 // indirect | ||
| ) | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you need to change line 6 below too
FROM registry.ci.openshift.org/origin/4.10:base
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if the e2e's stay green I'll handle this in a separate PR