Merge pull request #469 from YashwantGohokar/oke-oss-release_1.26.4

OKE OSS Release 1.26.4

.github/workflows/release.yaml

@@ -26,7 +26,7 @@ jobs:
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${GITHUB_ACTOR,,} --password-stdin
 
       - name: Build Image
-        run: OSS_REGISTRY="ghcr.io/oracle" VERSION="${{ github.ref_name }}" make image
+        run: OSS_REGISTRY="ghcr.io/$oracle" VERSION="${{ github.ref_name }}" make image
 
       - name: Push Image
         run: OSS_REGISTRY="ghcr.io/oracle" VERSION="${{ github.ref_name }}" make docker-push-all

Makefile

@@ -38,7 +38,7 @@ else
     VERSION   ?= ${VERSION}
 endif
 
-RELEASE = v1.26.0
+RELEASE = v1.26.4
 
 GOOS ?= linux
 ARCH ?= amd64

README.md

@@ -31,14 +31,15 @@ cloud-provider specific code out of the Kubernetes codebase.
 | v1.23.0   | v1.23                  | -                      |
 | v1.24.2   | v1.24                  | -                      |
 | v1.25.2   | v1.25                  | -                      |
-| v1.26.3   | v1.26                  | -                      |
-| v1.27.2   | v1.27                  | -                      |
-| v1.28.0   | v1.28                  | -                      |
+| v1.26.4   | v1.26                  | -                      |
+| v1.27.3   | v1.27                  | -                      |
+| v1.28.1   | v1.28                  | -                      |
+| v1.29.0   | v1.29                  | -                      |
 
 
 
 Note: 
-Versions older than v1.25.2 are no longer supported, new features / bug fixes will be available in v1.25.2 and later. 
+Versions older than v1.27.3 are no longer supported, new features / bug fixes will be available in v1.27.3 and later. 
 
 ## Implementation
  Currently `oci-cloud-controller-manager` implements:
@@ -170,12 +171,6 @@ details.
 Oracle gratefully acknowledges the contributions to this project that have been made
 by the community.
 
-## Upcoming Releases
-
-| Release               | Expected Release Date |
-|-----------------------|-----------------------|
-| Support for K8s v1.24 | August 2022           |
-
 ## License
 
 Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.

THIRD_PARTY_LICENSES.txt

@@ -162,8 +162,7 @@ This product includes software developed at CoreOS, Inc.
 github.com/davecgh/go-spew
 
 == License Type
-===ISC-c06795ed
-
+=== ISC-c06795ed
 ISC License
 
 Copyright (c) 2012-2016 Dave Collins <dave@davec.name>
@@ -181,6 +180,7 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 
+
 == Copyright
 Copyright (c) 2012-2016 Dave Collins <dave@davec.name>
 Copyright (c) 2013 Dave Collins <dave@davec.name>
@@ -231,8 +231,7 @@ Copyright 2021 Ernest Micklei. All rights reserved.
 github.com/evanphx/json-patch
 
 == License Type
-===BSD-3-Clause-96ae735c
-
+=== BSD-3-Clause-96ae735c
 Copyright (c) 2014, Evan Phoenix
 All rights reserved.
 
@@ -260,6 +259,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+
 == Copyright
 Copyright (c) 2014, Evan Phoenix
 
@@ -284,6 +284,7 @@ SPDX:BSD-3-Clause--modified-by-Google
 
 == Copyright
 Copyright © 2012 The Go Authors. All rights reserved.
+Copyright © fsnotify Authors. All rights reserved.
 
 --------------------------------- (separator) ----------------------------------
 
@@ -351,8 +352,7 @@ Copyright 2015 go-swagger maintainers
 github.com/gofrs/flock
 
 == License Type
-===BSD-3-Clause-4e7459b3
-
+=== BSD-3-Clause-4e7459b3
 Copyright (c) 2015-2020, Tim Heckman
 All rights reserved.
 
@@ -382,6 +382,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+
 == Copyright
 Copyright (c) 2015-2020, Tim Heckman
 Copyright 2015 Tim Heckman. All rights reserved.
@@ -455,8 +456,8 @@ Copyright 2020 The Go Authors. All rights reserved.
 github.com/google/cel-go
 
 == License Type
-===Apache-2.0-9e40c772
-
+=== Apache-2.0-9e40c772
+=== BSD-3-Clause--modified-by-Google
 
                                  Apache License
                            Version 2.0, January 2004
@@ -692,6 +693,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+
 == Copyright
 Copyright (c) 2018 The Go Authors. All rights reserved.
 Copyright 2018 Google LLC
@@ -776,8 +778,7 @@ Copyright 2016 Michal Witkowski. All Rights Reserved.
 github.com/grpc-ecosystem/grpc-gateway/v2
 
 == License Type
