Skip to content

Commit a95f8b3

Browse files
Merge pull request #356 from muraee/cherry-pick-hcp-labels-to-release-4.18
[release-4.18] OCPBUGS-49843: Support HCP labels
2 parents 9432fd3 + c6921f5 commit a95f8b3

File tree

546 files changed

+45085
-22983
lines changed

Some content is hidden

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

546 files changed

+45085
-22983
lines changed

go.mod

Lines changed: 42 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,30 @@ go 1.22.0
55
toolchain go1.22.5
66

77
require (
8-
github.com/aws/aws-sdk-go v1.52.6
8+
github.com/aws/aws-sdk-go v1.55.5
99
github.com/evanphx/json-patch v5.9.0+incompatible
1010
github.com/google/go-cmp v0.6.0
11-
github.com/gophercloud/gophercloud/v2 v2.1.1
11+
github.com/gophercloud/gophercloud/v2 v2.2.0
1212
github.com/gophercloud/utils/v2 v2.0.0-20240812072210-8ce1fc0f2894
1313
github.com/kubernetes-csi/external-snapshotter/client/v6 v6.3.0
14-
github.com/onsi/gomega v1.33.1
15-
github.com/openshift/api v0.0.0-20241121204516-053bb8a33f6d
14+
github.com/onsi/gomega v1.36.0
15+
github.com/openshift/api v0.0.0-20241126141851-807d6dfccb05
1616
github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660
1717
github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f
18-
github.com/openshift/hypershift v0.1.39
19-
github.com/openshift/hypershift/api v0.0.0-20240725153211-8b880bdd20d1
18+
github.com/openshift/hypershift v0.1.51
19+
github.com/openshift/hypershift/api v0.0.0-20241126143550-da24e17fcccb
2020
github.com/openshift/library-go v0.0.0-20241120135057-fc703a7407c9
21-
github.com/prometheus/client_golang v1.19.1
21+
github.com/prometheus/client_golang v1.20.5
2222
github.com/spf13/cobra v1.8.1
2323
gopkg.in/ini.v1 v1.67.0
2424
gopkg.in/yaml.v2 v2.4.0
25-
k8s.io/api v0.31.1
26-
k8s.io/apiextensions-apiserver v0.31.1
27-
k8s.io/apimachinery v0.31.1
28-
k8s.io/client-go v0.31.1
29-
k8s.io/component-base v0.31.1
25+
k8s.io/api v0.31.3
26+
k8s.io/apiextensions-apiserver v0.31.3
27+
k8s.io/apimachinery v0.31.3
28+
k8s.io/client-go v0.31.3
29+
k8s.io/component-base v0.31.3
3030
k8s.io/klog/v2 v2.130.1
31-
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6
31+
k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078
3232
sigs.k8s.io/kustomize/kyaml v0.17.1
3333
sigs.k8s.io/yaml v1.4.0
3434
)
@@ -47,7 +47,7 @@ require (
4747
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
4848
github.com/felixge/fgprof v0.9.4 // indirect
4949
github.com/felixge/httpsnoop v1.0.4 // indirect
50-
github.com/fsnotify/fsnotify v1.7.0 // indirect
50+
github.com/fsnotify/fsnotify v1.8.0 // indirect
5151
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
5252
github.com/go-errors/errors v1.5.1 // indirect
5353
github.com/go-logr/logr v1.4.2 // indirect
@@ -60,70 +60,74 @@ require (
6060
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6161
github.com/golang/protobuf v1.5.4 // indirect
6262
github.com/google/cel-go v0.20.1 // indirect
63-
github.com/google/gnostic-models v0.6.8 // indirect
63+
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
6464
github.com/google/gofuzz v1.2.0 // indirect
65-
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
65+
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
6666
github.com/google/uuid v1.6.0 // indirect
67+
github.com/gorilla/websocket v1.5.3 // indirect
6768
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
6869
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
6970
github.com/imdario/mergo v0.3.16 // indirect
7071
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7172
github.com/jmespath/go-jmespath v0.4.0 // indirect
7273
github.com/josharian/intern v1.0.0 // indirect
7374
github.com/json-iterator/go v1.1.12 // indirect
75+
github.com/klauspost/compress v1.17.11 // indirect
76+
github.com/kylelemons/godebug v1.1.0 // indirect
7477
github.com/mailru/easyjson v0.7.7 // indirect
7578
github.com/mitchellh/go-homedir v1.1.0 // indirect
7679
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7780
github.com/modern-go/reflect2 v1.0.2 // indirect
7881
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
82+
github.com/onsi/ginkgo/v2 v2.21.0 // indirect
7983
github.com/pkg/errors v0.9.1 // indirect
8084
github.com/pkg/profile v1.7.0 // indirect
8185
github.com/prometheus/client_model v0.6.1 // indirect
82-
github.com/prometheus/common v0.55.0 // indirect
86+
github.com/prometheus/common v0.60.1 // indirect
8387
github.com/prometheus/procfs v0.15.1 // indirect
8488
github.com/robfig/cron v1.2.0 // indirect
8589
github.com/sirupsen/logrus v1.9.3 // indirect
8690
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace // indirect
8791
github.com/stoewer/go-strcase v1.3.0 // indirect
8892
github.com/x448/float16 v0.8.4 // indirect
89-
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
90-
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
91-
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
93+
go.etcd.io/etcd/api/v3 v3.5.15 // indirect
94+
go.etcd.io/etcd/client/pkg/v3 v3.5.15 // indirect
95+
go.etcd.io/etcd/client/v3 v3.5.15 // indirect
9296
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
9397
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
94-
go.opentelemetry.io/otel v1.28.0 // indirect
98+
go.opentelemetry.io/otel v1.32.0 // indirect
9599
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
96100
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect
97-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
101+
go.opentelemetry.io/otel/metric v1.32.0 // indirect
98102
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
99-
go.opentelemetry.io/otel/trace v1.28.0 // indirect
103+
go.opentelemetry.io/otel/trace v1.32.0 // indirect
100104
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
101105
go.uber.org/multierr v1.11.0 // indirect
102106
go.uber.org/zap v1.27.0 // indirect
103-
golang.org/x/crypto v0.27.0 // indirect
104-
golang.org/x/exp v0.0.0-20240707233637-46b078467d37 // indirect
105-
golang.org/x/net v0.29.0 // indirect
106-
golang.org/x/oauth2 v0.21.0 // indirect
107-
golang.org/x/sync v0.8.0 // indirect
108-
golang.org/x/sys v0.25.0 // indirect
109-
golang.org/x/term v0.24.0 // indirect
110-
golang.org/x/text v0.18.0 // indirect
111-
golang.org/x/time v0.5.0 // indirect
107+
golang.org/x/crypto v0.29.0 // indirect
108+
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
109+
golang.org/x/net v0.31.0 // indirect
110+
golang.org/x/oauth2 v0.24.0 // indirect
111+
golang.org/x/sync v0.9.0 // indirect
112+
golang.org/x/sys v0.27.0 // indirect
113+
golang.org/x/term v0.26.0 // indirect
114+
golang.org/x/text v0.20.0 // indirect
115+
golang.org/x/time v0.8.0 // indirect
112116
google.golang.org/genproto v0.0.0-20240709173604-40e1e62336c5 // indirect
113117
google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d // indirect
114118
google.golang.org/genproto/googleapis/rpc v0.0.0-20240711142825-46eb208f015d // indirect
115119
google.golang.org/grpc v1.65.0 // indirect
116-
google.golang.org/protobuf v1.34.2 // indirect
120+
google.golang.org/protobuf v1.35.2 // indirect
117121
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
118122
gopkg.in/inf.v0 v0.9.1 // indirect
119123
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
120124
gopkg.in/yaml.v3 v3.0.1 // indirect
121-
k8s.io/apiserver v0.31.1 // indirect
122-
k8s.io/kms v0.31.1 // indirect
123-
k8s.io/kube-aggregator v0.31.1 // indirect
124-
k8s.io/kube-openapi v0.0.0-20240709000822-3c01b740850f // indirect
125+
k8s.io/apiserver v0.31.3 // indirect
126+
k8s.io/kms v0.31.3 // indirect
127+
k8s.io/kube-aggregator v0.31.3 // indirect
128+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
125129
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
126130
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
127131
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // indirect
128-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
132+
sigs.k8s.io/structured-merge-diff/v4 v4.4.3 // indirect
129133
)

0 commit comments

Comments
 (0)