From 6d5fa4ea75d4d50ea073fc2c3685cf7ff71179d5 Mon Sep 17 00:00:00 2001 From: l-technicore Date: Wed, 14 Feb 2024 13:36:24 +0530 Subject: [PATCH] Updating manifests, E2E Readme.md, compatibility matrix, third party licenses file, minor fixes and other doc updates --- Dockerfile | 2 + Dockerfile_arm_all | 2 + README.md | 6 +- THIRD_PARTY_LICENSES.txt | 154 ++++++++++-------- cmd/oci-csi-controller-driver/main.go | 7 + ...ting-block-volume-performance-using-csi.md | 4 + .../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 +- scripts/chroot-bash | 3 + test/e2e/cloud-provider-oci/README.md | 15 ++ 14 files changed, 130 insertions(+), 77 deletions(-) create mode 100644 scripts/chroot-bash diff --git a/Dockerfile b/Dockerfile index aa0b8a4b65..d3851d7e0c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,8 +40,10 @@ RUN yum install -y util-linux \ COPY scripts/encrypt-mount /sbin/encrypt-mount COPY scripts/encrypt-umount /sbin/encrypt-umount COPY scripts/rpm-host /sbin/rpm-host +COPY scripts/chroot-bash /sbin/chroot-bash RUN chmod 755 /sbin/encrypt-mount RUN chmod 755 /sbin/encrypt-umount RUN chmod 755 /sbin/rpm-host +RUN chmod 755 /sbin/chroot-bash COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/dist/* /usr/local/bin/ diff --git a/Dockerfile_arm_all b/Dockerfile_arm_all index 6c8095ce4c..37aefcf5a7 100644 --- a/Dockerfile_arm_all +++ b/Dockerfile_arm_all @@ -24,8 +24,10 @@ RUN yum install -y util-linux \ COPY scripts/encrypt-mount /sbin/encrypt-mount COPY scripts/encrypt-umount /sbin/encrypt-umount COPY scripts/rpm-host /sbin/rpm-host +COPY scripts/chroot-bash /sbin/chroot-bash RUN chmod 755 /sbin/encrypt-mount RUN chmod 755 /sbin/encrypt-umount RUN chmod 755 /sbin/rpm-host +RUN chmod 755 /sbin/chroot-bash COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/dist/arm/* /usr/local/bin/ diff --git a/README.md b/README.md index 28b2d96bac..e7895c7def 100644 --- a/README.md +++ b/README.md @@ -31,9 +31,9 @@ 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.2 | v1.26 | - | -| v1.27.1 | v1.27 | - | - +| v1.26.3 | v1.26 | - | +| v1.27.2 | v1.27 | - | +| v1.28.0 | v1.28 | - | diff --git a/THIRD_PARTY_LICENSES.txt b/THIRD_PARTY_LICENSES.txt index 8bd1b8766d..1d4df9479e 100644 --- a/THIRD_PARTY_LICENSES.txt +++ b/THIRD_PARTY_LICENSES.txt @@ -10,6 +10,7 @@ Copyright 2016 The Kubernetes Authors. Copyright 2017 Oracle and/or its affiliates. All rights reserved. Copyright 2017 The Kubernetes Authors. Copyright 2018 Oracle and/or its affiliates. All rights reserved. +Copyright 2018 The Kubernetes Authors. Copyright 2019 Oracle and/or its affiliates. All rights reserved. Copyright 2020 Oracle and/or its affiliates. All rights reserved. Copyright 2021 Oracle and/or its affiliates. All rights reserved. @@ -172,7 +173,8 @@ 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 @@ -190,7 +192,6 @@ 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 @@ -199,6 +200,17 @@ Copyright (c) 2015-2016 Dave Collins --------------------------------- (separator) ---------------------------------- +== Dependency +github.com/distribution/reference + +== License Type +SPDX:Apache-2.0 + +== Copyright +(no copyright notices found) + +--------------------------------- (separator) ---------------------------------- + == Dependency github.com/docker/distribution @@ -230,7 +242,8 @@ 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. @@ -258,7 +271,6 @@ 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 @@ -283,7 +295,6 @@ SPDX:BSD-3-Clause--modified-by-Google == Copyright Copyright © 2012 The Go Authors. All rights reserved. -Copyright © fsnotify Authors. All rights reserved. --------------------------------- (separator) ---------------------------------- @@ -298,6 +309,7 @@ Copyright 2019 The logr Authors. Copyright 2020 The logr Authors. Copyright 2021 The logr Authors. Copyright 2022 The logr Authors. +Copyright 2023 The logr Authors. --------------------------------- (separator) ---------------------------------- @@ -350,7 +362,8 @@ 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. @@ -380,7 +393,6 @@ 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. @@ -454,8 +466,8 @@ Copyright 2020 The Go Authors. All rights reserved. github.com/google/cel-go == License Type -=== Apache-2.0-9e40c772 -=== BSD-3-Clause--modified-by-Google +===Apache-2.0-9e40c772 + Apache License Version 2.0, January 2004 @@ -691,7 +703,6 @@ 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,7 +787,8 @@ 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. @@ -806,11 +818,10 @@ 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. -Copyright 2010 The Go Authors. All rights reserved. +Copyright 2010, 2019 The Go Authors. All rights reserved. --------------------------------- (separator) ---------------------------------- @@ -893,7 +904,8 @@ 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. @@ -920,7 +932,6 @@ 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,7 +1053,8 @@ 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. @@ -1076,7 +1088,6 @@ 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,7 +1118,6 @@ 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) ---------------------------------- @@ -1144,9 +1154,8 @@ Copyright © 2019, 2020 OCI Contributors github.com/oracle/oci-go-sdk/v65 == License Type -=== Apache-2.0-9010f56e -=== UPL-1.0 -=== Apache-2.0 +===Apache-2.0-9010f56e + 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. @@ -1251,13 +1260,12 @@ 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. Copyright (c) 2016, 2018, 2020, Oracle and/or its affiliates. Copyright (c) 2016, 2018, 2020, Oracle and/or its affiliates. All rights reserved. -Copyright (c) 2016, 2018, 2023, Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates. All rights reserved. Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. Copyright (c) 2016, 2023 Oracle and/or its affiliates. Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved. @@ -1273,8 +1281,8 @@ Copyright (c) 2016, 2018, 2020, Oracle and/or its affiliates. github.com/pelletier/go-toml == License Type -=== MIT-e49b63d8 -=== Apache-2.0 +===Apache-2.0-e49b63d8 + 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 @@ -1524,7 +1532,6 @@ License: limitations under the License. - == Copyright Copyright (c) 2013 - 2021 Thomas Pelletier, Eric Anderton Copyright 2016 Google LLC @@ -1698,6 +1705,8 @@ Copyright © 2015 Jerry Jacobs . Copyright © 2015 Steve Francia . Copyright © 2016 Steve Francia . Copyright © 2018 Steve Francia . +Copyright © 2021 Vasily Ovchinnikov . +Copyright © 2022 Steve Francia . --------------------------------- (separator) ---------------------------------- @@ -1821,6 +1830,7 @@ 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) ---------------------------------- @@ -1874,17 +1884,6 @@ SPDX:Apache-2.0 --------------------------------- (separator) ---------------------------------- -== Dependency -go.opentelemetry.io/otel/exporters/otlp/internal/retry - -== License Type -SPDX:Apache-2.0 - -== Copyright -(no copyright notices found) - ---------------------------------- (separator) ---------------------------------- - == Dependency go.opentelemetry.io/otel/exporters/otlp/otlptrace @@ -1973,7 +1972,11 @@ SPDX:MIT == Copyright Copyright (c) 2017 Uber Technologies, Inc. -Copyright (c) 2019 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. --------------------------------- (separator) ---------------------------------- @@ -1984,7 +1987,6 @@ 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. @@ -2021,7 +2023,9 @@ Copyright 2017 The Go Authors. All rights reserved. Copyright 2018 The Go Authors. All rights reserved. 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 The Go Authors. All rights reserved. == Patents Additional IP Rights Grant (Patents) @@ -2121,6 +2125,7 @@ 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 The Go Authors. All rights reserved. --------------------------------- (separator) ---------------------------------- @@ -2136,6 +2141,7 @@ Copyright 2013 The Go Authors. All rights reserved. Copyright 2016 The Go Authors. All rights reserved. Copyright 2017 The Go Authors. All rights reserved. Copyright 2019 The Go Authors. All rights reserved. +Copyright 2023 The Go Authors. All rights reserved. == Patents Additional IP Rights Grant (Patents) @@ -2343,28 +2349,29 @@ shall terminate as of the date such litigation is filed. --------------------------------- (separator) ---------------------------------- == Dependency -google.golang.org/genproto +google.golang.org/genproto/googleapis/api == License Type SPDX:Apache-2.0 == Copyright -Copyright (c) 2015, Google Inc. Copyright 2015 Google LLC -Copyright 2016 Google Inc. Copyright 2016 Google LLC -Copyright 2017 Google Inc. -Copyright 2018 Google Inc. -Copyright 2018 Google LLC -Copyright 2018 The Grafeas Authors. All rights reserved. Copyright 2019 Google LLC. -Copyright 2019 The Grafeas Authors. All rights reserved. -Copyright 2020 Google LLC -Copyright 2020 Google LLC. -Copyright 2021 Google LLC -Copyright 2021 Google LLC. -Copyright 2021 The Grafeas Authors. All rights reserved. Copyright 2022 Google LLC +Copyright 2023 Google LLC + +--------------------------------- (separator) ---------------------------------- + +== Dependency +google.golang.org/genproto/googleapis/rpc + +== License Type +SPDX:Apache-2.0 + +== Copyright +Copyright 2022 Google LLC +Copyright 2023 Google LLC --------------------------------- (separator) ---------------------------------- @@ -2388,6 +2395,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) ---------------------------------- @@ -2477,7 +2502,8 @@ 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 @@ -2509,7 +2535,6 @@ 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 @@ -2548,8 +2573,8 @@ limitations under the License. gopkg.in/yaml.v3 == License Type -=== MIT-3c91c172 -=== Apache-2.0 +===Apache-2.0-3c91c172 + This project is covered by two different licenses: MIT and Apache. @@ -2602,7 +2627,6 @@ 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 @@ -2854,7 +2878,6 @@ 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. @@ -2932,7 +2955,6 @@ 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. @@ -3004,8 +3026,8 @@ Copyright 2022 The Kubernetes Authors. sigs.k8s.io/json == License Type -=== BSD-3-Clause--modified-by-Google-545d3f23 -=== Apache-2.0 +===Apache-2.0-545d3f23 + Files other than internal/golang/* licensed under: @@ -3246,7 +3268,6 @@ 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. @@ -3293,8 +3314,8 @@ Copyright 2020 The Kubernetes Authors. sigs.k8s.io/yaml == License Type -=== MIT-0ceb9ff3 -=== BSD-3-Clause--modified-by-Google +===BSD-3-Clause--modified-by-Google-0ceb9ff3 + The MIT License (MIT) Copyright (c) 2014 Sam Ghods @@ -3347,7 +3368,6 @@ 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 @@ -3933,5 +3953,5 @@ the Mozilla Public License, v. 2.0. === ATTRIBUTION-HELPER-GENERATED: -=== 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: b60928eaa9060ddc672cab2c555f2306 +=== 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 diff --git a/cmd/oci-csi-controller-driver/main.go b/cmd/oci-csi-controller-driver/main.go index ec41385b20..940216c869 100644 --- a/cmd/oci-csi-controller-driver/main.go +++ b/cmd/oci-csi-controller-driver/main.go @@ -53,8 +53,15 @@ func main() { logger.With(zap.Error(err)).Errorf("failed to get kube-apiserver version") return } + //setting operation timeout to 240 seconds for FSS driver (used for CreateVolume/DeleteVolume gRPCs) + csiOptions.OperationTimeout = 240 * time.Second + + //setting timeout to 200 seconds for BV driver (used for ControllerPublish/ControllerUnpublish/ControllerExpand gRPCs) + csiOptions.Timeout = 200 * time.Second + logger.With("endpoint", csiOptions.Endpoint).Infof("Starting controller driver go routine.") go csicontrollerdriver.StartControllerDriver(csiOptions, driver.BV) + go csicontrollerdriver.StartControllerDriver(csiOptions, driver.FSS) <-stopCh } diff --git a/docs/setting-block-volume-performance-using-csi.md b/docs/setting-block-volume-performance-using-csi.md index 652f799205..9ef3944448 100644 --- a/docs/setting-block-volume-performance-using-csi.md +++ b/docs/setting-block-volume-performance-using-csi.md @@ -71,4 +71,8 @@ Performance of block volume can be specified at the creation itself. Performance CSI version 1.19.12 or later which runs on k8s cluster 1.19 or later supports block volume expansion. Flex volume does not support. +## Ultra High Performance (UHP) +Please refer [Block Volume Ultra High Performance Doc][2] + [1]: https://docs.oracle.com/en-us/iaas/Content/ContEng/Tasks/contengcreatingpersistentvolumeclaim.htm#contengcreatingpersistentvolumeclaim_topic_Provisioning_PVCs_on_BV_PV_Volume_performance +[2]: https://docs.oracle.com/en-us/iaas/Content/Block/Concepts/blockvolumeultrahighperformance.htm#Higher_Performance diff --git a/manifests/cloud-controller-manager/oci-cloud-controller-manager.yaml b/manifests/cloud-controller-manager/oci-cloud-controller-manager.yaml index 95c1833965..123fda62a9 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.1 + image: ghcr.io/oracle/cloud-provider-oci:v1.27.2 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 81e671fc36..165657ac4f 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.1 + image: ghcr.io/oracle/cloud-provider-oci:v1.27.2 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 87e9d1ae16..23d8890fa1 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.1 + image: ghcr.io/oracle/cloud-provider-oci:v1.27.2 securityContext: privileged: true volumeMounts: diff --git a/manifests/flexvolume-driver/oci-flexvolume-driver.yaml b/manifests/flexvolume-driver/oci-flexvolume-driver.yaml index 7510cbbf3e..7391cc3c8a 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.1 + image: ghcr.io/oracle/cloud-provider-oci:v1.27.2 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.1 + image: ghcr.io/oracle/cloud-provider-oci:v1.27.2 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 6cc99703cc..e86523022f 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.1 + image: ghcr.io/oracle/cloud-provider-oci:v1.27.2 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 43456835f2..6cfe06879a 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.1 + image: ghcr.io/oracle/cloud-provider-oci:v1.27.2 command: ["/usr/local/bin/oci-volume-provisioner"] env: - name: NODE_NAME diff --git a/scripts/chroot-bash b/scripts/chroot-bash new file mode 100644 index 0000000000..2cbc494fc1 --- /dev/null +++ b/scripts/chroot-bash @@ -0,0 +1,3 @@ +#!/bin/sh +# This file can be used to run any command on the worker node +chroot /host /usr/bin/bash -c '$0' "$*" diff --git a/test/e2e/cloud-provider-oci/README.md b/test/e2e/cloud-provider-oci/README.md index 2d9305ddfd..7729d3bb72 100644 --- a/test/e2e/cloud-provider-oci/README.md +++ b/test/e2e/cloud-provider-oci/README.md @@ -56,6 +56,18 @@ Please refer [FSS Network Setup][5] for FSS setup. The BV expand tests need the cluster version and nodepool version to be 1.19+ +## Running Ultra High Performance tests (UHP) +Please refer [Block Volume Ultra High Performance Doc][6] for details on UHP Block Volumes. + +#### Pre-requisite for UHP: + +1. Nodes should have 16+ cores. Please refer [Shapes Block Details Doc][7] for exact compute shape requirements for the node. +2. [Enabling Block Volume Management on Existing Instances][8] + +To run UHP E2Es set the environment variable ``RUN_UHP_E2E=true`` [here](../../../hack/existing-standalone-cluster-env-template.sh). Then run the E2Es. + +Set ``FOCUS=[UHP]`` to run only the UHP E2Es. + ## Additional Debug Options when running tests on existing cluster Additional seclist count based sanity checks can be applied during e2e testing @@ -121,3 +133,6 @@ make run-ccm-e2e-tests-local FOCUS="load_*" FILES="true" [3]: https://kubernetes.io/docs/concepts/configuration/organize-cluster-access-kubeconfig/ [4]: https://www.oracle.com/downloads/cloud/cloud-infrastructure-file-storage-downloads.html [5]: https://docs.oracle.com/en-us/iaas/Content/File/Tasks/securitylistsfilestorage.htm +[6]: https://docs.oracle.com/en-us/iaas/Content/Block/Concepts/blockvolumeultrahighperformance.htm#Higher_Performance +[7]: https://docs.oracle.com/en-us/iaas/Content/Block/Concepts/blockvolumeperformance.htm#shapes_block_details +[8]: https://docs.oracle.com/en-us/iaas/Content/Block/Tasks/enablingblockvolumemanagementplugin.htm#enablingblockvolumemanagementplugin