From dccd40a81912cbbf722d06f3e49b9586c84aa294 Mon Sep 17 00:00:00 2001 From: kk3 Date: Tue, 7 Dec 2021 11:34:18 +0530 Subject: [PATCH 1/3] add --- core/semver/semver.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/semver/semver.go b/core/semver/semver.go index 98878dc..0a6ad4f 100644 --- a/core/semver/semver.go +++ b/core/semver/semver.go @@ -118,9 +118,9 @@ func main() { Notes: m[4], Type: buildType, Build: toInt(buildNumber), - Sha7: m[6], + Sha7: m[7], Sha32: chkErr(doExec("git", "log", "-n1", `--format=%H`)), - Dirty: m[7] != "", + Dirty: m[8] != "", Epoch: toInt64(chkErr(doExec("git", "log", "-n1", `--format=%ct`))), } ver.SemVer = ver.String() From ccc226de24ac42420c7497e4e0e027942d33736c Mon Sep 17 00:00:00 2001 From: kk3 Date: Tue, 7 Dec 2021 17:57:48 +0530 Subject: [PATCH 2/3] version_change to 2.2.0 --- Dockerfile.podman | 2 +- dell-csi-helm-installer/csi-install.sh | 2 +- dell-csi-helm-installer/verify-csi-unity.sh | 2 +- helm/csi-unity/Chart.yaml | 4 ++-- helm/csi-unity/driver-image.yaml | 2 +- helm/csi-unity/values.yaml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile.podman b/Dockerfile.podman index a5f23b7..db545e6 100644 --- a/Dockerfile.podman +++ b/Dockerfile.podman @@ -47,6 +47,6 @@ LABEL vendor="Dell Inc." \ name="csi-unity" \ summary="CSI Driver for Dell EMC Unity" \ description="CSI Driver for provisioning persistent storage from Dell EMC Unity" \ - version="2.1.0" \ + version="2.2.0" \ license="Apache-2.0" COPY csi-unity/licenses /licenses diff --git a/dell-csi-helm-installer/csi-install.sh b/dell-csi-helm-installer/csi-install.sh index 18ceec5..3717c44 100755 --- a/dell-csi-helm-installer/csi-install.sh +++ b/dell-csi-helm-installer/csi-install.sh @@ -15,7 +15,7 @@ PROG="${0}" NODE_VERIFY=1 VERIFY=1 MODE="install" -DEFAULT_DRIVER_VERSION="2.1.0" +DEFAULT_DRIVER_VERSION="2.2.0" WATCHLIST="" # export the name of the debug log, so child processes will see it diff --git a/dell-csi-helm-installer/verify-csi-unity.sh b/dell-csi-helm-installer/verify-csi-unity.sh index d1a3048..4007830 100644 --- a/dell-csi-helm-installer/verify-csi-unity.sh +++ b/dell-csi-helm-installer/verify-csi-unity.sh @@ -19,7 +19,7 @@ function verify-csi-unity() { verify_unity_protocol_installation verify_snap_requirements verify_helm_3 - verify_helm_values_version "2.1.0" + verify_helm_values_version "2.2.0" } diff --git a/helm/csi-unity/Chart.yaml b/helm/csi-unity/Chart.yaml index 6e9746f..9ec91c2 100644 --- a/helm/csi-unity/Chart.yaml +++ b/helm/csi-unity/Chart.yaml @@ -1,6 +1,6 @@ name: csi-unity -version: 2.1.0 -appVersion: 2.1.0 +version: 2.2.0 +appVersion: 2.2.0 description: | Unity CSI (Container Storage Interface) driver Kubernetes integration. This chart includes everything required to provision via CSI as diff --git a/helm/csi-unity/driver-image.yaml b/helm/csi-unity/driver-image.yaml index 0a9b2f7..5103bc8 100644 --- a/helm/csi-unity/driver-image.yaml +++ b/helm/csi-unity/driver-image.yaml @@ -1,4 +1,4 @@ # IT IS RECOMMENDED YOU DO NOT CHANGE THE IMAGES TO BE DOWNLOADED. images: # "images.driver" defines the container images used for the driver container. - driver: dellemc/csi-unity:v2.1.0 + driver: dellemc/csi-unity:v2.2.0 diff --git a/helm/csi-unity/values.yaml b/helm/csi-unity/values.yaml index 14ff840..e27ee6a 100644 --- a/helm/csi-unity/values.yaml +++ b/helm/csi-unity/values.yaml @@ -3,7 +3,7 @@ # version: version of this values file # Note: Do not change this value -version: "2.1.0" +version: "2.2.0" # LogLevel is used to set the logging level of the driver. # Allowed values: "error", "warn"/"warning", "info", "debug" From 996796295b98e51777d540be2117ce561017a4fd Mon Sep 17 00:00:00 2001 From: kk3 Date: Tue, 7 Dec 2021 18:00:41 +0530 Subject: [PATCH 3/3] self review --- core/semver/semver.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/semver/semver.go b/core/semver/semver.go index 0a6ad4f..98878dc 100644 --- a/core/semver/semver.go +++ b/core/semver/semver.go @@ -118,9 +118,9 @@ func main() { Notes: m[4], Type: buildType, Build: toInt(buildNumber), - Sha7: m[7], + Sha7: m[6], Sha32: chkErr(doExec("git", "log", "-n1", `--format=%H`)), - Dirty: m[8] != "", + Dirty: m[7] != "", Epoch: toInt64(chkErr(doExec("git", "log", "-n1", `--format=%ct`))), } ver.SemVer = ver.String()