Skip to content

Commit b408ac4

Browse files
l-technicorel-technicore
authored
Merge pull request #484 from l-technicore/oke-oss-release-v1.28.2
OKE OSS Release v1.28.2
2 parents ba91d02 + cb51d64 commit b408ac4

File tree

596 files changed

+39853
-7270
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

596 files changed

+39853
-7270
lines changed

‎.github/workflows/makefile.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,16 @@ jobs:
1717

1818
- name: Check out code into the Go module directory
1919
uses: actions/checkout@v2
20-
20+
- name: Install dependencies
21+
run: |
22+
go mod download
2123
- name: Run Unit Tests
2224
run: |
2325
go test -covermode=count -coverprofile=profile.cov ./pkg/...
26+
- name: Install goveralls
27+
run: go install github.com/mattn/goveralls@latest
2428
- name: Send coverage
2529
env:
2630
COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2731
run: |
28-
GO111MODULE=off go get github.com/mattn/goveralls
29-
$(go env GOPATH)/bin/goveralls -coverprofile=profile.cov -service=github
32+
goveralls -coverprofile=profile.cov -service=github

‎.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${GITHUB_ACTOR,,} --password-stdin
2727

2828
- name: Build Image
29-
run: OSS_REGISTRY="ghcr.io/oracle" VERSION="${{ github.ref_name }}" make image
29+
run: OSS_REGISTRY="ghcr.io/${GITHUB_REPOSITORY_OWNER,,}" VERSION="${{ github.ref_name }}" make image
3030

3131
- name: Push Image
32-
run: OSS_REGISTRY="ghcr.io/oracle" VERSION="${{ github.ref_name }}" make docker-push-all
32+
run: OSS_REGISTRY="ghcr.io/${GITHUB_REPOSITORY_OWNER,,}" VERSION="${{ github.ref_name }}" make docker-push-all

‎Dockerfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,14 @@ WORKDIR $SRC
2727

2828
RUN COMPONENT=${COMPONENT} make clean build
2929

30-
FROM oraclelinux:7-slim
30+
FROM ghcr.io/oracle/oraclelinux:8-slim-fips
3131

