-
Notifications
You must be signed in to change notification settings - Fork 1.5k
CORS-3280: Bump cluster-api-provider-gcp to v1.6.0 #8153
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
openshift-merge-bot
merged 5 commits into
openshift:master
from
bfournie:cluster-api-provider-gcp-v1.6
Mar 25, 2024
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
679a4d0
CORS-3280: Bump cluster-api-provider-gcp to v1.6.0
bfournie d55e3ee
changes to gcp-infrastructure-components.yaml
bfournie 9759897
go mod changes for provider
bfournie 245b9ef
go mod vendor for cluster-api-provider-gcp
bfournie 3f011bd
pinned oauth2 for provider
bfournie File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
The diff you're trying to view is too large. We only load the first 3000 changed files.
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,89 +1,135 @@ | ||
| module openshift/installer/cluster-api/providers/gcp | ||
|
|
||
| go 1.20 | ||
| go 1.21 | ||
|
|
||
| require sigs.k8s.io/cluster-api-provider-gcp v1.4.1-0.20231017090837-ee0bd436b734 | ||
| replace ( | ||
| // match the changes upstream | ||
| // pinning cel-go due to a breaking change https://github.com/kubernetes/apiserver/issues/97 | ||
| github.com/google/cel-go => github.com/google/cel-go v0.16.1 | ||
| // See https://github.com/openshift/installer/pull/8133 | ||
| golang.org/x/oauth2 => golang.org/x/oauth2 v0.15.0 | ||
| google.golang.org/api => google.golang.org/api v0.157.0 | ||
| // kube-openapi should match the version imported by CAPI. | ||
| k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 | ||
| ) | ||
|
|
||
| require sigs.k8s.io/cluster-api-provider-gcp v1.6.0 | ||
|
|
||
| require ( | ||
| cloud.google.com/go/compute v1.23.1 // indirect | ||
| cloud.google.com/go v0.112.0 // indirect | ||
| cloud.google.com/go/compute v1.24.0 // indirect | ||
| cloud.google.com/go/compute/metadata v0.2.3 // indirect | ||
| cloud.google.com/go/container v1.26.1 // indirect | ||
| cloud.google.com/go/iam v1.1.3 // indirect | ||
| cloud.google.com/go/container v1.31.0 // indirect | ||
| cloud.google.com/go/iam v1.1.6 // indirect | ||
| cloud.google.com/go/longrunning v0.5.5 // indirect | ||
| cloud.google.com/go/resourcemanager v1.9.5 // indirect | ||
| github.com/GoogleCloudPlatform/k8s-cloud-provider v1.24.0 // indirect | ||
| github.com/Masterminds/semver/v3 v3.2.1 // indirect | ||
| github.com/NYTimes/gziphandler v1.1.1 // indirect | ||
| github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect | ||
| github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect | ||
| github.com/beorn7/perks v1.0.1 // indirect | ||
| github.com/blang/semver v3.5.1+incompatible // indirect | ||
| github.com/blang/semver/v4 v4.0.0 // indirect | ||
| github.com/cenkalti/backoff/v4 v4.2.1 // indirect | ||
| github.com/cespare/xxhash/v2 v2.2.0 // indirect | ||
| github.com/davecgh/go-spew v1.1.1 // indirect | ||
| github.com/emicklei/go-restful/v3 v3.10.2 // indirect | ||
| github.com/evanphx/json-patch/v5 v5.6.0 // indirect | ||
| github.com/fsnotify/fsnotify v1.6.0 // indirect | ||
| github.com/go-logr/logr v1.2.4 // indirect | ||
| github.com/coreos/go-semver v0.3.1 // indirect | ||
| github.com/coreos/go-systemd/v22 v22.5.0 // indirect | ||
| github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect | ||
| github.com/emicklei/go-restful/v3 v3.11.0 // indirect | ||
| github.com/evanphx/json-patch v5.6.0+incompatible // indirect | ||
| github.com/evanphx/json-patch/v5 v5.8.0 // indirect | ||
| github.com/felixge/httpsnoop v1.0.4 // indirect | ||
| github.com/fsnotify/fsnotify v1.7.0 // indirect | ||
| github.com/go-logr/logr v1.4.1 // indirect | ||
| github.com/go-logr/stdr v1.2.2 // indirect | ||
| github.com/go-openapi/jsonpointer v0.19.6 // indirect | ||
| github.com/go-openapi/jsonreference v0.20.1 // indirect | ||
| github.com/go-openapi/jsonreference v0.20.2 // indirect | ||
| github.com/go-openapi/swag v0.22.3 // indirect | ||
| github.com/gobuffalo/flect v1.0.2 // 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.3 // indirect | ||
| github.com/google/gnostic v0.6.9 // indirect | ||
| github.com/google/cel-go v0.17.7 // indirect | ||
| github.com/google/gnostic-models v0.6.8 // indirect | ||
| github.com/google/go-cmp v0.6.0 // indirect | ||
| github.com/google/gofuzz v1.2.0 // indirect | ||
| github.com/google/s2a-go v0.1.7 // indirect | ||
| github.com/google/uuid v1.3.1 // indirect | ||
| github.com/googleapis/enterprise-certificate-proxy v0.3.1 // indirect | ||
| github.com/googleapis/gax-go/v2 v2.12.0 // indirect | ||
| github.com/google/uuid v1.6.0 // indirect | ||
| github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect | ||
| github.com/googleapis/gax-go/v2 v2.12.2 // indirect | ||
| github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect | ||
| github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect | ||
| github.com/huandu/xstrings v1.4.0 // indirect | ||
| github.com/imdario/mergo v0.3.13 // indirect | ||
| github.com/inconshreveable/mousetrap v1.1.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.7 // indirect | ||
| github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect | ||
| github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // 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/onsi/gomega v1.28.0 // indirect | ||
| github.com/onsi/gomega v1.31.1 // indirect | ||
| github.com/pkg/errors v0.9.1 // indirect | ||
| github.com/prometheus/client_golang v1.16.0 // indirect | ||
| github.com/prometheus/client_model v0.4.0 // indirect | ||
| github.com/prometheus/common v0.44.0 // indirect | ||
| github.com/prometheus/procfs v0.11.1 // indirect | ||
| github.com/prometheus/client_golang v1.18.0 // indirect | ||
| github.com/prometheus/client_model v0.5.0 // indirect | ||
| github.com/prometheus/common v0.45.0 // indirect | ||
| github.com/prometheus/procfs v0.12.0 // indirect | ||
| github.com/spf13/cobra v1.8.0 // indirect | ||
| github.com/spf13/pflag v1.0.5 // indirect | ||
| github.com/stoewer/go-strcase v1.2.0 // indirect | ||
| go.etcd.io/etcd/api/v3 v3.5.10 // indirect | ||
| go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect | ||
| go.etcd.io/etcd/client/v3 v3.5.10 // indirect | ||
| go.opencensus.io v0.24.0 // indirect | ||
| golang.org/x/crypto v0.14.0 // indirect | ||
| golang.org/x/mod v0.13.0 // indirect | ||
| golang.org/x/net v0.17.0 // indirect | ||
| golang.org/x/oauth2 v0.13.0 // indirect | ||
| golang.org/x/sync v0.4.0 // indirect | ||
| golang.org/x/sys v0.13.0 // indirect | ||
| golang.org/x/term v0.13.0 // indirect | ||
| golang.org/x/text v0.13.0 // indirect | ||
| golang.org/x/time v0.3.0 // indirect | ||
| gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect | ||
| google.golang.org/api v0.147.0 // indirect | ||
| google.golang.org/appengine v1.6.7 // indirect | ||
| google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 // indirect | ||
| google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 // indirect | ||
| google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c // indirect | ||
| google.golang.org/grpc v1.58.3 // indirect | ||
| google.golang.org/protobuf v1.31.0 // indirect | ||
| go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 // indirect | ||
| go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 // indirect | ||
| go.opentelemetry.io/otel v1.23.0 // indirect | ||
| go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect | ||
| go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect | ||
| go.opentelemetry.io/otel/metric v1.23.0 // indirect | ||
| go.opentelemetry.io/otel/sdk v1.21.0 // indirect | ||
| go.opentelemetry.io/otel/trace v1.23.0 // indirect | ||
| go.opentelemetry.io/proto/otlp v1.0.0 // indirect | ||
| go.uber.org/multierr v1.11.0 // indirect | ||
| go.uber.org/zap v1.26.0 // indirect | ||
| golang.org/x/crypto v0.19.0 // indirect | ||
| golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect | ||
| golang.org/x/mod v0.15.0 // indirect | ||
| golang.org/x/net v0.21.0 // indirect | ||
| golang.org/x/oauth2 v0.17.0 // indirect | ||
| golang.org/x/sync v0.6.0 // indirect | ||
| golang.org/x/sys v0.17.0 // indirect | ||
| golang.org/x/term v0.17.0 // indirect | ||
| golang.org/x/text v0.14.0 // indirect | ||
| golang.org/x/time v0.5.0 // indirect | ||
| gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect | ||
| google.golang.org/api v0.167.0 // indirect | ||
| google.golang.org/appengine v1.6.8 // indirect | ||
| google.golang.org/genproto v0.0.0-20240205150955-31a09d347014 // indirect | ||
| google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014 // indirect | ||
| google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 // indirect | ||
| google.golang.org/grpc v1.62.0 // indirect | ||
| google.golang.org/protobuf v1.32.0 // indirect | ||
| gopkg.in/inf.v0 v0.9.1 // indirect | ||
| gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect | ||
| gopkg.in/yaml.v2 v2.4.0 // indirect | ||
| gopkg.in/yaml.v3 v3.0.1 // indirect | ||
| k8s.io/api v0.27.2 // indirect | ||
| k8s.io/apiextensions-apiserver v0.27.2 // indirect | ||
| k8s.io/apimachinery v0.27.2 // indirect | ||
| k8s.io/client-go v0.27.2 // indirect | ||
| k8s.io/cluster-bootstrap v0.27.2 // indirect | ||
| k8s.io/component-base v0.27.2 // indirect | ||
| k8s.io/klog/v2 v2.90.1 // indirect | ||
| k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect | ||
| k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect | ||
| sigs.k8s.io/cluster-api v1.5.0 // indirect | ||
| sigs.k8s.io/controller-runtime v0.15.1 // indirect | ||
| k8s.io/api v0.28.6 // indirect | ||
| k8s.io/apiextensions-apiserver v0.28.6 // indirect | ||
| k8s.io/apimachinery v0.28.6 // indirect | ||
| k8s.io/apiserver v0.28.6 // indirect | ||
| k8s.io/client-go v0.28.6 // indirect | ||
| k8s.io/cluster-bootstrap v0.28.4 // indirect | ||
| k8s.io/component-base v0.28.6 // indirect | ||
| k8s.io/klog/v2 v2.110.1 // indirect | ||
| k8s.io/kms v0.28.6 // indirect | ||
| k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect | ||
| k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect | ||
| sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect | ||
| sigs.k8s.io/cluster-api v1.6.2 // indirect | ||
| sigs.k8s.io/controller-runtime v0.16.5 // indirect | ||
| sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect | ||
| sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect | ||
| sigs.k8s.io/yaml v1.3.0 // indirect | ||
| sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect | ||
| sigs.k8s.io/yaml v1.4.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.
Uh oh!
There was an error while loading. Please reload this page.