Skip to content

Commit e371c85

Browse files
l-technicorel-technicore
authored
Merge pull request #399 from l-technicore/oke-oss-release-v1.24.0
Oke oss release v1.24.0
2 parents 906eec8 + 007ffbd commit e371c85

File tree

1,448 files changed

+61027
-40264
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,448 files changed

+61027
-40264
lines changed

‎.github/workflows/makefile.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Set up Go 1.x
1313
uses: actions/setup-go@v2
1414
with:
15-
go-version: 1.17
15+
go-version: 1.18
1616
id: go
1717

1818
- name: Check out code into the Go module directory

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
ARG CI_IMAGE_REGISTRY
1616

17-
FROM golang:1.17.3 as builder
17+
FROM golang:1.18.5 as builder
1818

1919
ARG COMPONENT
2020

‎Dockerfile_arm_all

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG CI_IMAGE_REGISTRY
22

3-
FROM golang:1.17.3 as builder
3+
FROM golang:1.18.5 as builder
44

55
ARG COMPONENT
66

‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ else
3838
VERSION ?= ${VERSION}
3939
endif
4040

41-
RELEASE = v1.23.0
41+
RELEASE = v1.24.0
4242

4343
GOOS ?= linux
4444
ARCH ?= amd64
@@ -195,7 +195,7 @@ test-local: build-dirs
195195
-v $(PWD):$(DOCKER_REPO_ROOT) \
196196
-e COMPONENT="$(COMPONENT)" \
197197
-e GOPATH=/go/ \
198-
odo-docker-signed-local.artifactory.oci.oraclecorp.com/odx-oke/oke/k8-manager-base:go1.17.7-1.0.10 \
198+
odo-docker-signed-local.artifactory.oci.oraclecorp.com/odx-oke/oke/k8-manager-base:go1.18.3-1.0.10 \
199199
make coverage image
200200

201201
.PHONY: run-ccm-e2e-tests-local

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ cloud-provider specific code out of the Kubernetes codebase.
3030
| v1.19.12 | v1.19 | v1.21 |
3131
| v1.22.0 | v1.22 | - |
3232
| v1.23.0 | v1.23 | - |
33+
| v1.24.0 | v1.24 | - |
3334

3435

3536

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.23
1+
1.24

