Oke oss release 1.25.0 (#416)

* JIRA:task/OKE-22216 Add mount option support to FSS CSI driver

* Make lb flex shape value formats consistent for all lb shape related annotations

* cherrypick 2d9a7ba

* Rebase with latest code from 1.24

* Removed MockMounter as it has been replace by FakeMounter

* Fixed incorrect commit introduce during merge

* JIRA: OKE-17462 Add dynamic provisioning support for FSS in CSI

commit aa4d9710adccbf12b83a922c0a30a973a8b36a49
Author: Vijay Bhargav Eshappa <vijay.bhargav.eshappa@oracle.com>
Date:   Sat Aug 27 16:11:33 2022 +0530

    Add provisioner for FSS dynamic provisioning

commit 067b4352b395a9b94df13cdb3d66b2fb6bc4cc8d
Author: mpagnis <mrunal.pagnis@oracle.com>
Date:   Fri Aug 19 17:06:27 2022 +0530

    JIRA: OKE-22216 Add mount option support to FSS CSI driver. Add e2e

commit 1cb90812ae03e783afaf02cafaa93ebdd2b75f4e
Author: mpagnis <mrunal.pagnis@oracle.com>
Date:   Fri Aug 19 16:34:44 2022 +0530

    JIRA: OKE-22216 Add mount option support to FSS CSI driver

1.24 provisioner changes

* OKE-24022 : Enable publishing CSI metrics in 1.22 - 1.24 clusters

* task/OKE-22696 Improve logging with storage plugins code

* OKE-20995 : Return suitable error message when volumeMode is set to block

* OKE-23391 - Immediate Volume Binding mode is not working as expected in kubernetes 1.25

* Update Kubernetes dependencies to v1.25.4

* cherrypick "check if there are in-progress work requests for lb & nlb and send service to exponential backoff if present

* OKE-24203: Emit new metrics CTX_TIMEOUT when AwaitWorkRequest context times out
OKE-24203: Treat context deadline exceeded as retryable error
Unit Tests for LB & NLB AwaitWorkRequest

* JIRA: OKE-24691 CSI driver PV attachment regex bug fix

* fixed go.mod and cherrypick errors

* fixed go.mod -2

* fixed go.mod -3

* fixed go.mod -4

* made changes to release workflow

* made changes to release workflow

* changed manifests for testing

* Changed image to 1.25.0, removed commented code and reverted release workflow.

* Changed image tag to latest

* Changed image tag to latest 2

* Added CSIDriver for bv with fsGroupPolicy: File

---------

Co-authored-by: Vijay Bhargav Eshappa <vijay.bhargav.eshappa@oracle.com>
Co-authored-by: Anish <anish.chaube@oracle.com>
Co-authored-by: mpagnis <mrunal.pagnis@oracle.com>
Co-authored-by: Akarsh Ellore Sreenath <akarsh.ellore.sreenath@oracle.com>
Co-authored-by: Pranav Sriram <pranav.sriram@oracle.com>
Co-authored-by: l-technicore <lalit.s.singh@oracle.com>

Author: 7 people

.github/workflows/makefile.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v2
         with:
-          go-version: 1.18
+          go-version: 1.19
         id: go
 
       - name: Check out code into the Go module directory

Dockerfile

@@ -34,6 +34,7 @@ COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/image/* /us
 
 RUN yum install -y util-linux \
   && yum install -y e2fsprogs \
+  && yum install -y xfsprogs \
   && yum clean all
 
 COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/dist/* /usr/local/bin/

Makefile

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

VERSION

@@ -1 +1 @@
-1.24
+1.25

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

@@ -21,20 +21,32 @@ import (
 	"go.uber.org/zap"
 )
 
+const (
+	bvCsiDriver = "BV"
+)
+
 //StartControllerDriver main function to start CSI Controller Driver
-func StartControllerDriver(csioptions csioptions.CSIOptions) {
+func StartControllerDriver(csioptions csioptions.CSIOptions, csiDriver driver.CSIDriver) {
 
 	logger := logging.Logger().Sugar()
 	logger.Sync()
 
-	drv, err := driver.NewControllerDriver(logger.Named("BV").With(zap.String("component", "csi-controller")), csioptions.Endpoint, csioptions.Kubeconfig, csioptions.Master,
-		true, driver.BlockVolumeDriverName, driver.BlockVolumeDriverVersion)
+	logger = logger.Named(string(csiDriver)).With(zap.String("component", "csi-controller"))
+	var drv *driver.Driver
+	var err error
+
+	if csiDriver == bvCsiDriver {
+		controllerDriverConfig := &driver.ControllerDriverConfig{CsiEndpoint: csioptions.Endpoint, CsiKubeConfig: csioptions.Kubeconfig, CsiMaster: csioptions.Master, EnableControllerServer: true, DriverName: driver.BlockVolumeDriverName, DriverVersion: driver.BlockVolumeDriverVersion}
+		drv, err = driver.NewControllerDriver(logger, *controllerDriverConfig)
+	} else {
+		controllerDriverConfig := &driver.ControllerDriverConfig{CsiEndpoint: csioptions.FssEndpoint, CsiKubeConfig: csioptions.Kubeconfig, CsiMaster: csioptions.Master, EnableControllerServer: true, DriverName: driver.FSSDriverName, DriverVersion: driver.FSSDriverVersion}
+		drv, err = driver.NewControllerDriver(logger, *controllerDriverConfig)
+	}
 	if err != nil {
-		logger.With(zap.Error(err)).Fatal("Failed to create controller driver.")
+		logger.With(zap.Error(err)).Fatal("Failed to create %s controller driver.", csiDriver)
 	}
-
 	if err := drv.Run(); err != nil {
-		logger.With(zap.Error(err)).Fatal("Failed to run the CSI driver.")
+		logger.With(zap.Error(err)).Fatal("Failed to run the CSI driver for %s.", csiDriver)
 	}
 
 	logger.Info("CSI driver exited")

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

@@ -16,16 +16,27 @@ package csioptions
 
 import (
 	"flag"
+	"strings"
 	"time"
+
+	"go.uber.org/zap"
+)
+
+const (
+	fssAddressSuffix            = "-fss.sock"
+	fssVolumeNameAppendedPrefix = "-fss"
 )
 
-//CSIOptions structure which contains flag values
+// CSIOptions structure which contains flag values
 type CSIOptions struct {
 	Master                  string
 	Kubeconfig              string
 	CsiAddress              string
 	Endpoint                string
+	FssCsiAddress           string
+	FssEndpoint             string
 	VolumeNamePrefix        string
+	FssVolumeNamePrefix     string
 	VolumeNameUUIDLength    int
 	ShowVersion             bool
 	RetryIntervalStart      time.Duration
@@ -47,14 +58,17 @@ type CSIOptions struct {
 	EnableResizer           bool
 }
 
-//NewCSIOptions initializes the flag
+// NewCSIOptions initializes the flag
 func NewCSIOptions() *CSIOptions {
 	csioptions := CSIOptions{
 		Master:                  *flag.String("master", "", "kube master"),
 		Kubeconfig:              *flag.String("kubeconfig", "", "cluster kube config"),
-		CsiAddress:              *flag.String("csi-address", "/run/csi/socket", "Address of the CSI driver socket."),
-		Endpoint:                *flag.String("csi-endpoint", "unix://tmp/csi.sock", "CSI endpoint"),
+		CsiAddress:              *flag.String("csi-address", "/run/csi/socket", "Address of the CSI BV driver socket."),
+		Endpoint:                *flag.String("csi-endpoint", "unix://tmp/csi.sock", "CSI BV endpoint"),
+		FssCsiAddress:           *flag.String("fss-csi-address", "/run/fss/socket", "Address of the CSI FSS driver socket."),
+		FssEndpoint:             *flag.String("fss-csi-endpoint", "unix://tmp/csi-fss.sock", "CSI FSS endpoint"),
 		VolumeNamePrefix:        *flag.String("csi-volume-name-prefix", "pvc", "Prefix to apply to the name of a created volume."),
+		FssVolumeNamePrefix:     *flag.String("fss-csi-volume-name-prefix", "pvc", "Prefix to apply to the name of a volume created for FSS."),
 		VolumeNameUUIDLength:    *flag.Int("csi-volume-name-uuid-length", -1, "Truncates generated UUID of a created volume to this length. Defaults behavior is to NOT truncate."),
 		ShowVersion:             *flag.Bool("csi-version", false, "Show version."),
 		RetryIntervalStart:      *flag.Duration("csi-retry-interval-start", time.Second, "Initial retry interval of failed provisioning or deletion. It doubles with each failure, up to retry-interval-max."),
@@ -76,3 +90,20 @@ func NewCSIOptions() *CSIOptions {
 	}
 	return &csioptions
 }
+
+// GetFssAddress returns the fssAddress based on csiAddress
+func GetFssAddress(csiAddress, defaultAddress string) string {
+	logger := zap.L().Sugar()
+	address := strings.Split(csiAddress, ".sock")
+	if len(address) != 2 || !strings.HasSuffix(csiAddress, ".sock") {
+		logger.Errorf("failed to parse csi-address : %s. Defaulting to : %s", csiAddress, defaultAddress)
+		return defaultAddress
+	}
+	fssAddress := address[0] + fssAddressSuffix
+	return fssAddress
+}
+
+// GetFssVolumeNamePrefix returns the fssVolumeNamePrefix based on csiVolumeNamePrefix
+func GetFssVolumeNamePrefix(csiVolumeNamePrefix string) string {
+	return csiVolumeNamePrefix + fssVolumeNameAppendedPrefix
+}

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

@@ -0,0 +1,62 @@
+package csioptions
+
+import (
+	"testing"
+)
+
+func Test_GetFssAddress(t *testing.T) {
+	testCases := map[string]struct {
+		csiAddress         string
+		expectedFssAddress string
+		defaultAddress     string
+	}{
+		"Valid csi address": {
+			csiAddress:         "/var/run/shared-tmpfs/csi.sock",
+			expectedFssAddress: "/var/run/shared-tmpfs/csi-fss.sock",
+			defaultAddress:     "/var/run/shared-tmpfs/csi-fss.sock",
+		},
+		"Invalid csi address": {
+			csiAddress:         "/var/run/shared-tmpfs/csi.sock.sock",
+			expectedFssAddress: "/var/run/shared-tmpfs/csi-fss.sock",
+			defaultAddress:     "/var/run/shared-tmpfs/csi-fss.sock",
+		},
+		"Valid csi endpoint": {
+			csiAddress:         "unix:///var/run/shared-tmpfs/csi.sock",
+			expectedFssAddress: "unix:///var/run/shared-tmpfs/csi-fss.sock",
+			defaultAddress:     "unix:///var/run/shared-tmpfs/csi-fss.sock",
+		},
+		"Invalid csi endpoint": {
+			csiAddress:         "unix:///var/run/shared-tmpfs/csi-fss.sock.sock",
+			expectedFssAddress: "unix:///var/run/shared-tmpfs/csi-fss.sock",
+			defaultAddress:     "unix:///var/run/shared-tmpfs/csi-fss.sock",
+		},
+	}
+	for name, tc := range testCases {
+		t.Run(name, func(t *testing.T) {
+			fssAddress := GetFssAddress(tc.csiAddress, tc.defaultAddress)
+			if tc.expectedFssAddress != fssAddress {
+				t.Errorf("Expected \n%+v\n but got \n%+v", tc.expectedFssAddress, fssAddress)
+			}
+		})
+	}
+}
+
+func Test_GetFssVolumeNamePrefix(t *testing.T) {
+	testCases := map[string]struct {
+		csiPrefix      string
+		expectedPrefix string
+	}{
+		"Valid csi address": {
+			csiPrefix:      "csi",
+			expectedPrefix: "csi-fss",
+		},
+	}
+	for name, tc := range testCases {
+		t.Run(name, func(t *testing.T) {
+			fssVolumeNamePrefix := GetFssVolumeNamePrefix(tc.csiPrefix)
+			if tc.expectedPrefix != fssVolumeNamePrefix {
+				t.Errorf("Expected \n%+v\n but got \n%+v", tc.expectedPrefix, fssVolumeNamePrefix)
+			}
+		})
+	}
+}

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

@@ -16,20 +16,23 @@ package main
 
 import (
 	"flag"
+	"time"
+
 	csicontrollerdriver "github.com/oracle/oci-cloud-controller-manager/cmd/oci-csi-controller-driver/csi-controller-driver"
 	"github.com/oracle/oci-cloud-controller-manager/cmd/oci-csi-controller-driver/csioptions"
+	"github.com/oracle/oci-cloud-controller-manager/pkg/csi/driver"
 	"github.com/oracle/oci-cloud-controller-manager/pkg/logging"
 	"github.com/oracle/oci-cloud-controller-manager/pkg/util/signals"
 	"go.uber.org/zap"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/clientcmd"
-	"time"
 )
 
 func main() {
 	csiOptions := csioptions.CSIOptions{}
 	flag.StringVar(&csiOptions.Endpoint, "endpoint", "unix://tmp/csi.sock", "CSI endpoint")
+	flag.StringVar(&csiOptions.FssEndpoint, "fss-csi-endpoint", "unix://tmp/csi-fss.sock", "CSI FSS endpoint")
 	flag.StringVar(&csiOptions.Master, "master", "", "kube master")
 	flag.StringVar(&csiOptions.Kubeconfig, "kubeconfig", "", "cluster kubeconfig")
 	flag.Parse()
@@ -51,6 +54,7 @@ func main() {
 		return
 	}
 	logger.With("endpoint", csiOptions.Endpoint).Infof("Starting controller driver go routine.")
-	go csicontrollerdriver.StartControllerDriver(csiOptions)
+	go csicontrollerdriver.StartControllerDriver(csiOptions, driver.BV)
+	go csicontrollerdriver.StartControllerDriver(csiOptions, driver.FSS)
 	<-stopCh
 }