From c90ad49334b5cd062d70eb2fc275117973474310 Mon Sep 17 00:00:00 2001 From: ypgohoka Date: Thu, 27 Jun 2024 09:05:49 +0530 Subject: [PATCH] Readme, Manifest and License changes --- .github/workflows/release.yaml | 4 +- Makefile | 2 +- README.md | 15 ++-- THIRD_PARTY_LICENSES.txt | 79 +++++++++++-------- hack/run_e2e_test.sh | 68 +++++++++++----- .../oci-cloud-controller-manager.yaml | 2 +- .../oci-csi-controller-driver.yaml | 2 +- .../oci-csi-node-driver.yaml | 2 +- .../oci-flexvolume-driver.yaml | 4 +- .../oci-volume-provisioner-fss.yaml | 2 +- .../oci-volume-provisioner.yaml | 2 +- .../providers/oci/load_balancer.go | 1 + .../cloud-provider-oci/csi_volume_creation.go | 1 - test/e2e/cloud-provider-oci/load_balancer.go | 4 - test/e2e/cloud-provider-oci/setup.go | 4 - test/e2e/framework/framework.go | 13 --- 16 files changed, 109 insertions(+), 96 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 83e9193969..56591c42cb 100644 --- a/.github/workflows/release.yaml +++ b/.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/${GITHUB_ACTOR,,}" 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/${GITHUB_ACTOR,,}" VERSION="${{ github.ref_name }}" make docker-push-all + run: OSS_REGISTRY="ghcr.io/oracle" VERSION="${{ github.ref_name }}" make docker-push-all diff --git a/Makefile b/Makefile index 4c8b62275a..982f9c35cf 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ else VERSION ?= ${VERSION} endif -RELEASE = v1.27.0 +RELEASE = v1.27.3 GOOS ?= linux ARCH ?= amd64 diff --git a/README.md b/README.md index e7895c7def..8a911b20a3 100644 --- a/README.md +++ b/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. diff --git a/THIRD_PARTY_LICENSES.txt b/THIRD_PARTY_LICENSES.txt index 1d4df9479e..835d64b03d 100644 --- a/THIRD_PARTY_LICENSES.txt +++ b/THIRD_PARTY_LICENSES.txt @@ -173,8 +173,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 @@ -192,6 +191,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 Copyright (c) 2013 Dave Collins @@ -242,8 +242,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. @@ -271,6 +270,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 @@ -295,6 +295,7 @@ SPDX:BSD-3-Clause--modified-by-Google == Copyright Copyright © 2012 The Go Authors. All rights reserved. +Copyright © fsnotify Authors. All rights reserved. --------------------------------- (separator) ---------------------------------- @@ -362,8 +363,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. @@ -393,6 +393,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. @@ -466,8 +467,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 @@ -703,6 +704,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 @@ -769,6 +771,7 @@ Copyright 2016 Google Inc. All rights reserved. Copyright 2017 Google Inc. All rights reserved. Copyright 2018 Google Inc. All rights reserved. Copyright 2021 Google Inc. All rights reserved. +Copyright 2023 Google Inc. All rights reserved. --------------------------------- (separator) ---------------------------------- @@ -787,8 +790,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. @@ -818,6 +820,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. @@ -904,8 +907,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. @@ -932,6 +934,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. @@ -1053,8 +1056,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. @@ -1088,6 +1090,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. @@ -1118,6 +1121,7 @@ SPDX:MIT == Copyright Copyright (c) 2013-2014 Onsi Fakhouri Copyright (c) 2016 Yasuhiro Matsumoto +Copyright (c) Yasuhiro MATSUMOTO Copyright 2013 The Go Authors. All rights reserved. --------------------------------- (separator) ---------------------------------- @@ -1154,8 +1158,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. @@ -1260,6 +1265,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. @@ -1281,8 +1287,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 @@ -1532,6 +1538,7 @@ License: limitations under the License. + == Copyright Copyright (c) 2013 - 2021 Thomas Pelletier, Eric Anderton Copyright 2016 Google LLC @@ -1830,7 +1837,6 @@ Copyright 2018 The etcd Authors Copyright 2019 The etcd Authors Copyright 2021 The etcd Authors Copyright 2022 The etcd Authors -Copyright 2023 The etcd Authors --------------------------------- (separator) ---------------------------------- @@ -1972,11 +1978,7 @@ SPDX:MIT == Copyright Copyright (c) 2017 Uber Technologies, Inc. -Copyright (c) 2017-2021 Uber Technologies, Inc. -Copyright (c) 2017-2023 Uber Technologies, Inc. -Copyright (c) 2020 Uber Technologies, Inc. -Copyright (c) 2021 Uber Technologies, Inc. -Copyright (c) 2023 Uber Technologies, Inc. +Copyright (c) 2019 Uber Technologies, Inc. --------------------------------- (separator) ---------------------------------- @@ -1987,6 +1989,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. @@ -2195,6 +2198,7 @@ Copyright 2020 The Go Authors. All rights reserved. Copyright 2021 The Go Authors. All rights reserved. Copyright 2022 The Go Authors. All rights reserved. Copyright 2023 The Go Authors. All rights reserved. +Copyright 2024 The Go Authors. All rights reserved. == Patents Additional IP Rights Grant (Patents) @@ -2432,7 +2436,9 @@ Copyright 2019 The Go Authors. All rights reserved.", Copyright 2020 The Go Authors. All rights reserved. Copyright 2021 The Go Authors. All rights reserved. Copyright 2022 The Go Authors. All rights reserved. +Copyright 2023 Google Inc. All rights reserved. Copyright 2023 The Go Authors. All rights reserved. +Copyright 2024 The Go Authors. All rights reserved. == Patents Additional IP Rights Grant (Patents) @@ -2502,8 +2508,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 @@ -2535,6 +2540,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 Copyright (c) 2011 - Gustavo Niemeyer @@ -2573,8 +2579,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. @@ -2627,6 +2633,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 @@ -2878,6 +2885,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. @@ -2955,6 +2963,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. @@ -3026,8 +3035,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: @@ -3268,6 +3277,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. @@ -3314,8 +3324,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 @@ -3368,6 +3378,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 @@ -3953,5 +3964,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: c9ae5852248d0ea20400a817f8643ccb +=== 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: de9d9164b9aea0c7ed531118168fb242 diff --git a/hack/run_e2e_test.sh b/hack/run_e2e_test.sh index 945c61ce90..4e59d3926d 100755 --- a/hack/run_e2e_test.sh +++ b/hack/run_e2e_test.sh @@ -43,26 +43,54 @@ function set_image_pull_repo_and_delete_namespace_flag () { } function run_e2e_tests_existing_cluster() { - ginkgo -v -progress --trace "${FOCUS_OPT}" "${FOCUS_FP_OPT}" \ - test/e2e/cloud-provider-oci -- \ - --cluster-kubeconfig=${CLUSTER_KUBECONFIG} \ - --cloud-config=${CLOUD_CONFIG} \ - --adlocation=${ADLOCATION} \ - --delete-namespace=${DELETE_NAMESPACE} \ - --image-pull-repo=${IMAGE_PULL_REPO} \ - --cmek-kms-key=${CMEK_KMS_KEY} \ - --mnt-target-id=${MNT_TARGET_ID} \ - --mnt-target-subnet-id=${MNT_TARGET_SUBNET_ID} \ - --mnt-target-compartment-id=${MNT_TARGET_COMPARTMENT_ID} \ - --nsg-ocids=${NSG_OCIDS} \ - --backend-nsg-ocids=${BACKEND_NSG_OCIDS} \ - --reserved-ip=${RESERVED_IP} \ - --architecture=${ARCHITECTURE} \ - --volume-handle=${FSS_VOLUME_HANDLE} \ - --static-snapshot-compartment-id=${STATIC_SNAPSHOT_COMPARTMENT_ID} \ - --enable-parallel-run=${ENABLE_PARALLEL_RUN} \ - --run-uhp-e2e=${RUN_UHP_E2E} \ - --add-oke-system-tags="false" + if [[ -z "${E2E_NODE_COUNT}" ]]; then + E2E_NODE_COUNT=1 + fi + + if [ "$ENABLE_PARALLEL_RUN" == "true" ] || [ "$ENABLE_PARALLEL_RUN" == "TRUE" ]; then + ginkgo -v -p -progress --trace "${FOCUS_OPT}" "${FOCUS_FP_OPT}" \ + test/e2e/cloud-provider-oci -- \ + --cluster-kubeconfig=${CLUSTER_KUBECONFIG} \ + --cloud-config=${CLOUD_CONFIG} \ + --adlocation=${ADLOCATION} \ + --delete-namespace=${DELETE_NAMESPACE} \ + --image-pull-repo=${IMAGE_PULL_REPO} \ + --cmek-kms-key=${CMEK_KMS_KEY} \ + --mnt-target-id=${MNT_TARGET_ID} \ + --mnt-target-subnet-id=${MNT_TARGET_SUBNET_ID} \ + --mnt-target-compartment-id=${MNT_TARGET_COMPARTMENT_ID} \ + --nsg-ocids=${NSG_OCIDS} \ + --backend-nsg-ocids=${BACKEND_NSG_OCIDS} \ + --reserved-ip=${RESERVED_IP} \ + --architecture=${ARCHITECTURE} \ + --volume-handle=${FSS_VOLUME_HANDLE} \ + --static-snapshot-compartment-id=${STATIC_SNAPSHOT_COMPARTMENT_ID} \ + --enable-parallel-run=${ENABLE_PARALLEL_RUN} \ + --run-uhp-e2e=${RUN_UHP_E2E} \ + --add-oke-system-tags="false" + else + ginkgo -v -progress --trace -nodes=${E2E_NODE_COUNT} "${FOCUS_OPT}" "${FOCUS_FP_OPT}" \ + ginkgo -v -p -progress --trace "${FOCUS_OPT}" "${FOCUS_FP_OPT}" \ + test/e2e/cloud-provider-oci -- \ + --cluster-kubeconfig=${CLUSTER_KUBECONFIG} \ + --cloud-config=${CLOUD_CONFIG} \ + --adlocation=${ADLOCATION} \ + --delete-namespace=${DELETE_NAMESPACE} \ + --image-pull-repo=${IMAGE_PULL_REPO} \ + --cmek-kms-key=${CMEK_KMS_KEY} \ + --mnt-target-id=${MNT_TARGET_ID} \ + --mnt-target-subnet-id=${MNT_TARGET_SUBNET_ID} \ + --mnt-target-compartment-id=${MNT_TARGET_COMPARTMENT_ID} \ + --nsg-ocids=${NSG_OCIDS} \ + --backend-nsg-ocids=${BACKEND_NSG_OCIDS} \ + --reserved-ip=${RESERVED_IP} \ + --architecture=${ARCHITECTURE} \ + --volume-handle=${FSS_VOLUME_HANDLE} \ + --static-snapshot-compartment-id=${STATIC_SNAPSHOT_COMPARTMENT_ID} \ + --enable-parallel-run=${ENABLE_PARALLEL_RUN} \ + --run-uhp-e2e=${RUN_UHP_E2E} \ + --add-oke-system-tags="false" + fi retval=$? return $retval } diff --git a/manifests/cloud-controller-manager/oci-cloud-controller-manager.yaml b/manifests/cloud-controller-manager/oci-cloud-controller-manager.yaml index 123fda62a9..ff2c21f669 100644 --- a/manifests/cloud-controller-manager/oci-cloud-controller-manager.yaml +++ b/manifests/cloud-controller-manager/oci-cloud-controller-manager.yaml @@ -42,7 +42,7 @@ spec: path: /etc/kubernetes containers: - name: oci-cloud-controller-manager - image: ghcr.io/oracle/cloud-provider-oci:v1.27.2 + image: ghcr.io/oracle/cloud-provider-oci:v1.27.3 command: ["/usr/local/bin/oci-cloud-controller-manager"] args: - --cloud-config=/etc/oci/cloud-provider.yaml diff --git a/manifests/container-storage-interface/oci-csi-controller-driver.yaml b/manifests/container-storage-interface/oci-csi-controller-driver.yaml index 165657ac4f..8155159d3d 100644 --- a/manifests/container-storage-interface/oci-csi-controller-driver.yaml +++ b/manifests/container-storage-interface/oci-csi-controller-driver.yaml @@ -96,7 +96,7 @@ spec: - --fss-csi-endpoint=unix://var/run/shared-tmpfs/csi-fss.sock command: - /usr/local/bin/oci-csi-controller-driver - image: ghcr.io/oracle/cloud-provider-oci:v1.27.2 + image: ghcr.io/oracle/cloud-provider-oci:v1.27.3 imagePullPolicy: IfNotPresent volumeMounts: - name: config diff --git a/manifests/container-storage-interface/oci-csi-node-driver.yaml b/manifests/container-storage-interface/oci-csi-node-driver.yaml index 23d8890fa1..75006ad0d7 100644 --- a/manifests/container-storage-interface/oci-csi-node-driver.yaml +++ b/manifests/container-storage-interface/oci-csi-node-driver.yaml @@ -117,7 +117,7 @@ spec: fieldPath: spec.nodeName - name: PATH value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/bin:/host/sbin - image: ghcr.io/oracle/cloud-provider-oci:v1.27.2 + image: ghcr.io/oracle/cloud-provider-oci:v1.27.3 securityContext: privileged: true volumeMounts: diff --git a/manifests/flexvolume-driver/oci-flexvolume-driver.yaml b/manifests/flexvolume-driver/oci-flexvolume-driver.yaml index 7391cc3c8a..2e7e3b7c53 100644 --- a/manifests/flexvolume-driver/oci-flexvolume-driver.yaml +++ b/manifests/flexvolume-driver/oci-flexvolume-driver.yaml @@ -40,7 +40,7 @@ spec: secretName: oci-flexvolume-driver containers: - name: oci-flexvolume-driver - image: ghcr.io/oracle/cloud-provider-oci:v1.27.2 + image: ghcr.io/oracle/cloud-provider-oci:v1.27.3 command: ["/usr/local/bin/install.py", "-c", "/tmp/config.yaml"] securityContext: privileged: true @@ -76,7 +76,7 @@ spec: type: DirectoryOrCreate containers: - name: oci-flexvolume-driver - image: ghcr.io/oracle/cloud-provider-oci:v1.27.2 + image: ghcr.io/oracle/cloud-provider-oci:v1.27.3 command: ["/usr/local/bin/install.py"] securityContext: privileged: true diff --git a/manifests/volume-provisioner/oci-volume-provisioner-fss.yaml b/manifests/volume-provisioner/oci-volume-provisioner-fss.yaml index e86523022f..d5d1f0140c 100644 --- a/manifests/volume-provisioner/oci-volume-provisioner-fss.yaml +++ b/manifests/volume-provisioner/oci-volume-provisioner-fss.yaml @@ -35,7 +35,7 @@ spec: secretName: oci-volume-provisioner containers: - name: oci-volume-provisioner - image: ghcr.io/oracle/cloud-provider-oci:v1.27.2 + image: ghcr.io/oracle/cloud-provider-oci:v1.27.3 command: ["/usr/local/bin/oci-volume-provisioner"] env: - name: NODE_NAME diff --git a/manifests/volume-provisioner/oci-volume-provisioner.yaml b/manifests/volume-provisioner/oci-volume-provisioner.yaml index 6cfe06879a..4d2e69688c 100644 --- a/manifests/volume-provisioner/oci-volume-provisioner.yaml +++ b/manifests/volume-provisioner/oci-volume-provisioner.yaml @@ -35,7 +35,7 @@ spec: secretName: oci-volume-provisioner containers: - name: oci-volume-provisioner - image: ghcr.io/oracle/cloud-provider-oci:v1.27.2 + image: ghcr.io/oracle/cloud-provider-oci:v1.27.3 command: ["/usr/local/bin/oci-volume-provisioner"] env: - name: NODE_NAME diff --git a/pkg/cloudprovider/providers/oci/load_balancer.go b/pkg/cloudprovider/providers/oci/load_balancer.go index d4e8dfbf27..122818f362 100644 --- a/pkg/cloudprovider/providers/oci/load_balancer.go +++ b/pkg/cloudprovider/providers/oci/load_balancer.go @@ -539,6 +539,7 @@ func (cp *CloudProvider) EnsureLoadBalancer(ctx context.Context, clusterName str dimensionsMap[metrics.ComponentDimension] = lbMetricDimension dimensionsMap[metrics.ResourceOCIDDimension] = lbName metrics.SendMetricData(cp.metricPusher, getMetric(loadBalancerType, Update), time.Since(startTime).Seconds(), dimensionsMap) + return nil, err } lbExists := !client.IsNotFound(err) lbOCID := "" diff --git a/test/e2e/cloud-provider-oci/csi_volume_creation.go b/test/e2e/cloud-provider-oci/csi_volume_creation.go index 82b03c2c9d..f21743ff7e 100644 --- a/test/e2e/cloud-provider-oci/csi_volume_creation.go +++ b/test/e2e/cloud-provider-oci/csi_volume_creation.go @@ -44,7 +44,6 @@ var _ = Describe("CSI Volume Creation", func() { // volume name duplicate should not exist for _, volume := range volumes { framework.Logf("volume details %v :", volume) - framework.Logf("cluster ocid from setup is %s", setupF.ClusterOcid) if setupF.AddOkeSystemTags && !framework.HasOkeSystemTags(volume.SystemTags) { framework.Failf("the resource %s is expected to have oke system tags", *volume.Id) } diff --git a/test/e2e/cloud-provider-oci/load_balancer.go b/test/e2e/cloud-provider-oci/load_balancer.go index a2c0a0a4da..ecffae5f44 100644 --- a/test/e2e/cloud-provider-oci/load_balancer.go +++ b/test/e2e/cloud-provider-oci/load_balancer.go @@ -16,10 +16,8 @@ package e2e import ( "context" - "encoding/json" "fmt" "net" - "reflect" "strconv" "strings" @@ -27,7 +25,6 @@ import ( . "github.com/onsi/gomega" cloudprovider "github.com/oracle/oci-cloud-controller-manager/pkg/cloudprovider/providers/oci" sharedfw "github.com/oracle/oci-cloud-controller-manager/test/e2e/framework" - "github.com/oracle/oci-go-sdk/v65/containerengine" "github.com/oracle/oci-go-sdk/v65/core" "go.uber.org/zap" @@ -120,7 +117,6 @@ var _ = Describe("Service [Slow]", func() { loadBalancer, err := f.Client.LoadBalancer(zap.L().Sugar(), lbType, "", nil).GetLoadBalancerByName(ctx, compartmentId, lbName) sharedfw.ExpectNoError(err) sharedfw.Logf("Loadbalancer details %v:", loadBalancer) - sharedfw.Logf("cluster ocid from setup is %s", setupF.ClusterOcid) if setupF.AddOkeSystemTags && !sharedfw.HasOkeSystemTags(loadBalancer.SystemTags) { sharedfw.Failf("Loadbalancer is expected to have the system tags") } diff --git a/test/e2e/cloud-provider-oci/setup.go b/test/e2e/cloud-provider-oci/setup.go index 07f7d616e4..97f5477803 100644 --- a/test/e2e/cloud-provider-oci/setup.go +++ b/test/e2e/cloud-provider-oci/setup.go @@ -1,12 +1,8 @@ package e2e import ( - "time" - "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" sharedfw "github.com/oracle/oci-cloud-controller-manager/test/e2e/framework" - oke "github.com/oracle/oci-go-sdk/v65/containerengine" ) var setupF *sharedfw.Framework diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go index 7cc652c651..238ddba901 100644 --- a/test/e2e/framework/framework.go +++ b/test/e2e/framework/framework.go @@ -15,26 +15,13 @@ package framework import ( - "context" "flag" "fmt" - "io/ioutil" "math/rand" - "os" - "strconv" "strings" "time" imageutils "k8s.io/kubernetes/test/utils/image" - - "github.com/oracle/oci-cloud-controller-manager/pkg/cloudprovider/providers/oci/config" - - . "github.com/onsi/gomega" - "github.com/oracle/oci-go-sdk/v65/common" - oke "github.com/oracle/oci-go-sdk/v65/containerengine" - "github.com/oracle/oci-go-sdk/v65/core" - "github.com/oracle/oci-go-sdk/v65/identity" - "gopkg.in/yaml.v2" ) const (