From 5c083110c80fb8135e6bba1a7320d230e41332d3 Mon Sep 17 00:00:00 2001 From: Michael Mattsson Date: Thu, 28 Jan 2021 17:40:50 -0800 Subject: [PATCH 1/2] HPE CSI Driver for Kubernetes Helm v3 Chart 1.4.2 Signed-off-by: Michael Mattsson --- packages/hpe-csi-driver/hpe-csi-driver.patch | 22 +++++++++++++++----- packages/hpe-csi-driver/package.yaml | 5 +---- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/packages/hpe-csi-driver/hpe-csi-driver.patch b/packages/hpe-csi-driver/hpe-csi-driver.patch index c647597b6..1f6f23081 100644 --- a/packages/hpe-csi-driver/hpe-csi-driver.patch +++ b/packages/hpe-csi-driver/hpe-csi-driver.patch @@ -1,17 +1,29 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/hpe-csi-driver/charts-original/Chart.yaml packages/hpe-csi-driver/charts/Chart.yaml --- packages/hpe-csi-driver/charts-original/Chart.yaml +++ packages/hpe-csi-driver/charts/Chart.yaml -@@ -17,3 +17,6 @@ - - CentOS - - Ubuntu - - RHEL +@@ -7,9 +7,6 @@ + - HPE + - Storage + - StorageClass +-- CentOS +-- Ubuntu +-- RHEL + maintainers: + - email: hpe-containers-dev@hpe.com + name: raunakkumar +@@ -17,3 +14,6 @@ + sources: + - https://scod.hpedev.io/csi_driver + version: 1.4.2 +annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/release-name: hpe-csi-driver diff -x '*.tgz' -x '*.lock' -uNr packages/hpe-csi-driver/charts-original/questions.yml packages/hpe-csi-driver/charts/questions.yml --- packages/hpe-csi-driver/charts-original/questions.yml +++ packages/hpe-csi-driver/charts/questions.yml -@@ -1,5 +1,3 @@ +@@ -1,7 +1,3 @@ +-labels: +- io.rancher.certified: partner -categories: -- storage questions: diff --git a/packages/hpe-csi-driver/package.yaml b/packages/hpe-csi-driver/package.yaml index f59d36cae..0217dd9d7 100644 --- a/packages/hpe-csi-driver/package.yaml +++ b/packages/hpe-csi-driver/package.yaml @@ -1,5 +1,2 @@ -url: https://github.com/hpe-storage/co-deployments/ -subdirectory: helm/charts/hpe-csi-driver -type: git -commit: 74f929a2e097b62565037c68cdfdda3a697b01fc +url: https://hpe-storage.github.io/co-deployments/hpe-csi-driver-1.4.2.tgz packageVersion: 00 From ccbb606da2790cb15479c30e688d6adbb9d058d1 Mon Sep 17 00:00:00 2001 From: Michael Mattsson Date: Mon, 8 Feb 2021 14:01:37 -0800 Subject: [PATCH 2/2] Registry parameter fix Signed-off-by: Michael Mattsson --- packages/hpe-csi-driver/hpe-csi-driver.patch | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/packages/hpe-csi-driver/hpe-csi-driver.patch b/packages/hpe-csi-driver/hpe-csi-driver.patch index 1f6f23081..a222934cd 100644 --- a/packages/hpe-csi-driver/hpe-csi-driver.patch +++ b/packages/hpe-csi-driver/hpe-csi-driver.patch @@ -21,11 +21,24 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/hpe-csi-driver/charts-original/Chart.y diff -x '*.tgz' -x '*.lock' -uNr packages/hpe-csi-driver/charts-original/questions.yml packages/hpe-csi-driver/charts/questions.yml --- packages/hpe-csi-driver/charts-original/questions.yml +++ packages/hpe-csi-driver/charts/questions.yml -@@ -1,7 +1,3 @@ --labels: -- io.rancher.certified: partner +@@ -1,7 +1,5 @@ + labels: + io.rancher.certified: partner -categories: -- storage questions: - variable: imagePullPolicy label: "ImagePullPolicy" +@@ -31,9 +29,9 @@ + required: false + description: "Specify password for iSCSI CHAP authentication" + group: "HPE iSCSI settings" +-- variable: registryPrefix +- label: "registry" ++- variable: registry ++ label: "Registry" + type: string + default: "quay.io" +- description: "Specify registry prefix for CSI driver images" ++ description: "Specify registry prefix (hostname[:port]) for CSI driver images" + group: "HPE CSI Driver settings"