-===BSD-3-Clause--modified-by-Google-c510a2a0
-
+=== BSD-3-Clause--modified-by-Google-c510a2a0
 Copyright (c) 2015, Gengo, Inc.
 All rights reserved.
 
@@ -807,6 +808,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+
 == Copyright
 Copyright (c) 2015, Gengo, Inc.
 Copyright 2009 The Go Authors. All rights reserved.
@@ -893,8 +895,7 @@ Copyright 2022 The Kubernetes Authors.
 github.com/magiconair/properties
 
 == License Type
-===BSD-2-Clause-714beb73
-
+=== BSD-2-Clause-714beb73
 Copyright (c) 2013-2020, Frank Schroeder
 
 All rights reserved.
@@ -921,6 +922,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+
 == Copyright
 Copyright (c) 2013-2020, Frank Schroeder
 Copyright 2011 The Go Authors. All rights reserved.
@@ -1042,8 +1044,7 @@ SPDX:Apache-2.0
 github.com/munnerz/goautoneg
 
 == License Type
-===BSD-3-Clause-0c241922
-
+=== BSD-3-Clause-0c241922
 Copyright (c) 2011, Open Knowledge Foundation Ltd.
 All rights reserved.
 
@@ -1077,6 +1078,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+
 == Copyright
 Copyright (c) 2011, Open Knowledge Foundation Ltd.
 
@@ -1107,6 +1109,7 @@ SPDX:MIT
 == Copyright
 Copyright (c) 2013-2014 Onsi Fakhouri
 Copyright (c) 2016 Yasuhiro Matsumoto
+Copyright (c) Yasuhiro MATSUMOTO <mattn.jp@gmail.com>
 Copyright 2013 The Go Authors. All rights reserved.
 
 --------------------------------- (separator) ----------------------------------
@@ -1143,8 +1146,9 @@ Copyright © 2019, 2020 OCI Contributors
 github.com/oracle/oci-go-sdk/v65
 
 == License Type
-===Apache-2.0-9010f56e
-
+=== Apache-2.0-9010f56e
+=== UPL-1.0
+=== Apache-2.0
 Copyright (c) 2016, 2023, Oracle and/or its affiliates.  All rights reserved.
 This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl
 or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
@@ -1249,6 +1253,7 @@ END OF TERMS AND CONDITIONS
    limitations under the License.
 
 
+
 == Copyright
 Copyright (c) 2012-2020 Mat Ryer, Tyler Bunnell and contributors.
 Copyright (c) 2013 The Go Authors. All rights reserved.
@@ -1270,8 +1275,8 @@ Copyright (c) 2016, 2018, 2020, Oracle and/or its affiliates.
 github.com/pelletier/go-toml
 
 == License Type
-===Apache-2.0-e49b63d8
-
+=== MIT-e49b63d8
+=== Apache-2.0
 The bulk of github.com/pelletier/go-toml is distributed under the MIT license
 (see below), with the exception of localtime.go and localtime.test.go.
 Those two files have been copied over from Google's civil library at revision
@@ -1521,6 +1526,7 @@ License:
    limitations under the License.
 
 
+
 == Copyright
 Copyright (c) 2013 - 2021 Thomas Pelletier, Eric Anderton
 Copyright 2016 Google LLC
@@ -1694,6 +1700,8 @@ Copyright © 2015 Jerry Jacobs <jerry.jacobs@xor-gate.org>.
 Copyright © 2015 Steve Francia <spf@spf13.com>.
 Copyright © 2016 Steve Francia <spf@spf13.com>.
 Copyright © 2018 Steve Francia <spf@spf13.com>.
+Copyright © 2021 Vasily Ovchinnikov <vasily@remerge.io>.
+Copyright © 2022 Steve Francia <spf@spf13.com>.
 
 --------------------------------- (separator) ----------------------------------
 
@@ -1969,6 +1977,7 @@ go.uber.org/zap
 SPDX:MIT
 
 == Copyright
+Copyright (c) "*" Uber Technologies, Inc.")
 Copyright (c) 2016 Uber Technologies, Inc.
 Copyright (c) 2016, 2017 Uber Technologies, Inc.
 Copyright (c) 2016-2017 Uber Technologies, Inc.
@@ -2378,6 +2387,24 @@ Copyright 2019 gRPC authors.
 Copyright 2020 The gRPC Authors
 Copyright 2020 gRPC authors.
 Copyright 2021 gRPC authors.
+Copyright 2022 gRPC authors.
+Copyright 2023 gRPC authors.
+
+== Notices
+Copyright 2014 gRPC authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
 
 --------------------------------- (separator) ----------------------------------
 
