Merge pull request #450 from l-technicore/oke-oss-release-1.26.1-latest-sdk

OSS Release 1.26.2

Author: l-technicore

README.md

@@ -32,7 +32,7 @@ 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.1   | v1.26                  | -                      |
+| v1.26.2   | v1.26                  | -                      |
 | v1.27.0   | v1.27                  | -                      |
 
 

go.mod

@@ -44,7 +44,7 @@ require (
 	github.com/kubernetes-csi/external-snapshotter/client/v6 v6.2.0
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.24.1
-	github.com/oracle/oci-go-sdk/v65 v65.49.2
+	github.com/oracle/oci-go-sdk/v65 v65.56.0
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.14.0
 	github.com/spf13/cobra v1.6.1 // indirect

go.sum

@@ -365,8 +365,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/selinux v1.10.0 h1:rAiKF8hTcgLI3w0DHm6i0ylVVcOrlgR1kK99DRLDhyU=
 github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI=
-github.com/oracle/oci-go-sdk/v65 v65.49.2 h1:optOfjGIVmZZMT3a/8ri/CVV1loDG0ab1p2tEpNW5ro=
-github.com/oracle/oci-go-sdk/v65 v65.49.2/go.mod h1:IBEV9l1qBzUpo7zgGaRUhbB05BVfcDGYRFBCPlTcPp0=
+github.com/oracle/oci-go-sdk/v65 v65.56.0 h1:o5na2VTSoH6LDLDrIB81XAjgtok6utLrixNO1TySN7c=
+github.com/oracle/oci-go-sdk/v65 v65.56.0/go.mod h1:IBEV9l1qBzUpo7zgGaRUhbB05BVfcDGYRFBCPlTcPp0=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pelletier/go-toml v1.9.3 h1:zeC5b1GviRUyKYd6OJPvBU/mcVDVoL1OhT17FCt5dSQ=
 github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=

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.26.1
+          image: ghcr.io/oracle/cloud-provider-oci:v1.26.2
           command: ["/usr/local/bin/oci-cloud-controller-manager"]
           args:
             - --cloud-config=/etc/oci/cloud-provider.yaml

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.26.1
+          image: ghcr.io/oracle/cloud-provider-oci:v1.26.2
           imagePullPolicy: IfNotPresent
           volumeMounts:
             - name: config

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.26.1
+          image: ghcr.io/oracle/cloud-provider-oci:v1.26.2
           securityContext:
             privileged: true
           volumeMounts:

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.26.1
+          image: ghcr.io/oracle/cloud-provider-oci:v1.26.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.26.1
+          image: ghcr.io/oracle/cloud-provider-oci:v1.26.2
           command: ["/usr/local/bin/install.py"]
           securityContext:
             privileged: true

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.26.1
+          image: ghcr.io/oracle/cloud-provider-oci:v1.26.2
           command: ["/usr/local/bin/oci-volume-provisioner"]
           env:
             - name: NODE_NAME

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.26.1
+          image: ghcr.io/oracle/cloud-provider-oci:v1.26.2
           command: ["/usr/local/bin/oci-volume-provisioner"]
           env:
             - name: NODE_NAME

pkg/oci/client/client.go

@@ -16,13 +16,6 @@ package client
 
 import (
 	"context"
-	"crypto/tls"
-	"crypto/x509"
-	"io/ioutil"
-	"net"
-	"net/http"
-	"net/url"
-	"os"
 	"time"
 
 	"github.com/oracle/oci-go-sdk/v65/common"
@@ -170,6 +163,7 @@ type client struct {
 
 // New constructs an OCI API client.
 func New(logger *zap.SugaredLogger, cp common.ConfigurationProvider, opRateLimiter *RateLimiter) (Interface, error) {
+
 	compute, err := core.NewComputeClientWithConfigurationProvider(cp)
 	if err != nil {
 		return nil, errors.Wrap(err, "NewComputeClientWithConfigurationProvider")
@@ -361,51 +355,5 @@ func (c *client) FSS() FileStorageInterface {
 }
 
 func configureCustomTransport(logger *zap.SugaredLogger, baseClient *common.BaseClient) error {
-	httpClient := baseClient.HTTPClient.(*http.Client)
-
-	var transport *http.Transport
-	if httpClient.Transport == nil {
-		transport = &http.Transport{
-			DialContext: (&net.Dialer{
-				Timeout:   30 * time.Second,
-				KeepAlive: 30 * time.Second,
-				DualStack: true,
-			}).DialContext,
-			MaxIdleConns:          100,
-			IdleConnTimeout:       90 * time.Second,
-			TLSHandshakeTimeout:   10 * time.Second,
-			ExpectContinueTimeout: 1 * time.Second,
-		}
-	} else {
-		transport = httpClient.Transport.(*http.Transport)
-	}
-
-	ociProxy := os.Getenv("OCI_PROXY")
-	if ociProxy != "" {
-		proxyURL, err := url.Parse(ociProxy)
-		if err != nil {
-			return errors.Wrapf(err, "failed to parse OCI proxy url: %s", ociProxy)
-		}
-		transport.Proxy = func(req *http.Request) (*url.URL, error) {
-			return proxyURL, nil
-		}
-	}
-
-	trustedCACertPath := os.Getenv("TRUSTED_CA_CERT_PATH")
-	if trustedCACertPath != "" {
-		logger.With("path", trustedCACertPath).Infof("Configuring OCI client with a new trusted ca")
-		trustedCACert, err := ioutil.ReadFile(trustedCACertPath)
-		if err != nil {
-			return errors.Wrapf(err, "failed to read root certificate: %s", trustedCACertPath)
-		}
-		caCertPool := x509.NewCertPool()
-		ok := caCertPool.AppendCertsFromPEM(trustedCACert)
-		if !ok {
-			return errors.Wrapf(err, "failed to parse root certificate: %s", trustedCACertPath)
-		}
-		transport.TLSClientConfig = &tls.Config{RootCAs: caCertPool}
-	}
-
-	httpClient.Transport = transport
 	return nil
 }