Skip to content

Commit bd86c23

Browse files
subash-ml-technicore
subash-m
authored and
l-technicore
committed
Vendor changes for v1.28.2
1 parent f8f7b53 commit bd86c23

File tree

1,122 files changed

+79698
-26273
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,122 files changed

+79698
-26273
lines changed

‎cmd/oci-cloud-controller-manager/main.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,15 @@ import (
2121
"os"
2222
"time"
2323

24-
_ "github.com/oracle/oci-cloud-controller-manager/pkg/cloudprovider/providers/oci"
24+
"github.com/oracle/oci-cloud-controller-manager/pkg/cloudprovider/providers/oci"
2525
"github.com/oracle/oci-cloud-controller-manager/pkg/logging"
2626
"github.com/spf13/pflag"
2727
"go.uber.org/zap"
2828
"k8s.io/apimachinery/pkg/util/wait"
2929
cloudprovider "k8s.io/cloud-provider"
3030
"k8s.io/cloud-provider/app"
3131
"k8s.io/cloud-provider/app/config"
32+
"k8s.io/cloud-provider/names"
3233
"k8s.io/cloud-provider/options"
3334
cliflag "k8s.io/component-base/cli/flag"
3435
"k8s.io/component-base/logs"
@@ -53,7 +54,7 @@ func main() {
5354
}
5455

5556
fss := cliflag.NamedFlagSets{}
56-
command := app.NewCloudControllerManagerCommand(s, cloudInitializer, app.DefaultInitFuncConstructors, fss, wait.NeverStop)
57+
command := app.NewCloudControllerManagerCommand(s, cloudInitializer, app.DefaultInitFuncConstructors, names.CCMControllerAliases(), fss, wait.NeverStop)
5758

5859
// TODO: once we switch everything over to Cobra commands, we can go back to calling
5960
// utilflag.InitFlags() (by removing its pflag.Parse() call). For now, we have to set the

‎go.mod‎

Lines changed: 97 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -4,124 +4,125 @@ go 1.20
44

55
replace (
66
github.com/docker/docker => github.com/docker/engine v0.0.0-20181106193140-f5749085e9cb
7-
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.14.0
7+
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.16.0
88
google.golang.org/grpc => google.golang.org/grpc v1.38.0
9-
k8s.io/api => k8s.io/api v0.27.2
10-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.2
11-
k8s.io/apimachinery => k8s.io/apimachinery v0.27.2
12-
k8s.io/apiserver => k8s.io/apiserver v0.27.2
13-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.2
14-
k8s.io/client-go => k8s.io/client-go v0.27.2
15-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.2
16-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.2
17-
k8s.io/code-generator => k8s.io/code-generator v0.27.2
18-
k8s.io/component-base => k8s.io/component-base v0.27.2
19-
k8s.io/component-helpers => k8s.io/component-helpers v0.27.2
20-
k8s.io/controller-manager => k8s.io/controller-manager v0.27.2
21-
k8s.io/cri-api => k8s.io/cri-api v0.27.2
22-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.2
23-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.27.2
24-
k8s.io/kms => k8s.io/kms v0.27.2
25-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.2
26-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.2
27-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.2
28-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.2
29-
k8s.io/kubectl => k8s.io/kubectl v0.27.2
30-
k8s.io/kubelet => k8s.io/kubelet v0.27.2
31-
k8s.io/kubernetes => k8s.io/kubernetes v1.27.2
32-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.2
33-
k8s.io/metrics => k8s.io/metrics v0.27.2
34-
k8s.io/mount-utils => k8s.io/mount-utils v0.27.2
35-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.2
36-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.2
9+
k8s.io/api => k8s.io/api v0.28.2
10+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.2
11+
k8s.io/apimachinery => k8s.io/apimachinery v0.28.2
12+
k8s.io/apiserver => k8s.io/apiserver v0.28.2
13+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.2
14+
k8s.io/client-go => k8s.io/client-go v0.28.2
15+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.2
16+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.2
17+
k8s.io/code-generator => k8s.io/code-generator v0.28.2
18+
k8s.io/component-base => k8s.io/component-base v0.28.2
19+
k8s.io/component-helpers => k8s.io/component-helpers v0.28.2
20+
k8s.io/controller-manager => k8s.io/controller-manager v0.28.2
21+
k8s.io/cri-api => k8s.io/cri-api v0.28.2
22+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.2
23+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.2
24+
k8s.io/endpointslice => k8s.io/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20230810203337-add7e14df11e
25+
k8s.io/kms => k8s.io/kms v0.28.2
26+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.2
27+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.2
28+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.2
29+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.2
30+
k8s.io/kubectl => k8s.io/kubectl v0.28.2
31+
k8s.io/kubelet => k8s.io/kubelet v0.28.2
32+
k8s.io/kubernetes => k8s.io/kubernetes v1.28.2
33+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.2
34+
k8s.io/metrics => k8s.io/metrics v0.28.2
35+
k8s.io/mount-utils => k8s.io/mount-utils v0.28.2
36+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.2
37+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.2
3738
)
3839

3940
require (
4041
github.com/container-storage-interface/spec v1.8.0
4142
github.com/go-logr/zapr v1.2.4 // indirect
4243
github.com/golang/protobuf v1.5.3
43-
github.com/kubernetes-csi/csi-lib-utils v0.13.0
44+
github.com/kubernetes-csi/csi-lib-utils v0.14.0
4445
github.com/kubernetes-csi/external-snapshotter/client/v6 v6.2.0
4546
github.com/onsi/ginkgo v1.16.5
46-
github.com/onsi/gomega v1.27.7
47+
github.com/onsi/gomega v1.27.10
4748
github.com/oracle/oci-go-sdk/v65 v65.56.0
4849
github.com/pkg/errors v0.9.1
49-
github.com/prometheus/client_golang v1.15.1
50-
github.com/spf13/cobra v1.6.1 // indirect
50+
github.com/prometheus/client_golang v1.16.0
51+
github.com/spf13/cobra v1.7.0 // indirect
5152
github.com/spf13/pflag v1.0.5
5253
github.com/spf13/viper v1.8.1
53-
go.uber.org/zap v1.24.0
54-
golang.org/x/net v0.10.0
55-
golang.org/x/sys v0.8.0 // indirect
56-
google.golang.org/grpc v1.54.0
57-
gopkg.in/natefinch/lumberjack.v2 v2.0.0
54+
go.uber.org/zap v1.25.0
55+
golang.org/x/net v0.14.0
56+
golang.org/x/sys v0.11.0 // indirect
57+
google.golang.org/grpc v1.57.0
58+
gopkg.in/natefinch/lumberjack.v2 v2.2.1
5859
gopkg.in/yaml.v2 v2.4.0
59-
k8s.io/api v0.27.2
60-
k8s.io/apimachinery v0.27.2
61-
k8s.io/apiserver v0.27.2 // indirect
62-
k8s.io/client-go v0.27.2
63-
k8s.io/cloud-provider v0.27.2
64-
k8s.io/component-base v0.27.2
65-
k8s.io/component-helpers v0.27.2
66-
k8s.io/controller-manager v0.27.2 // indirect
67-
k8s.io/csi-translation-lib v0.27.2 // indirect
60+
k8s.io/api v0.28.2
61+
k8s.io/apimachinery v0.28.2
62+
k8s.io/apiserver v0.28.2 // indirect
63+
k8s.io/client-go v0.28.2
64+
k8s.io/cloud-provider v0.28.2
65+
k8s.io/component-base v0.28.2
66+
k8s.io/component-helpers v0.28.2
67+
k8s.io/controller-manager v0.28.2 // indirect
68+
k8s.io/csi-translation-lib v0.28.2 // indirect
6869
k8s.io/klog v1.0.0
69-
k8s.io/klog/v2 v2.90.1
70-
k8s.io/kubelet v0.27.2 // indirect
71-
k8s.io/kubernetes v1.27.2
72-
k8s.io/mount-utils v0.27.2
73-
k8s.io/utils v0.0.0-20230209194617-a36077c30491
74-
sigs.k8s.io/sig-storage-lib-external-provisioner/v9 v9.0.2
70+
k8s.io/klog/v2 v2.100.1
71+
k8s.io/kubelet v0.28.2 // indirect
72+
k8s.io/kubernetes v1.28.2
73+
k8s.io/mount-utils v0.28.2
74+
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
75+
sigs.k8s.io/sig-storage-lib-external-provisioner/v9 v9.1.0-rc.0
7576
)
7677

7778
require (
78-
golang.org/x/sync v0.2.0
79-
google.golang.org/protobuf v1.30.0
80-
k8s.io/apiextensions-apiserver v0.27.2
79+
golang.org/x/sync v0.3.0
80+
google.golang.org/protobuf v1.31.0
81+
k8s.io/apiextensions-apiserver v0.28.2
8182
)
8283

8384
require (
8485
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
8586
github.com/NYTimes/gziphandler v1.1.1 // indirect
86-
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
87+
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
8788
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
88-
github.com/benbjohnson/clock v1.1.0 // indirect
89+
github.com/benbjohnson/clock v1.3.0 // indirect
8990
github.com/beorn7/perks v1.0.1 // indirect
9091
github.com/blang/semver/v4 v4.0.0 // indirect
91-
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
92+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
9293
github.com/cespare/xxhash/v2 v2.2.0 // indirect
93-
github.com/coreos/go-semver v0.3.0 // indirect
94-
github.com/coreos/go-systemd/v22 v22.4.0 // indirect
94+
github.com/coreos/go-semver v0.3.1 // indirect
95+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
9596
github.com/davecgh/go-spew v1.1.1 // indirect
96-
github.com/docker/distribution v2.8.1+incompatible // indirect
97-
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
97+
github.com/docker/distribution v2.8.2+incompatible // indirect
98+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
9899
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
99100
github.com/felixge/httpsnoop v1.0.3 // indirect
100101
github.com/fsnotify/fsnotify v1.6.0 // indirect
101102
github.com/go-logr/logr v1.2.4 // indirect
102103
github.com/go-logr/stdr v1.2.2 // indirect
103-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
104+
github.com/go-openapi/jsonpointer v0.20.0 // indirect
104105
github.com/go-openapi/jsonreference v0.20.2 // indirect
105-
github.com/go-openapi/swag v0.22.3 // indirect
106+
github.com/go-openapi/swag v0.22.4 // indirect
106107
github.com/gofrs/flock v0.8.1 // indirect
107108
github.com/gogo/protobuf v1.3.2 // indirect
108109
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
109-
github.com/google/cel-go v0.12.6 // indirect
110-
github.com/google/gnostic v0.6.9 // indirect
110+
github.com/google/cel-go v0.16.1 // indirect
111+
github.com/google/gnostic-models v0.6.8 // indirect
111112
github.com/google/go-cmp v0.5.9 // indirect
112113
github.com/google/gofuzz v1.2.0 // indirect
113-
github.com/google/uuid v1.3.0 // indirect
114+
github.com/google/uuid v1.3.1 // indirect
114115
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
115-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
116+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.17.1 // indirect
116117
github.com/hashicorp/hcl v1.0.0 // indirect
117118
github.com/imdario/mergo v0.3.13 // indirect
118-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
119+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
119120
github.com/josharian/intern v1.0.0 // indirect
120121
github.com/json-iterator/go v1.1.12 // indirect
121122
github.com/magiconair/properties v1.8.5 // indirect
122123
github.com/mailru/easyjson v0.7.7 // indirect
123124
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
124-
github.com/miekg/dns v1.1.48 // indirect
125+
github.com/miekg/dns v1.1.55 // indirect
125126
github.com/mitchellh/mapstructure v1.4.1 // indirect
126127
github.com/moby/spdystream v0.2.0 // indirect
127128
github.com/moby/sys/mountinfo v0.6.2 // indirect
@@ -131,51 +132,53 @@ require (
131132
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
132133
github.com/nxadm/tail v1.4.8 // indirect
133134
github.com/opencontainers/go-digest v1.0.0 // indirect
134-
github.com/opencontainers/selinux v1.10.0 // indirect
135+
github.com/opencontainers/selinux v1.11.0 // indirect
135136
github.com/pelletier/go-toml v1.9.3 // indirect
136137
github.com/prometheus/client_model v0.4.0 // indirect
137-
github.com/prometheus/common v0.42.0 // indirect
138-
github.com/prometheus/procfs v0.9.0 // indirect
138+
github.com/prometheus/common v0.44.0 // indirect
139+
github.com/prometheus/procfs v0.11.1 // indirect
139140
github.com/sony/gobreaker v0.5.0 // indirect
140141
github.com/spf13/afero v1.6.0 // indirect
141142
github.com/spf13/cast v1.3.1 // indirect
142143
github.com/spf13/jwalterweatherman v1.1.0 // indirect
143-
github.com/stoewer/go-strcase v1.2.0 // indirect
144+
github.com/stoewer/go-strcase v1.3.0 // indirect
144145
github.com/subosito/gotenv v1.2.0 // indirect
145-
go.etcd.io/etcd/api/v3 v3.5.7 // indirect
146-
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
147-
go.etcd.io/etcd/client/v3 v3.5.7 // indirect
146+
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
147+
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
148+
go.etcd.io/etcd/client/v3 v3.5.9 // indirect
148149
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
149150
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
150151
go.opentelemetry.io/otel v1.10.0 // indirect
151-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
152+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.17.0 // indirect
152153
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
153154
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
154155
go.opentelemetry.io/otel/metric v0.31.0 // indirect
155156
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
156157
go.opentelemetry.io/otel/trace v1.10.0 // indirect
157-
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
158-
go.uber.org/atomic v1.7.0 // indirect
159-
go.uber.org/multierr v1.6.0 // indirect
160-
golang.org/x/crypto v0.1.0 // indirect
161-
golang.org/x/mod v0.10.0 // indirect
162-
golang.org/x/oauth2 v0.5.0 // indirect
163-
golang.org/x/term v0.8.0 // indirect
164-
golang.org/x/text v0.9.0 // indirect
158+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
159+
go.uber.org/multierr v1.11.0 // indirect
160+
golang.org/x/crypto v0.12.0 // indirect
161+
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
162+
golang.org/x/mod v0.12.0 // indirect
163+
golang.org/x/oauth2 v0.11.0 // indirect
164+
golang.org/x/term v0.11.0 // indirect
165+
golang.org/x/text v0.12.0 // indirect
165166
golang.org/x/time v0.3.0 // indirect
166-
golang.org/x/tools v0.9.1 // indirect
167+
golang.org/x/tools v0.12.0 // indirect
167168
google.golang.org/appengine v1.6.7 // indirect
168-
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
169+
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
170+
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
171+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
169172
gopkg.in/inf.v0 v0.9.1 // indirect
170173
gopkg.in/ini.v1 v1.62.0 // indirect
171174
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
172175
gopkg.in/yaml.v3 v3.0.1 // indirect
173-
k8s.io/kms v0.27.2 // indirect
174-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
176+
k8s.io/kms v0.28.2 // indirect
177+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
175178
k8s.io/kube-scheduler v0.0.0 // indirect
176-
k8s.io/kubectl v0.27.2 // indirect
177-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
179+
k8s.io/kubectl v0.28.2 // indirect
180+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.4 // indirect
178181
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
179-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
182+
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
180183
sigs.k8s.io/yaml v1.3.0 // indirect
181184
)

0 commit comments

Comments
 (0)