3232
COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/dist/* /usr/local/bin/
3333
COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/image/* /usr/local/bin/
3434

35-
RUN yum install -y util-linux \
36-
&& yum install -y e2fsprogs \
37-
&& yum install -y xfsprogs \
38-
&& yum clean all
35+
RUN microdnf -y install util-linux e2fsprogs xfsprogs python2 && \
36+
microdnf update && \
37+
microdnf clean all
3938

4039
COPY scripts/encrypt-mount /sbin/encrypt-mount
4140
COPY scripts/encrypt-umount /sbin/encrypt-umount

‎Dockerfile_arm_all

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@ WORKDIR $SRC
1414

1515
RUN ARCH=arm make clean build-arm-all
1616

17-
FROM arm64v8/oraclelinux:7-slim
17+
FROM ghcr.io/oracle/oraclelinux:8-slim-fips-arm64v8
1818

19-
RUN yum install -y util-linux \
20-
&& yum install -y e2fsprogs \
21-
&& yum clean all
22-
\
19+
RUN microdnf -y install util-linux e2fsprogs xfsprogs python2 && \
20+
microdnf update && \
21+
microdnf clean all
2322

2423
COPY scripts/encrypt-mount /sbin/encrypt-mount
2524
COPY scripts/encrypt-umount /sbin/encrypt-umount

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ else
3838
VERSION ?= ${VERSION}
3939
endif
4040

41-
RELEASE = v1.28.1
41+
RELEASE = v1.28.2
4242

4343
GOOS ?= linux
4444
ARCH ?= amd64

‎README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,15 @@ cloud-provider specific code out of the Kubernetes codebase.
3131
| v1.23.0 | v1.23 | - |
3232
| v1.24.2 | v1.24 | - |
3333
| v1.25.2 | v1.25 | - |
34-
| v1.26.3 | v1.26 | - |
35-
| v1.27.2 | v1.27 | - |
36-
| v1.28.0 | v1.28 | - |
37-
34+
| v1.26.4 | v1.26 | - |
35+
| v1.27.3 | v1.27 | - |
36+
| v1.28.2 | v1.28 | - |
37+
| v1.29.1 | v1.29 | - |
38+
| v1.30.0 | v1.30 | - |
3839

3940

4041
Note:
41-
Versions older than v1.27.3 are no longer supported, new features / bug fixes will be available in v1.27.3 and later.
42+
Versions older than v1.28.2 are no longer supported, new features / bug fixes will be available in v1.28.2 and later.
4243

4344
## Implementation
4445
Currently `oci-cloud-controller-manager` implements:

‎THIRD_PARTY_LICENSES.txt

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1130,7 +1130,6 @@ SPDX:MIT
11301130

11311131
== Copyright
11321132
Copyright (c) 2013-2014 Onsi Fakhouri
1133-
Copyright (c) 2014 Amit Kumar Gupta
11341133

11351134
--------------------------------- (separator) ----------------------------------
11361135

@@ -1263,16 +1262,12 @@ END OF TERMS AND CONDITIONS
12631262

12641263

12651264
== Copyright
1266-
Copyright (c) 2012-2020 Mat Ryer, Tyler Bunnell and contributors.
1267-
Copyright (c) 2013 The Go Authors. All rights reserved.
12681265
Copyright (c) 2016, 2018, 2020, Oracle and/or its affiliates.
12691266
Copyright (c) 2016, 2018, 2020, Oracle and/or its affiliates. All rights reserved.
12701267
Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates. All rights reserved.
12711268
Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
12721269
Copyright (c) 2016, 2023 Oracle and/or its affiliates.
12731270
Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
1274-
Copyright © 2012-2020 Mat Ryer, Tyler Bunnell and contributors.
1275-
Copyright © 2013 The Go Authors. All rights reserved.
12761271

12771272
== Notices
12781273
Copyright (c) 2016, 2018, 2020, Oracle and/or its affiliates.
@@ -1978,7 +1973,6 @@ go.uber.org/zap
19781973
SPDX:MIT
19791974

19801975
== Copyright
1981-
Copyright (c) "*" Uber Technologies, Inc.")
19821976
Copyright (c) 2016 Uber Technologies, Inc.
19831977
Copyright (c) 2016, 2017 Uber Technologies, Inc.
19841978
Copyright (c) 2016-2017 Uber Technologies, Inc.
@@ -2120,6 +2114,7 @@ Copyright 2020 The Go Authors. All rights reserved.
21202114
Copyright 2021 The Go Authors. All rights reserved.
21212115
Copyright 2022 The Go Authors. All rights reserved.
21222116
Copyright 2023 The Go Authors. All rights reserved.
2117+
Copyright 2024 The Go Authors. All rights reserved.
21232118

21242119
== Patents
21252120
Additional IP Rights Grant (Patents)
@@ -3018,6 +3013,7 @@ Copyright 2020 The Kubernetes Authors.
30183013
Copyright 2021 The Kubernetes Authors.
30193014
Copyright 2022 The Kubernetes Authors.
30203015
Copyright 2023 The Kubernetes Authors.
3016+
Copyright 2024 The Kubernetes Authors.
30213017

30223018
--------------------------------- (separator) ----------------------------------
30233019

@@ -4007,5 +4003,5 @@ the Mozilla Public License, v. 2.0.
40074003

40084004

40094005
=== ATTRIBUTION-HELPER-GENERATED:
4010-
=== 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}
4011-
=== License file based on go.mod with md5 sum: f13d103ac6a1fd64d889146a5a1dbc24
4006+
=== 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}
4007+
=== License file based on go.mod with md5 sum: 002d30e85246feb4f9ea96ae4ad1d826

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
package csicontrollerdriver
1616

1717
import (
18+
"os"
19+
1820
"github.com/oracle/oci-cloud-controller-manager/cmd/oci-csi-controller-driver/csioptions"
1921
"github.com/oracle/oci-cloud-controller-manager/pkg/csi/driver"
2022
"github.com/oracle/oci-cloud-controller-manager/pkg/logging"
@@ -25,7 +27,7 @@ const (
2527
bvCsiDriver = "BV"
2628
)
2729

28-
//StartControllerDriver main function to start CSI Controller Driver
30+
// StartControllerDriver main function to start CSI Controller Driver
2931
func StartControllerDriver(csioptions csioptions.CSIOptions, csiDriver driver.CSIDriver) {
3032

3133
logger := logging.Logger().Sugar()
@@ -35,11 +37,16 @@ func StartControllerDriver(csioptions csioptions.CSIOptions, csiDriver driver.CS
3537
var drv *driver.Driver
3638
var err error
3739

40+
clusterIpFamily := os.Getenv("CLUSTER_IP_FAMILY")
41+
if clusterIpFamily != "" {
42+
logger.Infof("Using cluster ip family : %s", clusterIpFamily)
43+
}
44+
3845
if csiDriver == bvCsiDriver {
39-
controllerDriverConfig := &driver.ControllerDriverConfig{CsiEndpoint: csioptions.Endpoint, CsiKubeConfig: csioptions.Kubeconfig, CsiMaster: csioptions.Master, EnableControllerServer: true, DriverName: driver.BlockVolumeDriverName, DriverVersion: driver.BlockVolumeDriverVersion}
46+
controllerDriverConfig := &driver.ControllerDriverConfig{CsiEndpoint: csioptions.Endpoint, CsiKubeConfig: csioptions.Kubeconfig, CsiMaster: csioptions.Master, EnableControllerServer: true, DriverName: driver.BlockVolumeDriverName, DriverVersion: driver.BlockVolumeDriverVersion, ClusterIpFamily: clusterIpFamily}
4047
drv, err = driver.NewControllerDriver(logger, *controllerDriverConfig)
4148
} else {
42-
controllerDriverConfig := &driver.ControllerDriverConfig{CsiEndpoint: csioptions.FssEndpoint, CsiKubeConfig: csioptions.Kubeconfig, CsiMaster: csioptions.Master, EnableControllerServer: true, DriverName: driver.FSSDriverName, DriverVersion: driver.FSSDriverVersion}
49+
controllerDriverConfig := &driver.ControllerDriverConfig{CsiEndpoint: csioptions.FssEndpoint, CsiKubeConfig: csioptions.Kubeconfig, CsiMaster: csioptions.Master, EnableControllerServer: true, DriverName: driver.FSSDriverName, DriverVersion: driver.FSSDriverVersion, ClusterIpFamily: clusterIpFamily}
4350
drv, err = driver.NewControllerDriver(logger, *controllerDriverConfig)
4451
}
4552
if err != nil {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const (
2828
CrossNamespaceVolumeDataSource = "CrossNamespaceVolumeDataSource"
2929
)
3030

31-
//CSIOptions structure which contains flag values
31+
// CSIOptions structure which contains flag values
3232
type CSIOptions struct {
3333
Master string
3434
Kubeconfig string
@@ -59,7 +59,7 @@ type CSIOptions struct {
5959
EnableResizer bool
6060
}
6161

62-
//NewCSIOptions initializes the flag
62+
// NewCSIOptions initializes the flag
6363
func NewCSIOptions() *CSIOptions {
6464
csioptions := CSIOptions{
6565
Master: *flag.String("master", "", "kube master"),

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

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ func main() {
3737
flag.StringVar(&nodecsioptions.Kubeconfig, "kubeconfig", "", "cluster kubeconfig")
3838
flag.StringVar(&nodecsioptions.FssEndpoint, "fss-endpoint", "unix://tmp/fss/csi.sock", "FSS CSI endpoint")
3939
flag.BoolVar(&nodecsioptions.EnableFssDriver, "fss-csi-driver-enabled", true, "Handle flag to enable FSS CSI driver")
40+
flag.StringVar(&nodecsioptions.LustreEndpoint, "lustre-endpoint", "unix:///var/lib/kubelet/plugins/lustre.csi.oraclecloud.com/csi.sock", "Lustre CSI endpoint")
41+
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.")
42+
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.")
43+
flag.BoolVar(&nodecsioptions.OnlyEnableLustreDriver, "only-lustre-csi-driver-enabled", false, "Handle flag to enable Lustre CSI driver")
4044

4145
klog.InitFlags(nil)
4246
flag.Set("logtostderr", "true")
@@ -65,10 +69,26 @@ func main() {
6569
EnableControllerServer: false,
6670
}
6771

72+
lustreNodeOptions := nodedriveroptions.NodeOptions{
73+
Name: "Lustre",
74+
Endpoint: nodecsioptions.LustreEndpoint,
75+
NodeID: nodecsioptions.NodeID,
76+
Kubeconfig: nodecsioptions.Kubeconfig,
77+
Master: nodecsioptions.Master,
78+
DriverName: driver.LustreDriverName,
79+
DriverVersion: driver.LustreDriverVersion,
80+
EnableControllerServer: false,
81+
}
82+
6883
stopCh := signals.SetupSignalHandler()
69-
go nodedriver.RunNodeDriver(blockvolumeNodeOptions, stopCh)
70-
if nodecsioptions.EnableFssDriver {
71-
go nodedriver.RunNodeDriver(fssNodeOptions, stopCh)
84+
85+
if nodecsioptions.OnlyEnableLustreDriver {
86+
go nodedriver.RunNodeDriver(lustreNodeOptions, stopCh)
87+
} else {
88+
go nodedriver.RunNodeDriver(blockvolumeNodeOptions, stopCh)
89+
if nodecsioptions.EnableFssDriver {
90+
go nodedriver.RunNodeDriver(fssNodeOptions, stopCh)
91+
}
7292
}
7393
<-stopCh
7494
}

0 commit comments

Comments
 (0)