Merge pull request #485 from l-technicore/oke-oss-release-v1.29.1

OKE OSS Release v1.29.1

.github/workflows/makefile.yml

@@ -12,18 +12,21 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v2
         with:
-          go-version: '1.20'
+          go-version: '1.21'
         id: go
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
-
+      - name: Install dependencies
+        run: |
+          go mod download
       - name: Run Unit Tests
         run: |
           go test -covermode=count -coverprofile=profile.cov ./pkg/...
+      - name: Install goveralls
+        run: go install github.com/mattn/goveralls@latest
       - name: Send coverage
         env:
           COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          GO111MODULE=off go get github.com/mattn/goveralls
-          $(go env GOPATH)/bin/goveralls -coverprofile=profile.cov -service=github
+          goveralls -coverprofile=profile.cov -service=github

.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/${GITHUB_REPOSITORY_OWNER,,}" VERSION="${{ github.ref_name }}" make image
 
       - name: Push Image
-        run: OSS_REGISTRY="ghcr.io/oracle" VERSION="${{ github.ref_name }}" make docker-push-all
+        run: OSS_REGISTRY="ghcr.io/${GITHUB_REPOSITORY_OWNER,,}" VERSION="${{ github.ref_name }}" make docker-push-all

Dockerfile

@@ -27,7 +27,7 @@ WORKDIR $SRC
 
 RUN COMPONENT=${COMPONENT} make clean build
 
