Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CSIUnity v2.8.0 release #248

Merged
merged 2 commits into from
Aug 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/container-storage-modules/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ dependencies:
condition: csi-vxflexos.enabled

- name: csi-unity
version: 2.7.0
version: 2.8.0
repository: https://dell.github.io/helm-charts
condition: csi-unity.enabled

Expand Down
7 changes: 6 additions & 1 deletion charts/container-storage-modules/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ csi-vxflexos:
########################
csi-unity:
enabled: false
version: "v2.7.0"
version: "v2.8.0"

# certSecretCount: Represents number of certificate secrets, which user is going to create for
# ssl authentication. (unity-cert-0..unity-cert-n)
Expand Down Expand Up @@ -436,6 +436,11 @@ csi-unity:
# tenantName - Tenant name that need to added while adding host entry to the array.
tenantName: ""

# Storage Capacity Tracking
# Note: Capacity tracking is supported in kubernetes v1.24 and above, this feature will be automatically disabled in older versions.
storageCapacity:
enabled: true

images:
driverRepository: dellemc

Expand Down
6 changes: 3 additions & 3 deletions charts/csi-unity/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
appVersion: 2.7.0
appVersion: 2.8.0
name: csi-unity
version: 2.7.0
version: 2.8.0
description: |
Unity XT CSI (Container Storage Interface) driver Kubernetes
integration. This chart includes everything required to provision via CSI as
Expand All @@ -17,4 +17,4 @@ keywords:
sources:
- https://github.com/dell/csi-unity
maintainers:
- name: DellEMC
- name: DellEMC
11 changes: 11 additions & 0 deletions charts/csi-unity/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,14 @@ Return the appropriate sidecar images based on k8s version
{{- end -}}
{{- end -}}
{{- end -}}

{{/*
Return true if storage capacity tracking is enabled and is supported based on k8s version
*/}}
{{- define "csi-unity.isStorageCapacitySupported" -}}
{{- if eq .Values.storageCapacity.enabled true -}}
{{- if and (eq .Capabilities.KubeVersion.Major "1") (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") -}}
{{- true -}}
{{- end -}}
{{- end -}}
{{- end -}}
23 changes: 23 additions & 0 deletions charts/csi-unity/templates/controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,18 @@ rules:
- apiGroups: [""]
resources: ["persistentvolumeclaims/status"]
verbs: ["update", "patch"]
# Permissions for CSIStorageCapacity
{{- if eq (include "csi-unity.isStorageCapacitySupported" .) "true" }}
- apiGroups: ["storage.k8s.io"]
resources: ["csistoragecapacities"]
verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
- apiGroups: [""]
resources: ["pods"]
verbs: ["get"]
- apiGroups: ["apps"]
resources: ["replicasets"]
verbs: ["get"]
{{- end }}
---
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
Expand Down Expand Up @@ -188,9 +200,20 @@ spec:
- "--leader-election"
- "--leader-election-namespace={{ .Release.Namespace }}"
- "--default-fstype={{ .Values.defaultFsType | default "ext4" }}"
- "--enable-capacity={{ (include "csi-unity.isStorageCapacitySupported" .) | default false }}"
- "--capacity-ownerref-level=2"
- "--capacity-poll-interval={{ .Values.storageCapacity.pollInterval | default "5m" }}"
env:
- name: ADDRESS
value: /var/run/csi/csi.sock
- name: NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
volumeMounts:
- name: socket-dir
mountPath: /var/run/csi
Expand Down
3 changes: 2 additions & 1 deletion charts/csi-unity/templates/csidriver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ kind: CSIDriver
metadata:
name: csi-unity.dellemc.com
spec:
storageCapacity: {{ (include "csi-unity.isStorageCapacitySupported" .) | default false }}
attachRequired: true
podInfoOnMount: true
volumeLifecycleModes:
- Persistent
- Ephemeral
fsGroupPolicy: {{ .Values.fsGroupPolicy }}
fsGroupPolicy: {{ .Values.fsGroupPolicy }}
18 changes: 16 additions & 2 deletions charts/csi-unity/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

# version: version of this values file
# Note: Do not change this value
# Examples : "v2.7.0" , "nightly"
version: "v2.7.0"
# Examples : "v2.8.0" , "nightly"
version: "v2.8.0"

# LogLevel is used to set the logging level of the driver.
# Allowed values: "error", "warn"/"warning", "info", "debug"
Expand Down Expand Up @@ -242,6 +242,20 @@ maxUnityVolumesPerNode: 0
# Examples : "tenant2" , "tenant3"
tenantName: ""

# Storage Capacity Tracking
# Note: Capacity tracking is supported in kubernetes v1.24 and above, this feature will be automatically disabled in older versions.
storageCapacity:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add this parameter in container-storage-modules/values,yaml as well and make the necessary changes in the Installation Wizard

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Taken care

# enabled : Enable/Disable storage capacity tracking
# Allowed values:
# true: enable storage capacity tracking
# false: disable storage capacity tracking
# Default value: true
enabled: true
# pollInterval : Configure how often external-provisioner polls the driver to detect changed capacity
# Allowed values: 1m,2m,3m,...,10m,...,60m etc
# Default value: 5m
pollInterval: 5m

images:
# "driver" defines the container image, used for the driver container.
driverRepository: dellemc
Loading