Skip to content

Commit 68525ec

Browse files
l-technicorel-technicore
authored
Merge pull request #485 from l-technicore/oke-oss-release-v1.29.1
OKE OSS Release v1.29.1
2 parents fca4492 + 471771c commit 68525ec

File tree

526 files changed

+35929
-5736
lines changed

Some content is hidden

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

526 files changed

+35929
-5736
lines changed

‎.github/workflows/makefile.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,21 @@ jobs:
1212
- name: Set up Go 1.x
1313
uses: actions/setup-go@v2
1414
with:
15-
go-version: '1.20'
15+
go-version: '1.21'
1616
id: go
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ WORKDIR $SRC
2727

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

30-
FROM oraclelinux:8-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/
@@ -45,4 +45,4 @@ RUN chmod 755 /sbin/encrypt-umount
4545
RUN chmod 755 /sbin/rpm-host
4646
RUN chmod 755 /sbin/chroot-bash
4747

48-
COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/dist/* /usr/local/bin/
48+
COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/dist/* /usr/local/bin/

‎Dockerfile_arm_all

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ WORKDIR $SRC
1414

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

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

1919
RUN microdnf -y install util-linux e2fsprogs xfsprogs python2 && \
2020
microdnf update && \
@@ -29,4 +29,4 @@ RUN chmod 755 /sbin/encrypt-umount
2929
RUN chmod 755 /sbin/rpm-host
3030
RUN chmod 755 /sbin/chroot-bash
3131

32-
COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/dist/arm/* /usr/local/bin/
32+
COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/dist/arm/* /usr/local/bin/

‎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.29.0
41+
RELEASE = v1.29.1
4242

4343
GOOS ?= linux
4444
ARCH ?= amd64

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ cloud-provider specific code out of the Kubernetes codebase.
3333
| v1.25.2 | v1.25 | - |
3434
| v1.26.4 | v1.26 | - |
3535
| v1.27.3 | v1.27 | - |
36-
| v1.28.1 | v1.28 | - |
37-
| v1.29.0 | v1.29 | - |
38-
36+
| v1.28.2 | v1.28 | - |
37+
| v1.29.1 | v1.29 | - |
38+
| v1.30.0 | v1.30 | - |
3939

4040

4141
Note:
42-
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.
4343

4444
## Implementation
4545
Currently `oci-cloud-controller-manager` implements:

‎THIRD_PARTY_LICENSES.txt

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

11801180
== Copyright
11811181
Copyright (c) 2013-2014 Onsi Fakhouri
1182-
Copyright (c) 2014 Amit Kumar Gupta
11831182

11841183
--------------------------------- (separator) ----------------------------------
11851184

@@ -1312,16 +1311,12 @@ END OF TERMS AND CONDITIONS
13121311

13131312

13141313
== Copyright
1315-
Copyright (c) 2012-2020 Mat Ryer, Tyler Bunnell and contributors.
1316-
Copyright (c) 2013 The Go Authors. All rights reserved.
13171314
Copyright (c) 2016, 2018, 2020, Oracle and/or its affiliates.
13181315
Copyright (c) 2016, 2018, 2020, Oracle and/or its affiliates. All rights reserved.
13191316
Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates. All rights reserved.
13201317
Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
13211318
Copyright (c) 2016, 2023 Oracle and/or its affiliates.
13221319
Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
1323-
Copyright © 2012-2020 Mat Ryer, Tyler Bunnell and contributors.
1324-
Copyright © 2013 The Go Authors. All rights reserved.
13251320

13261321
== Notices
13271322
Copyright (c) 2016, 2018, 2020, Oracle and/or its affiliates.
@@ -2027,7 +2022,6 @@ go.uber.org/zap
20272022
SPDX:MIT
20282023

20292024
== Copyright
2030-
Copyright (c) "*" Uber Technologies, Inc.")
20312025
Copyright (c) 2016 Uber Technologies, Inc.
20322026
Copyright (c) 2016, 2017 Uber Technologies, Inc.
20332027
Copyright (c) 2016-2017 Uber Technologies, Inc.
@@ -2170,6 +2164,7 @@ Copyright 2020 The Go Authors. All rights reserved.
21702164
Copyright 2021 The Go Authors. All rights reserved.
21712165
Copyright 2022 The Go Authors. All rights reserved.
21722166
Copyright 2023 The Go Authors. All rights reserved.
2167+
Copyright 2024 The Go Authors. All rights reserved.
21732168

21742169
== Patents
21752170
Additional IP Rights Grant (Patents)
@@ -3067,6 +3062,7 @@ Copyright 2020 The Kubernetes Authors.
30673062
Copyright 2021 The Kubernetes Authors.
30683063
Copyright 2022 The Kubernetes Authors.
30693064
Copyright 2023 The Kubernetes Authors.
3065+
Copyright 2024 The Kubernetes Authors.
30703066

30713067
--------------------------------- (separator) ----------------------------------
30723068

@@ -4324,5 +4320,5 @@ the Mozilla Public License, v. 2.0.
43244320

43254321

43264322
=== ATTRIBUTION-HELPER-GENERATED:
4327-
=== 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}
4328-
=== License file based on go.mod with md5 sum: 5ba4389f9d7406b21218d714f3f79d86
4323+
=== 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}
4324+
=== License file based on go.mod with md5 sum: ea9bd465882b674ff1025b18349e102f

‎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
@@ -29,7 +29,7 @@ const (
2929
VolumeAttributesClass = "VolumeAttributesClass"
3030
)
3131

32-
//CSIOptions structure which contains flag values
32+
// CSIOptions structure which contains flag values
3333
type CSIOptions struct {
3434
Master string
3535
Kubeconfig string
@@ -63,7 +63,7 @@ type CSIOptions struct {
6363

6464
}
6565

66-
//NewCSIOptions initializes the flag
66+
// NewCSIOptions initializes the flag
6767
func NewCSIOptions() *CSIOptions {
6868
csioptions := CSIOptions{
6969
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)