‎container-storage-interface.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ Ex:
166166
apiVersion: storage.k8s.io/v1
167167
kind: CSIDriver
168168
metadata:
169-
name: blockvolume.csi.oraclecloud.com
169+
name: blockvolume.csi.oraclecloud.com
170170
spec:
171171
fsGroupPolicy: File
172172
```

‎docs/load-balancer-annotations.md

+70-31
Large diffs are not rendered by default.

‎go.mod

+90-89
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,72 @@
11
module github.com/oracle/oci-cloud-controller-manager
22

3-
go 1.17
3+
go 1.18
44

55
replace (
66
github.com/docker/docker => github.com/docker/engine v0.0.0-20181106193140-f5749085e9cb
77
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.11.0
88
google.golang.org/grpc => google.golang.org/grpc v1.38.0
9-
k8s.io/api => k8s.io/api v0.23.4
10-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.4
11-
k8s.io/apimachinery => k8s.io/apimachinery v0.23.4
12-
k8s.io/apiserver => k8s.io/apiserver v0.23.4
13-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.23.4
14-
k8s.io/client-go => k8s.io/client-go v0.23.4
15-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.23.4
16-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.23.4
17-
k8s.io/code-generator => k8s.io/code-generator v0.23.4
18-
k8s.io/component-base => k8s.io/component-base v0.23.4
19-
k8s.io/component-helpers => k8s.io/component-helpers v0.23.4
20-
k8s.io/controller-manager => k8s.io/controller-manager v0.23.4
21-
k8s.io/cri-api => k8s.io/cri-api v0.23.4
22-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.23.4
23-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.23.4
24-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.23.4
25-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.23.4
26-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.23.4
27-
k8s.io/kubectl => k8s.io/kubectl v0.23.4
28-
k8s.io/kubelet => k8s.io/kubelet v0.23.4
29-
k8s.io/kubernetes => k8s.io/kubernetes v1.23.4
30-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.23.4
31-
k8s.io/metrics => k8s.io/metrics v0.23.4
32-
k8s.io/mount-utils => k8s.io/mount-utils v0.23.4
33-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.23.4
34-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.23.4
9+
k8s.io/api => k8s.io/api v0.24.1
10+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.1
11+
k8s.io/apimachinery => k8s.io/apimachinery v0.24.1
12+
k8s.io/apiserver => k8s.io/apiserver v0.24.1
13+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.1
14+
k8s.io/client-go => k8s.io/client-go v0.24.1
15+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.1
16+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.1
17+
k8s.io/code-generator => k8s.io/code-generator v0.24.1
18+
k8s.io/component-base => k8s.io/component-base v0.24.1
19+
k8s.io/component-helpers => k8s.io/component-helpers v0.24.1
20+
k8s.io/controller-manager => k8s.io/controller-manager v0.24.1
21+
k8s.io/cri-api => k8s.io/cri-api v0.24.1
22+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.1
23+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.1
24+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.1
25+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.1
26+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.1
27+
k8s.io/kubectl => k8s.io/kubectl v0.24.1
28+
k8s.io/kubelet => k8s.io/kubelet v0.24.1
29+
k8s.io/kubernetes => k8s.io/kubernetes v1.24.1
30+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.1
31+
k8s.io/metrics => k8s.io/metrics v0.24.1
32+
k8s.io/mount-utils => k8s.io/mount-utils v0.24.1
33+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.1
34+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.1
35+
sigs.k8s.io/sig-storage-lib-external-provisioner/v8 => sigs.k8s.io/sig-storage-lib-external-provisioner/v8 v8.0.0-20220531195724-a4ce2c1d2e52 // Master Branch to support Migrated leader election to lease API https://github.com/kubernetes-sigs/sig-storage-lib-external-provisioner/commit/a4ce2c1d2e5221e98de41dfd00bdc4b041a40b3f
3536
)
3637

3738
require (
38-
github.com/container-storage-interface/spec v1.5.0
39+
github.com/container-storage-interface/spec v1.6.0
3940
github.com/golang/protobuf v1.5.2
40-
github.com/kubernetes-csi/csi-lib-utils v0.8.1
41-
github.com/onsi/ginkgo v1.14.1
42-
github.com/onsi/gomega v1.10.2
41+
github.com/kubernetes-csi/csi-lib-utils v0.11.0
42+
github.com/onsi/ginkgo v1.16.5
43+
github.com/onsi/gomega v1.17.0
4344
github.com/oracle/oci-go-sdk/v50 v50.1.0
4445
github.com/pkg/errors v0.9.1
45-
github.com/prometheus/client_golang v1.11.0
46+
github.com/prometheus/client_golang v1.12.1
47+
github.com/spf13/cobra v1.4.0 // indirect
4648
github.com/spf13/pflag v1.0.5
4749
github.com/spf13/viper v1.8.1
48-
go.uber.org/zap v1.19.0
49-
golang.org/x/net v0.0.0-20211209124913-491a49abca63
50-
google.golang.org/grpc v1.40.0
50+
go.uber.org/zap v1.19.1
51+
golang.org/x/net v0.0.0-20220403103023-749bd193bc2b
52+
golang.org/x/sys v0.0.0-20220406163625-3f8b81556e12 // indirect
53+
google.golang.org/grpc v1.45.0
5154
gopkg.in/natefinch/lumberjack.v2 v2.0.0
5255
gopkg.in/yaml.v2 v2.4.0
53-
k8s.io/api v0.23.4
54-
k8s.io/apimachinery v0.23.4
55-
k8s.io/client-go v0.23.4
56-
k8s.io/cloud-provider v0.23.4
57-
k8s.io/component-base v0.23.4
58-
k8s.io/component-helpers v0.23.4
56+
k8s.io/api v0.24.1
57+
k8s.io/apimachinery v0.24.1
58+
k8s.io/apiserver v0.24.1 // indirect
59+
k8s.io/client-go v0.24.1
60+
k8s.io/cloud-provider v0.24.1
61+
k8s.io/component-base v0.24.1
62+
k8s.io/component-helpers v0.24.1
5963
k8s.io/klog v1.0.0
60-
k8s.io/klog/v2 v2.30.0
61-
k8s.io/kubernetes v1.23.4
62-
k8s.io/utils v0.0.0-20211116205334-6203023598ed
63-
sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0
64+
k8s.io/klog/v2 v2.60.1
65+
k8s.io/kubelet v0.24.1 // indirect
66+
k8s.io/kubernetes v1.24.1
67+
k8s.io/mount-utils v0.24.1
68+
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
69+
sigs.k8s.io/sig-storage-lib-external-provisioner/v8 v8.0.0
6470
)
6571

6672
require (
@@ -69,62 +75,58 @@ require (
6975
github.com/PuerkitoBio/purell v1.1.1 // indirect
7076
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
7177
github.com/beorn7/perks v1.0.1 // indirect
72-
github.com/bits-and-blooms/bitset v1.2.0 // indirect
73-
github.com/blang/semver v3.5.1+incompatible // indirect
74-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
78+
github.com/blang/semver/v4 v4.0.0 // indirect
79+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
7580
github.com/coreos/go-semver v0.3.0 // indirect
7681
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
77-
github.com/cyphar/filepath-securejoin v0.2.2 // indirect
7882
github.com/davecgh/go-spew v1.1.1 // indirect
79-
github.com/docker/distribution v2.7.1+incompatible // indirect
80-
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
81-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
83+
github.com/docker/distribution v2.8.1+incompatible // indirect
84+
github.com/emicklei/go-restful v2.15.0+incompatible // indirect
85+
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
8286
github.com/felixge/httpsnoop v1.0.1 // indirect
83-
github.com/fsnotify/fsnotify v1.4.9 // indirect
84-
github.com/go-logr/logr v1.2.0 // indirect
87+
github.com/fsnotify/fsnotify v1.5.1 // indirect
88+
github.com/go-logr/logr v1.2.3 // indirect
8589
github.com/go-openapi/jsonpointer v0.19.5 // indirect
86-
github.com/go-openapi/jsonreference v0.19.5 // indirect
87-
github.com/go-openapi/swag v0.19.14 // indirect
90+
github.com/go-openapi/jsonreference v0.19.6 // indirect
91+
github.com/go-openapi/swag v0.21.1 // indirect
8892
github.com/gogo/protobuf v1.3.2 // indirect
8993
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
90-
github.com/google/go-cmp v0.5.5 // indirect
91-
github.com/google/gofuzz v1.1.0 // indirect
92-
github.com/google/uuid v1.1.2 // indirect
93-
github.com/googleapis/gnostic v0.5.5 // indirect
94+
github.com/google/gnostic v0.6.8 // indirect
95+
github.com/google/go-cmp v0.5.7 // indirect
96+
github.com/google/gofuzz v1.2.0 // indirect
97+
github.com/google/uuid v1.3.0 // indirect
9498
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
9599
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
96100
github.com/hashicorp/hcl v1.0.0 // indirect
97-
github.com/imdario/mergo v0.3.9 // indirect
101+
github.com/imdario/mergo v0.3.12 // indirect
98102
github.com/inconshreveable/mousetrap v1.0.0 // indirect
99103
github.com/josharian/intern v1.0.0 // indirect
100104
github.com/json-iterator/go v1.1.12 // indirect
101105
github.com/magiconair/properties v1.8.5 // indirect
102-
github.com/mailru/easyjson v0.7.6 // indirect
106+
github.com/mailru/easyjson v0.7.7 // indirect
103107
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
104-
github.com/miekg/dns v1.1.29 // indirect
108+
github.com/miekg/dns v1.1.48 // indirect
105109
github.com/mitchellh/mapstructure v1.4.1 // indirect
106110
github.com/moby/spdystream v0.2.0 // indirect
107-
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
111+
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
108112
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
109113
github.com/modern-go/reflect2 v1.0.2 // indirect
110114
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
111-
github.com/nxadm/tail v1.4.4 // indirect
115+
github.com/nxadm/tail v1.4.8 // indirect
112116
github.com/opencontainers/go-digest v1.0.0 // indirect
113-
github.com/opencontainers/runc v1.0.2 // indirect
114-
github.com/opencontainers/selinux v1.8.2 // indirect
117+
github.com/opencontainers/selinux v1.10.0 // indirect
115118
github.com/pelletier/go-toml v1.9.3 // indirect
116119
github.com/prometheus/client_model v0.2.0 // indirect
117-
github.com/prometheus/common v0.28.0 // indirect
118-
github.com/prometheus/procfs v0.6.0 // indirect
120+
github.com/prometheus/common v0.33.0 // indirect
121+
github.com/prometheus/procfs v0.7.3 // indirect
119122
github.com/sony/gobreaker v0.4.2-0.20210216022020-dd874f9dd33b // indirect
120123
github.com/spf13/afero v1.6.0 // indirect
121124
github.com/spf13/cast v1.3.1 // indirect
122-
github.com/spf13/cobra v1.2.1 // indirect
123125
github.com/spf13/jwalterweatherman v1.1.0 // indirect
124126
github.com/subosito/gotenv v1.2.0 // indirect
125-
go.etcd.io/etcd/api/v3 v3.5.0 // indirect
126-
go.etcd.io/etcd/client/pkg/v3 v3.5.0 // indirect
127-
go.etcd.io/etcd/client/v3 v3.5.0 // indirect
127+
go.etcd.io/etcd/api/v3 v3.5.1 // indirect
128+
go.etcd.io/etcd/client/pkg/v3 v3.5.1 // indirect
129+
go.etcd.io/etcd/client/v3 v3.5.1 // indirect
128130
go.opentelemetry.io/contrib v0.20.0 // indirect
129131
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
130132
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
@@ -137,31 +139,30 @@ require (
137139
go.opentelemetry.io/otel/trace v0.20.0 // indirect
138140
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
139141
go.uber.org/atomic v1.7.0 // indirect
142+
go.uber.org/goleak v1.1.12 // indirect
140143
go.uber.org/multierr v1.6.0 // indirect
141-
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
142-
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
144+
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
145+
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
146+
golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a // indirect
143147
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
144-
golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e // indirect
145-
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
148+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
146149
golang.org/x/text v0.3.7 // indirect
147-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
150+
golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
151+
golang.org/x/tools v0.1.10 // indirect
148152
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
149153
google.golang.org/appengine v1.6.7 // indirect
150-
google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 // indirect
151-
google.golang.org/protobuf v1.27.1 // indirect
154+
google.golang.org/genproto v0.0.0-20220405205423-9d709892a2bf // indirect
155+
google.golang.org/protobuf v1.28.0 // indirect
152156
gopkg.in/inf.v0 v0.9.1 // indirect
153157
gopkg.in/ini.v1 v1.62.0 // indirect
154158
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
155-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
156-
k8s.io/apiserver v0.23.4 // indirect
157-
k8s.io/controller-manager v0.23.4 // indirect
158-
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
159+
gopkg.in/yaml.v3 v3.0.1 // indirect
160+
k8s.io/controller-manager v0.24.1 // indirect
161+
k8s.io/kube-openapi v0.0.0-20220401212409-b28bf2818661 // indirect
159162
k8s.io/kube-scheduler v0.0.0 // indirect
160163
k8s.io/kubectl v0.0.0 // indirect
161-
k8s.io/kubelet v0.23.4 // indirect
162-
k8s.io/mount-utils v0.23.4 // indirect
163-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.27 // indirect
164-
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
164+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30 // indirect
165+
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
165166
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
166-
sigs.k8s.io/yaml v1.2.0 // indirect
167+
sigs.k8s.io/yaml v1.3.0 // indirect
167168
)

0 commit comments

Comments
 (0)