From 65a7a7798a2871a6a92fda23fa18efe49f802b22 Mon Sep 17 00:00:00 2001 From: Rishabh Raj <120644626+rishabhatdell@users.noreply.github.com> Date: Wed, 20 Mar 2024 21:40:39 +0530 Subject: [PATCH] Conflict fix (#387) * 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: 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: HarishH-DELL <109663924+HarishH-DELL@users.noreply.github.com> --- charts/container-storage-modules/Chart.yaml | 2 +- charts/csm-application-mobility/Chart.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/container-storage-modules/Chart.yaml b/charts/container-storage-modules/Chart.yaml index 6ae89ad9..8bcc82f1 100644 --- a/charts/container-storage-modules/Chart.yaml +++ b/charts/container-storage-modules/Chart.yaml @@ -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/csm-application-mobility/Chart.yaml b/charts/csm-application-mobility/Chart.yaml index f1f62677..8f66427d 100644 --- a/charts/csm-application-mobility/Chart.yaml +++ b/charts/csm-application-mobility/Chart.yaml @@ -22,4 +22,4 @@ dependencies: - name: velero version: 2.29.8 repository: https://vmware-tanzu.github.io/helm-charts - condition: velero.enabled + condition: velero.enabled \ No newline at end of file