Skip to content

Commit f7bb94b

Browse files
Merge branch 'develop' into task/CSI-5277_separate_addons_code_from_controller_server
2 parents 651d221 + e71613b commit f7bb94b

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

Diff for: Dockerfile-csi-controller

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ RUN pip3 install .
3333
FROM registry.access.redhat.com/ubi8/python-38:1-115.1669838006
3434
MAINTAINER IBM Storage
3535

36-
ARG VERSION=1.11.0
36+
ARG VERSION=1.12.0
3737
ARG BUILD_NUMBER=0
3838

3939
###Required Labels

Diff for: Dockerfile-csi-host-definer

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN pip3 install .
1919

2020
FROM registry.access.redhat.com/ubi8/python-38:1-115.1669838006
2121

22-
ARG VERSION=1.11.0
22+
ARG VERSION=1.12.0
2323
ARG BUILD_NUMBER=0
2424

2525
###Required Labels

Diff for: Dockerfile-csi-node

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ RUN make ibm-block-csi-driver
3030
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1049
3131
MAINTAINER IBM Storage
3232

33-
ARG VERSION=1.11.0
33+
ARG VERSION=1.12.0
3434
ARG BUILD_NUMBER=0
3535

3636
LABEL name="IBM block storage CSI driver node" \

Diff for: common/config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
identity:
22
name: block.csi.ibm.com
3-
version: 1.11.0
3+
version: 1.12.0
44
capabilities:
55
Service: [ CONTROLLER_SERVICE, VOLUME_ACCESSIBILITY_CONSTRAINTS ]
66
VolumeExpansion: ONLINE

Diff for: node/pkg/driver/version_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func TestGetVersion(t *testing.T) {
4646
version, err := GetVersion(dir)
4747

4848
expected := VersionInfo{
49-
DriverVersion: "1.11.0",
49+
DriverVersion: "1.12.0",
5050
GitCommit: "",
5151
BuildDate: "",
5252
GoVersion: runtime.Version(),
@@ -76,7 +76,7 @@ func TestGetVersionJSON(t *testing.T) {
7676
}
7777

7878
expected := fmt.Sprintf(`{
79-
"driverVersion": "1.11.0",
79+
"driverVersion": "1.12.0",
8080
"gitCommit": "",
8181
"buildDate": "",
8282
"goVersion": "%s",

Diff for: scripts/ci/Jenkinsfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pipeline {
22
parameters {
3-
string(name: 'IMAGE_VERSION', defaultValue: "1.11.0")
3+
string(name: 'IMAGE_VERSION', defaultValue: "1.12.0")
44
string(name: 'DOCKER_REGISTRY', defaultValue: DEFAULT_DOCKER_REGISTRY)
55
string(name: 'EMAIL_TO', defaultValue: "")
66
}

0 commit comments

Comments
 (0)