-FROM oraclelinux:8-slim
+FROM ghcr.io/oracle/oraclelinux:8-slim-fips
 
 COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/dist/* /usr/local/bin/
 COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/image/* /usr/local/bin/
@@ -45,4 +45,4 @@ 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/
+COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/dist/* /usr/local/bin/

Dockerfile_arm_all

@@ -14,7 +14,7 @@ WORKDIR $SRC
 
 RUN ARCH=arm make clean build-arm-all
 
-FROM arm64v8/oraclelinux:8-slim
+FROM ghcr.io/oracle/oraclelinux:8-slim-fips-arm64v8
 
 RUN microdnf -y install util-linux e2fsprogs xfsprogs python2 && \
     microdnf update && \
@@ -29,4 +29,4 @@ 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/
+COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/dist/arm/* /usr/local/bin/

Makefile

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

README.md

@@ -33,13 +33,13 @@ cloud-provider specific code out of the Kubernetes codebase.
 | v1.25.2   | v1.25                  | -                      |
 | v1.26.4   | v1.26                  | -                      |
 | v1.27.3   | v1.27                  | -                      |
-| v1.28.1   | v1.28                  | -                      |
-| v1.29.0   | v1.29                  | -                      |
-
+| v1.28.2   | v1.28                  | -                      |
+| v1.29.1   | v1.29                  | -                      |
+| v1.30.0   | v1.30                  | -                      |
 
 
 Note: 
-Versions older than v1.27.3 are no longer supported, new features / bug fixes will be available in v1.27.3 and later. 
+Versions older than v1.28.2 are no longer supported, new features / bug fixes will be available in v1.28.2 and later. 
 
 ## Implementation
  Currently `oci-cloud-controller-manager` implements:

THIRD_PARTY_LICENSES.txt

@@ -1179,7 +1179,6 @@ SPDX:MIT
 
 == Copyright
 Copyright (c) 2013-2014 Onsi Fakhouri
-Copyright (c) 2014 Amit Kumar Gupta
 
 --------------------------------- (separator) ----------------------------------
 
@@ -1312,16 +1311,12 @@ END OF TERMS AND CONDITIONS
 
 
 == 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, 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.
-Copyright © 2012-2020 Mat Ryer, Tyler Bunnell and contributors.
-Copyright © 2013 The Go Authors. All rights reserved.
 
 == Notices
 Copyright (c) 2016, 2018, 2020, Oracle and/or its affiliates.
@@ -2027,7 +2022,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.
@@ -2170,6 +2164,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)
@@ -3067,6 +3062,7 @@ Copyright 2020 The Kubernetes Authors.
 Copyright 2021 The Kubernetes Authors.
 Copyright 2022 The Kubernetes Authors.
 Copyright 2023 The Kubernetes Authors.
+Copyright 2024 The Kubernetes Authors.
 
 --------------------------------- (separator) ----------------------------------
 
@@ -4324,5 +4320,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:  5ba4389f9d7406b21218d714f3f79d86
+=== Attribution helper version: {Major:0 Minor:11 GitVersion:0.10.0-114-g3747dab9 GitCommit:3747dab92eb29c0dbe6409ffbb824b9ae3a04b87 GitTreeState:dirty BuildDate:2024-02-28T16:52:52Z GoVersion:go1.21.0 Compiler:gc Platform:darwin/amd64}
+=== License file based on go.mod with md5 sum:  ea9bd465882b674ff1025b18349e102f

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

@@ -15,6 +15,8 @@
 package csicontrollerdriver
 
 import (
+	"os"
+
 	"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"
@@ -25,7 +27,7 @@ const (
 	bvCsiDriver = "BV"
 )
 
-//StartControllerDriver main function to start CSI Controller Driver
+// StartControllerDriver main function to start CSI Controller Driver
 func StartControllerDriver(csioptions csioptions.CSIOptions, csiDriver driver.CSIDriver) {
 
 	logger := logging.Logger().Sugar()
@@ -35,11 +37,16 @@ func StartControllerDriver(csioptions csioptions.CSIOptions, csiDriver driver.CS
 	var drv *driver.Driver
 	var err error
 
+	clusterIpFamily := os.Getenv("CLUSTER_IP_FAMILY")
+	if clusterIpFamily != "" {
+		logger.Infof("Using cluster ip family : %s", clusterIpFamily)
+	}
+
 	if csiDriver == bvCsiDriver {
-		controllerDriverConfig := &driver.ControllerDriverConfig{CsiEndpoint: csioptions.Endpoint, CsiKubeConfig: csioptions.Kubeconfig, CsiMaster: csioptions.Master, EnableControllerServer: true, DriverName: driver.BlockVolumeDriverName, DriverVersion: driver.BlockVolumeDriverVersion}
+		controllerDriverConfig := &driver.ControllerDriverConfig{CsiEndpoint: csioptions.Endpoint, CsiKubeConfig: csioptions.Kubeconfig, CsiMaster: csioptions.Master, EnableControllerServer: true, DriverName: driver.BlockVolumeDriverName, DriverVersion: driver.BlockVolumeDriverVersion, ClusterIpFamily: clusterIpFamily}
 		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}
+		controllerDriverConfig := &driver.ControllerDriverConfig{CsiEndpoint: csioptions.FssEndpoint, CsiKubeConfig: csioptions.Kubeconfig, CsiMaster: csioptions.Master, EnableControllerServer: true, DriverName: driver.FSSDriverName, DriverVersion: driver.FSSDriverVersion, ClusterIpFamily: clusterIpFamily}
 		drv, err = driver.NewControllerDriver(logger, *controllerDriverConfig)
 	}
 	if err != nil {

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

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

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

@@ -37,6 +37,10 @@ func main() {
 	flag.StringVar(&nodecsioptions.Kubeconfig, "kubeconfig", "", "cluster kubeconfig")
 	flag.StringVar(&nodecsioptions.FssEndpoint, "fss-endpoint", "unix://tmp/fss/csi.sock", "FSS CSI endpoint")
 	flag.BoolVar(&nodecsioptions.EnableFssDriver, "fss-csi-driver-enabled", true, "Handle flag to enable FSS CSI driver")
+	flag.StringVar(&nodecsioptions.LustreEndpoint, "lustre-endpoint", "unix:///var/lib/kubelet/plugins/lustre.csi.oraclecloud.com/csi.sock", "Lustre CSI endpoint")
+	flag.StringVar(&nodecsioptions.LustreCsiAddress, "lustre-csi-address", "/var/lib/kubelet/plugins/lustre.csi.oraclecloud.com/csi.sock", "Path of the Lustre CSI driver socket that the node-driver-registrar will connect to.")
+	flag.StringVar(&nodecsioptions.LustreKubeletRegistrationPath, "lustre-kubelet-registration-path", "/var/lib/kubelet/plugins/lustre.csi.oraclecloud.com/csi.sock", "Path of the Lustre CSI driver socket on the Kubernetes host machine.")
+	flag.BoolVar(&nodecsioptions.OnlyEnableLustreDriver, "only-lustre-csi-driver-enabled", false, "Handle flag to enable Lustre CSI driver")
 
 	klog.InitFlags(nil)
 	flag.Set("logtostderr", "true")
@@ -65,10 +69,26 @@ func main() {
 		EnableControllerServer: false,
 	}
 
+	lustreNodeOptions := nodedriveroptions.NodeOptions{
+		Name:                   "Lustre",
+		Endpoint:               nodecsioptions.LustreEndpoint,
+		NodeID:                 nodecsioptions.NodeID,
+		Kubeconfig:             nodecsioptions.Kubeconfig,
+		Master:                 nodecsioptions.Master,
+		DriverName:             driver.LustreDriverName,
+		DriverVersion:          driver.LustreDriverVersion,
+		EnableControllerServer: false,
+	}
+
 	stopCh := signals.SetupSignalHandler()
-	go nodedriver.RunNodeDriver(blockvolumeNodeOptions, stopCh)
-	if nodecsioptions.EnableFssDriver {
-		go nodedriver.RunNodeDriver(fssNodeOptions, stopCh)
+
+	if nodecsioptions.OnlyEnableLustreDriver {
+		go nodedriver.RunNodeDriver(lustreNodeOptions, stopCh)
+	} else {
+		go nodedriver.RunNodeDriver(blockvolumeNodeOptions, stopCh)
+		if nodecsioptions.EnableFssDriver {
+			go nodedriver.RunNodeDriver(fssNodeOptions, stopCh)
+		}
 	}
 	<-stopCh
 }

cmd/oci-csi-node-driver/nodedriveroptions/nodecsioptions.go

@@ -24,6 +24,10 @@ type NodeCSIOptions struct {
 
 	EnableFssDriver            bool
 	FssEndpoint                string
+	OnlyEnableLustreDriver        bool
+	LustreCsiAddress              string
+	LustreKubeletRegistrationPath string
+	LustreEndpoint                string
 }
 
 type NodeOptions struct {