From 0a526bc22358197d5516c2a1370514d4053d9477 Mon Sep 17 00:00:00 2001 From: Michael Mattsson Date: Fri, 5 Aug 2022 09:52:05 -0700 Subject: [PATCH] rancher-c1 Signed-off-by: Michael Mattsson --- .../generated-changes/overlay/questions.yml | 60 +++++++++---------- .../generated-changes/patch/Chart.yaml.patch | 45 +++++--------- packages/hpe-csi-driver/package.yaml | 4 +- 3 files changed, 48 insertions(+), 61 deletions(-) diff --git a/packages/hpe-csi-driver/generated-changes/overlay/questions.yml b/packages/hpe-csi-driver/generated-changes/overlay/questions.yml index 3c5cd2a8c..fa860cfdc 100644 --- a/packages/hpe-csi-driver/generated-changes/overlay/questions.yml +++ b/packages/hpe-csi-driver/generated-changes/overlay/questions.yml @@ -1,6 +1,18 @@ labels: io.rancher.certified: partner questions: +- variable: disableNodeConformance + label: "Disable automatic installation of iSCSI/Multipath Packages" + type: boolean + default: false + description: "Disable automatic installation of iSCSI/Multipath Packages" + group: "HPE CSI Driver settings" +- variable: disableNodeGetVolumeStats + label: "Disable NoteGetVolumeStats" + type: boolean + default: false + description: "Disable NodeGetVolumeStats call to CSI driver" + group: "HPE CSI Driver settings" - variable: imagePullPolicy label: "ImagePullPolicy" default: "IfNotPresent" @@ -11,12 +23,6 @@ questions: - "Never" description: "ImagePullPolicy for all CSI driver images" group: "HPE CSI Driver settings" -- variable: disableNodeConformance - label: "Disable automatic installation of iSCSI/Multipath Packages" - type: boolean - default: false - description: "Disable automatic installation of iSCSI/Multipath Packages" - group: "HPE CSI Driver settings" - variable: iscsi.chapUser label: "iSCSI CHAP Username" type: string @@ -31,12 +37,30 @@ questions: required: false description: "Specify password for iSCSI CHAP authentication" group: "HPE iSCSI settings" +- variable: logLevel + label: "Set log level" + default: "info" + type: enum + options: + - "info" + - "debug" + - "trace" + - "warn" + - "error" + description: "Sets the CSI driver and sidecar log level" + group: "HPE CSI Driver settings" - variable: registry label: "Registry" type: string default: "quay.io" description: "Specify registry prefix (hostname[:port]) for CSI driver images" group: "HPE CSI Driver settings" +- variable: kubeletRootDir + label: "Set kubeletRootDir" + type: string + default: "/var/lib/kubelet" + description: "The kubelet root directory path" + group: "HPE CSI Driver settings" - variable: disable.nimble label: "Disable Nimble" type: boolean @@ -61,27 +85,3 @@ questions: default: false description: "Disable HPE Alletra 9000 CSP Service" group: "Disable Container Storage Providers" -- variable: disableNodeGetVolumeStats - label: "Disable NoteGetVolumeStats" - type: boolean - default: false - description: "Disable NodeGetVolumeStats call to CSI driver" - group: "HPE CSI Driver settings" -- variable: kubeletRootDir - label: "Set kubeletRootDir" - type: string - default: "/var/lib/kubelet" - description: "The kubelet root directory path" - group: "HPE CSI Driver settings" -- variable: logLevel - label: "Set log level" - default: "info" - type: enum - options: - - "info" - - "debug" - - "trace" - - "warn" - - "error" - description: "Sets the CSI driver and sidecar log level" - group: "HPE CSI Driver settings" diff --git a/packages/hpe-csi-driver/generated-changes/patch/Chart.yaml.patch b/packages/hpe-csi-driver/generated-changes/patch/Chart.yaml.patch index f0d2c05da..231a81227 100644 --- a/packages/hpe-csi-driver/generated-changes/patch/Chart.yaml.patch +++ b/packages/hpe-csi-driver/generated-changes/patch/Chart.yaml.patch @@ -1,42 +1,29 @@ --- charts-original/Chart.yaml +++ charts/Chart.yaml -@@ -1,23 +1,27 @@ -+apiVersion: v1 -+version: "2.1.1" -+appVersion: "2.1.1" - annotations: -+ artifacthub.io/prerelease: "false" - artifacthub.io/license: Apache-2.0 - artifacthub.io/links: | +@@ -4,6 +4,12 @@ - name: Documentation url: https://scod.hpedev.io/csi_driver -- artifacthub.io/prerelease: "false" --apiVersion: v1 --appVersion: 2.1.1 + artifacthub.io/prerelease: "false" + catalog.cattle.io/certified: partner -+ catalog.cattle.io/release-name: hpe-csi-driver + catalog.cattle.io/display-name: HPE CSI Driver for Kubernetes ++ catalog.cattle.io/release-name: hpe-csi-driver ++ catalog.cattle.io/namespace: hpe-storage ++ catalog.cattle.io/os: linux ++description: A Helm chart for installing the HPE CSI Driver for Kubernetes + apiVersion: v1 + appVersion: 2.2.0 description: A Helm chart for installing the HPE CSI Driver for Kubernetes --home: https://hpe.com/storage/containers - icon: https://raw.githubusercontent.com/hpe-storage/co-deployments/master/docs/assets/hpedev.png --keywords: --- HPE --- Storage --- CSI +@@ -14,10 +20,11 @@ + - Storage + - CSI maintainers: -- email: hpe-containers-dev@hpe.com - name: raunakkumar --name: hpe-csi-driver -+- name: datamattsson -+ email: datamattsson@hpe.com ++- email: datamattsson@hpe.com ++ name: datamattsson + name: hpe-csi-driver sources: - https://github.com/hpe-storage/co-deployments - https://github.com/hpe-storage/csi-driver --version: 2.1.1-0 -+name: hpe-csi-driver -+home: https://hpe.com/storage/containers -+keywords: -+ - HPE -+ - Storage -+ - CSI -+kubeVersion: "1.21 - 1.23" + version: 2.2.0 ++kubeVersion: 1.21 - 1.24 diff --git a/packages/hpe-csi-driver/package.yaml b/packages/hpe-csi-driver/package.yaml index d271db07c..f8a0a7434 100644 --- a/packages/hpe-csi-driver/package.yaml +++ b/packages/hpe-csi-driver/package.yaml @@ -1,2 +1,2 @@ -url: https://hpe-storage.github.io/co-deployments/hpe-csi-driver-2.1.1-0.tgz -version: "2.1.1" +url: https://hpe-storage.github.io/co-deployments/hpe-csi-driver-2.2.0.tgz +version: "2.2.0"