From de383b1991320b5809e46c594986976fd2fa586a Mon Sep 17 00:00:00 2001 From: HarishH-DELL <109663924+HarishH-DELL@users.noreply.github.com> Date: Wed, 20 Mar 2024 21:05:05 +0530 Subject: [PATCH] Conflict fix verified (#388) (#389) * Conflict fix verified (#388) * Release v1.9.1 (#364) * Disable leader-election for drivers and version bump up for csm 1.9.1 patch release (#354) * Update cosi image in chart (#359) * revert kube node name changes (#361) * Removing csm changes (#363) --------- Co-authored-by: Akshay Saini <109056238+AkshaySainiDell@users.noreply.github.com> Co-authored-by: Bartosz Ciesielczyk <120648697+cbartoszDell@users.noreply.github.com> Co-authored-by: KshitijaKakde <111420075+KshitijaKakde@users.noreply.github.com> * Update Chart.yaml (#365) * update helm releaser (#366) * update csm chart for v2.9.1 (#369) * Release v1.9.3 (#376) * CSM 1.9.3 * csm version bump (#375) * Update Chart.yaml (#379) --------- Co-authored-by: Rishabh Raj <120644626+rishabhatdell@users.noreply.github.com> Co-authored-by: Jooseppi Luna * Update Chart.yaml with new versions (#380) * added env for kube node name (#347) * Driver and Modules Version Update (#348) * Updating helm charts to support k8s 1.29.0 (#358) * Disabling leader election for v1.10.0 (#360) * [feature-1091]: Expose proxy-server via cluster node IP and use local storage for Redis by default (#353) * expose proxy-server by ip address of master node * fix spacing * use local pv for redis by default * remove period * recycle pv * update authorization.hostname comment * Bumping reverseproxy version (#371) * COSI driver verion bump up (#370) * CSI-Sidecars version bumpup (#372) * CSI-Sidecars version bumpup * Snapshotter patch version update * Mapping /opt/emc inside SDC container (#373) * Mapping /opt/emc inside SDC container * Updating path type * app mobility version bump (#374) * change default value (#381) * version bumps (#378) * Updated CSI Metadata Version (#382) * app mobility version fix * Update app mobility Chart --------- Co-authored-by: KerryKovacevic <140824885+KerryKovacevic@users.noreply.github.com> Co-authored-by: Akshay Saini <109056238+AkshaySainiDell@users.noreply.github.com> Co-authored-by: Bartosz Ciesielczyk <120648697+cbartoszDell@users.noreply.github.com> Co-authored-by: KshitijaKakde <111420075+KshitijaKakde@users.noreply.github.com> Co-authored-by: Aaron Tye Co-authored-by: Adarsh Kumar Yadav <109620911+adarsh-dell@users.noreply.github.com> Co-authored-by: Rishabh Raj <120644626+rishabhatdell@users.noreply.github.com> Co-authored-by: Jooseppi Luna Co-authored-by: Surya Gupta <109594002+suryagupta4@users.noreply.github.com> Co-authored-by: hoppea2 <33433874+hoppea2@users.noreply.github.com> Co-authored-by: boyamurthy <92081029+boyamurthy@users.noreply.github.com> Co-authored-by: Rishabh Raj * AM version reverted --------- Co-authored-by: KerryKovacevic <140824885+KerryKovacevic@users.noreply.github.com> Co-authored-by: Akshay Saini <109056238+AkshaySainiDell@users.noreply.github.com> Co-authored-by: Bartosz Ciesielczyk <120648697+cbartoszDell@users.noreply.github.com> Co-authored-by: KshitijaKakde <111420075+KshitijaKakde@users.noreply.github.com> Co-authored-by: Aaron Tye Co-authored-by: Adarsh Kumar Yadav <109620911+adarsh-dell@users.noreply.github.com> Co-authored-by: Rishabh Raj <120644626+rishabhatdell@users.noreply.github.com> Co-authored-by: Jooseppi Luna Co-authored-by: Surya Gupta <109594002+suryagupta4@users.noreply.github.com> Co-authored-by: hoppea2 <33433874+hoppea2@users.noreply.github.com> Co-authored-by: boyamurthy <92081029+boyamurthy@users.noreply.github.com> Co-authored-by: Rishabh Raj --- .github/workflows/charts-release-action.yml | 4 ++-- charts/container-storage-modules/Chart.yaml | 6 +++--- charts/cosi/Chart.yaml | 1 + charts/csi-vxflexos/templates/node.yaml | 2 ++ charts/csm-application-mobility/Chart.yaml | 4 ++-- charts/csm-application-mobility/values.yaml | 4 ++-- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/charts-release-action.yml b/.github/workflows/charts-release-action.yml index 8b15cf02..ef234767 100644 --- a/.github/workflows/charts-release-action.yml +++ b/.github/workflows/charts-release-action.yml @@ -25,9 +25,9 @@ jobs: # Run the helm chart release command - name: Run karavi chart-releaser - uses: helm/chart-releaser-action@v1.0.0 + uses: helm/chart-releaser-action@v1.6.0 env: CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - CR_SKIP_EXISTING: "true" with: charts_dir: charts + skip_existing: true diff --git a/charts/container-storage-modules/Chart.yaml b/charts/container-storage-modules/Chart.yaml index 55b0c46a..57781703 100644 --- a/charts/container-storage-modules/Chart.yaml +++ b/charts/container-storage-modules/Chart.yaml @@ -30,13 +30,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.2.0 +version: 1.2.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.2.0" +appVersion: "1.2.2" dependencies: - name: csi-powerstore @@ -77,4 +77,4 @@ dependencies: - name: cert-manager version: 1.10.0 repository: https://charts.jetstack.io - condition: cert-manager.enabled \ No newline at end of file + condition: cert-manager.enabled diff --git a/charts/cosi/Chart.yaml b/charts/cosi/Chart.yaml index 8b95ddad..1c417668 100644 --- a/charts/cosi/Chart.yaml +++ b/charts/cosi/Chart.yaml @@ -29,6 +29,7 @@ type: application # Versions are expected to follow Semantic Versioning (https://semver.org/) version: 0.1.2 + # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. diff --git a/charts/csi-vxflexos/templates/node.yaml b/charts/csi-vxflexos/templates/node.yaml index 8083e8fd..85446bc2 100644 --- a/charts/csi-vxflexos/templates/node.yaml +++ b/charts/csi-vxflexos/templates/node.yaml @@ -334,6 +334,8 @@ spec: mountPath: /host_opt_emc_path - name: sdc-storage mountPath: /storage + - name: host-opt-emc-path + mountPath: /host_opt_emc_path - name: udev-d mountPath: /rules.d - name: scaleio-path-opt diff --git a/charts/csm-application-mobility/Chart.yaml b/charts/csm-application-mobility/Chart.yaml index 96dca441..f1f62677 100644 --- a/charts/csm-application-mobility/Chart.yaml +++ b/charts/csm-application-mobility/Chart.yaml @@ -6,13 +6,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.4.0 +version: 0.3.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.4.0" +appVersion: "0.3.0" dependencies: - name: cert-manager diff --git a/charts/csm-application-mobility/values.yaml b/charts/csm-application-mobility/values.yaml index f981fb3f..456c5853 100644 --- a/charts/csm-application-mobility/values.yaml +++ b/charts/csm-application-mobility/values.yaml @@ -8,7 +8,7 @@ image: pullPolicy: IfNotPresent controller: - image: dellemc/csm-application-mobility-controller:v0.4.0 + image: dellemc/csm-application-mobility-controller:v0.3.0 # csm-application-mobility requires cert-manager. If cert-manager is not already present in cluster, set enabled to true to install it too. cert-manager: @@ -70,7 +70,7 @@ velero: initContainers: - name: dell-custom-velero-plugin - image: dellemc/csm-application-mobility-velero-plugin:v0.4.0 + image: dellemc/csm-application-mobility-velero-plugin:v0.3.0 volumeMounts: - mountPath: /target name: plugins