@@ -2467,8 +2494,7 @@ Copyright (c) 2014 Nate Finch
 gopkg.in/tomb.v1
 
 == License Type
-===BSD-3-Clause-95d4102f
-
+=== BSD-3-Clause-95d4102f
 tomb - support for clean goroutine termination in Go.
 
 Copyright (c) 2010-2011 - Gustavo Niemeyer <gustavo@niemeyer.net>
@@ -2500,6 +2526,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+
 == Copyright
 Copyright (c) 2010-2011 - Gustavo Niemeyer <gustavo@niemeyer.net>
 Copyright (c) 2011 - Gustavo Niemeyer <gustavo@niemeyer.net>
@@ -2538,8 +2565,8 @@ limitations under the License.
 gopkg.in/yaml.v3
 
 == License Type
-===Apache-2.0-3c91c172
-
+=== MIT-3c91c172
+=== Apache-2.0
 
 This project is covered by two different licenses: MIT and Apache.
 
@@ -2592,6 +2619,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 
+
 == Copyright
 Copyright (c) 2006-2010 Kirill Simonov
 Copyright (c) 2006-2011 Kirill Simonov
@@ -2833,6 +2861,7 @@ k8s.io/kube-openapi
 SPDX:Apache-2.0
 
 == Copyright
+Copyright (C) MongoDB, Inc. 2017-present.
 Copyright (c) 2020 The Go Authors. All rights reserved.
 Copyright 2015 go-swagger maintainers
 Copyright 2016 The Kubernetes Authors.
@@ -2908,6 +2937,7 @@ SPDX:Apache-2.0
 Copyright (c) 2009 The Go Authors. All rights reserved.
 Copyright (c) 2015-2016 Manfred Touron
 Copyright (c) 2015-2018 gimme contributors
+Copyright (c) Microsoft Corporation. All rights reserved.
 Copyright 2009 The Go Authors. All rights reserved.
 Copyright 2014 The Kubernetes Authors.
 Copyright 2015 The Kubernetes Authors.
@@ -2979,8 +3009,8 @@ Copyright 2022 The Kubernetes Authors.
 sigs.k8s.io/json
 
 == License Type
-===Apache-2.0-545d3f23
-
+=== BSD-3-Clause--modified-by-Google-545d3f23
+=== Apache-2.0
 Files other than internal/golang/* licensed under:
 
 
@@ -3221,6 +3251,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+
 == Copyright
 Copyright (c) 2009 The Go Authors. All rights reserved.
 Copyright 2010 The Go Authors. All rights reserved.
@@ -3267,8 +3298,8 @@ Copyright 2020 The Kubernetes Authors.
 sigs.k8s.io/yaml
 
 == License Type
-===BSD-3-Clause--modified-by-Google-0ceb9ff3
-
+=== MIT-0ceb9ff3
+=== BSD-3-Clause--modified-by-Google
 The MIT License (MIT)
 
 Copyright (c) 2014 Sam Ghods
@@ -3321,6 +3352,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+
 == Copyright
 Copyright (c) 2012 The Go Authors. All rights reserved.
 Copyright (c) 2014 Sam Ghods
@@ -3906,5 +3938,5 @@ the Mozilla Public License, v. 2.0.
 
 
 === ATTRIBUTION-HELPER-GENERATED:
-=== Attribution helper version: {Major:0 Minor:11 GitVersion:0.10.0-69-g9cf205e3 GitCommit:9cf205e3ce436f506f0901d927c1e417e72f384f GitTreeState:dirty BuildDate:2022-10-10T19:24:17Z GoVersion:go1.19 Compiler:gc Platform:darwin/amd64}
-=== License file based on go.mod with md5 sum:  c183edbb789997dd3b3bac3e846cf78b
+=== Attribution helper version: {Major:0 Minor:11 GitVersion: GitCommit: GitTreeState:dirty BuildDate:1970-01-01T00:00:00Z GoVersion:go1.19.3 Compiler:gc Platform:darwin/arm64}
+=== License file based on go.mod with md5 sum:  41747060c5d7089ecb0b557be34262a4

cmd/oci-csi-controller-driver/csioptions/csioptions.go

@@ -28,7 +28,7 @@ const (
 	CrossNamespaceVolumeDataSource = "CrossNamespaceVolumeDataSource"
 )
 
-// CSIOptions structure which contains flag values
+//CSIOptions structure which contains flag values
 type CSIOptions struct {
 	Master                  string
 	Kubeconfig              string
@@ -59,7 +59,7 @@ type CSIOptions struct {
 	EnableResizer           bool
 }
 
-// NewCSIOptions initializes the flag
+//NewCSIOptions initializes the flag
 func NewCSIOptions() *CSIOptions {
 	csioptions := CSIOptions{
 		Master:                  *flag.String("master", "", "kube master"),