Skip to content

Commit

Permalink
feat(chart): add value to customize kubeletDir
Browse files Browse the repository at this point in the history
Add location of the /var/lib/kubelet directory as some k8s distribution differ from the standard.

Signed-off-by: Serge Logvinov <[email protected]>
  • Loading branch information
sergelogvinov committed Jan 1, 2024
1 parent 4eae22d commit bbb627f
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 28 deletions.
2 changes: 1 addition & 1 deletion charts/proxmox-csi-plugin/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ maintainers:
# 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.1.13
version: 0.1.14
# 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.
Expand Down
3 changes: 2 additions & 1 deletion charts/proxmox-csi-plugin/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# proxmox-csi-plugin

![Version: 0.1.12](https://img.shields.io/badge/Version-0.1.12-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.4.0](https://img.shields.io/badge/AppVersion-v0.4.0-informational?style=flat-square)
![Version: 0.1.14](https://img.shields.io/badge/Version-0.1.14-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.4.0](https://img.shields.io/badge/AppVersion-v0.4.0-informational?style=flat-square)

A CSI plugin for Proxmox

Expand Down Expand Up @@ -97,6 +97,7 @@ helm upgrade -i --namespace=csi-proxmox -f proxmox-csi.yaml \
| node.plugin.resources | object | `{}` | Node CSI Driver resource requests and limits. ref: https://kubernetes.io/docs/user-guide/compute-resources/ |
| node.driverRegistrar.image | object | `{"pullPolicy":"IfNotPresent","repository":"registry.k8s.io/sig-storage/csi-node-driver-registrar","tag":"v2.9.0"}` | Node CSI driver registrar. |
| node.driverRegistrar.resources | object | `{"requests":{"cpu":"10m","memory":"16Mi"}}` | Node registrar resource requests and limits. ref: https://kubernetes.io/docs/user-guide/compute-resources/ |
| node.kubeletDir | string | `"/var/lib/kubelet"` | Location of the /var/lib/kubelet directory as some k8s distribution differ from the standard. |
| node.nodeSelector | object | `{}` | Node labels for node-plugin assignment. ref: https://kubernetes.io/docs/user-guide/node-selection/ |
| node.tolerations | list | `[{"effect":"NoSchedule","key":"node.kubernetes.io/unschedulable","operator":"Exists"},{"effect":"NoSchedule","key":"node.kubernetes.io/disk-pressure","operator":"Exists"}]` | Tolerations for node-plugin assignment. ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ |
| livenessprobe.image | object | `{"pullPolicy":"IfNotPresent","repository":"registry.k8s.io/sig-storage/livenessprobe","tag":"v2.11.0"}` | Common livenessprobe sidecar. |
Expand Down
10 changes: 5 additions & 5 deletions charts/proxmox-csi-plugin/templates/node-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ spec:
- name: socket
mountPath: /csi
- name: kubelet
mountPath: /var/lib/kubelet
mountPath: {{ .Values.node.kubeletDir }}
mountPropagation: Bidirectional
- name: dev
mountPath: /dev
Expand All @@ -79,7 +79,7 @@ spec:
args:
- "-v={{ .Values.logVerbosityLevel }}"
- "--csi-address=unix:///csi/csi.sock"
- "--kubelet-registration-path=/var/lib/kubelet/plugins/{{ .Values.provisionerName }}/csi.sock"
- "--kubelet-registration-path={{ .Values.node.kubeletDir }}/plugins/{{ .Values.provisionerName }}/csi.sock"
volumeMounts:
- name: socket
mountPath: /csi
Expand Down Expand Up @@ -107,15 +107,15 @@ spec:
volumes:
- name: socket
hostPath:
path: /var/lib/kubelet/plugins/{{ .Values.provisionerName }}/
path: {{ .Values.node.kubeletDir }}/plugins/{{ .Values.provisionerName }}/
type: DirectoryOrCreate
- name: registration
hostPath:
path: /var/lib/kubelet/plugins_registry/
path: {{ .Values.node.kubeletDir }}/plugins_registry/
type: Directory
- name: kubelet
hostPath:
path: /var/lib/kubelet
path: {{ .Values.node.kubeletDir }}
type: Directory
- name: dev
hostPath:
Expand Down
3 changes: 3 additions & 0 deletions charts/proxmox-csi-plugin/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,9 @@ node:
cpu: 10m
memory: 16Mi

# -- Location of the /var/lib/kubelet directory as some k8s distribution differ from the standard.
kubeletDir: /var/lib/kubelet

# -- Node labels for node-plugin assignment.
# ref: https://kubernetes.io/docs/user-guide/node-selection/
nodeSelector: {}
Expand Down
14 changes: 7 additions & 7 deletions docs/deploy/proxmox-csi-plugin-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ metadata:
name: proxmox-csi-plugin-controller
namespace: csi-proxmox
labels:
helm.sh/chart: proxmox-csi-plugin-0.1.12
helm.sh/chart: proxmox-csi-plugin-0.1.14
app.kubernetes.io/name: proxmox-csi-plugin
app.kubernetes.io/instance: proxmox-csi-plugin
app.kubernetes.io/version: "v0.4.0"
Expand All @@ -29,7 +29,7 @@ metadata:
name: proxmox-csi-plugin-node
namespace: csi-proxmox
labels:
helm.sh/chart: proxmox-csi-plugin-0.1.12
helm.sh/chart: proxmox-csi-plugin-0.1.14
app.kubernetes.io/name: proxmox-csi-plugin
app.kubernetes.io/instance: proxmox-csi-plugin
app.kubernetes.io/version: "v0.4.0"
Expand All @@ -42,7 +42,7 @@ metadata:
name: proxmox-csi-plugin-controller
namespace: csi-proxmox
labels:
helm.sh/chart: proxmox-csi-plugin-0.1.12
helm.sh/chart: proxmox-csi-plugin-0.1.14
app.kubernetes.io/name: proxmox-csi-plugin
app.kubernetes.io/instance: proxmox-csi-plugin
app.kubernetes.io/version: "v0.4.0"
Expand Down Expand Up @@ -85,7 +85,7 @@ metadata:
name: proxmox-csi-plugin-node
namespace: csi-proxmox
labels:
helm.sh/chart: proxmox-csi-plugin-0.1.12
helm.sh/chart: proxmox-csi-plugin-0.1.14
app.kubernetes.io/name: proxmox-csi-plugin
app.kubernetes.io/instance: proxmox-csi-plugin
app.kubernetes.io/version: "v0.4.0"
Expand Down Expand Up @@ -133,7 +133,7 @@ metadata:
name: proxmox-csi-plugin-controller
namespace: csi-proxmox
labels:
helm.sh/chart: proxmox-csi-plugin-0.1.12
helm.sh/chart: proxmox-csi-plugin-0.1.14
app.kubernetes.io/name: proxmox-csi-plugin
app.kubernetes.io/instance: proxmox-csi-plugin
app.kubernetes.io/version: "v0.4.0"
Expand Down Expand Up @@ -175,7 +175,7 @@ metadata:
name: proxmox-csi-plugin-node
namespace: csi-proxmox
labels:
helm.sh/chart: proxmox-csi-plugin-0.1.12
helm.sh/chart: proxmox-csi-plugin-0.1.14
app.kubernetes.io/name: proxmox-csi-plugin
app.kubernetes.io/instance: proxmox-csi-plugin
app.kubernetes.io/version: "v0.4.0"
Expand Down Expand Up @@ -318,7 +318,7 @@ metadata:
name: proxmox-csi-plugin-controller
namespace: csi-proxmox
labels:
helm.sh/chart: proxmox-csi-plugin-0.1.12
helm.sh/chart: proxmox-csi-plugin-0.1.14
app.kubernetes.io/name: proxmox-csi-plugin
app.kubernetes.io/instance: proxmox-csi-plugin
app.kubernetes.io/version: "v0.4.0"
Expand Down
14 changes: 7 additions & 7 deletions docs/deploy/proxmox-csi-plugin-talos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ metadata:
name: proxmox-csi-plugin-controller
namespace: csi-proxmox
labels:
helm.sh/chart: proxmox-csi-plugin-0.1.12
helm.sh/chart: proxmox-csi-plugin-0.1.14
app.kubernetes.io/name: proxmox-csi-plugin
app.kubernetes.io/instance: proxmox-csi-plugin
app.kubernetes.io/version: "v0.4.0"
Expand All @@ -29,7 +29,7 @@ metadata:
name: proxmox-csi-plugin-node
namespace: csi-proxmox
labels:
helm.sh/chart: proxmox-csi-plugin-0.1.12
helm.sh/chart: proxmox-csi-plugin-0.1.14
app.kubernetes.io/name: proxmox-csi-plugin
app.kubernetes.io/instance: proxmox-csi-plugin
app.kubernetes.io/version: "v0.4.0"
Expand Down Expand Up @@ -68,7 +68,7 @@ metadata:
name: proxmox-csi-plugin-controller
namespace: csi-proxmox
labels:
helm.sh/chart: proxmox-csi-plugin-0.1.12
helm.sh/chart: proxmox-csi-plugin-0.1.14
app.kubernetes.io/name: proxmox-csi-plugin
app.kubernetes.io/instance: proxmox-csi-plugin
app.kubernetes.io/version: "v0.4.0"
Expand Down Expand Up @@ -111,7 +111,7 @@ metadata:
name: proxmox-csi-plugin-node
namespace: csi-proxmox
labels:
helm.sh/chart: proxmox-csi-plugin-0.1.12
helm.sh/chart: proxmox-csi-plugin-0.1.14
app.kubernetes.io/name: proxmox-csi-plugin
app.kubernetes.io/instance: proxmox-csi-plugin
app.kubernetes.io/version: "v0.4.0"
Expand Down Expand Up @@ -159,7 +159,7 @@ metadata:
name: proxmox-csi-plugin-controller
namespace: csi-proxmox
labels:
helm.sh/chart: proxmox-csi-plugin-0.1.12
helm.sh/chart: proxmox-csi-plugin-0.1.14
app.kubernetes.io/name: proxmox-csi-plugin
app.kubernetes.io/instance: proxmox-csi-plugin
app.kubernetes.io/version: "v0.4.0"
Expand Down Expand Up @@ -201,7 +201,7 @@ metadata:
name: proxmox-csi-plugin-node
namespace: csi-proxmox
labels:
helm.sh/chart: proxmox-csi-plugin-0.1.12
helm.sh/chart: proxmox-csi-plugin-0.1.14
app.kubernetes.io/name: proxmox-csi-plugin
app.kubernetes.io/instance: proxmox-csi-plugin
app.kubernetes.io/version: "v0.4.0"
Expand Down Expand Up @@ -341,7 +341,7 @@ metadata:
name: proxmox-csi-plugin-controller
namespace: csi-proxmox
labels:
helm.sh/chart: proxmox-csi-plugin-0.1.12
helm.sh/chart: proxmox-csi-plugin-0.1.14
app.kubernetes.io/name: proxmox-csi-plugin
app.kubernetes.io/instance: proxmox-csi-plugin
app.kubernetes.io/version: "v0.4.0"
Expand Down
14 changes: 7 additions & 7 deletions docs/deploy/proxmox-csi-plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ metadata:
name: proxmox-csi-plugin-controller
namespace: csi-proxmox
labels:
helm.sh/chart: proxmox-csi-plugin-0.1.12
helm.sh/chart: proxmox-csi-plugin-0.1.14
app.kubernetes.io/name: proxmox-csi-plugin
app.kubernetes.io/instance: proxmox-csi-plugin
app.kubernetes.io/version: "v0.4.0"
Expand All @@ -29,7 +29,7 @@ metadata:
name: proxmox-csi-plugin-node
namespace: csi-proxmox
labels:
helm.sh/chart: proxmox-csi-plugin-0.1.12
helm.sh/chart: proxmox-csi-plugin-0.1.14
app.kubernetes.io/name: proxmox-csi-plugin
app.kubernetes.io/instance: proxmox-csi-plugin
app.kubernetes.io/version: "v0.4.0"
Expand Down Expand Up @@ -69,7 +69,7 @@ metadata:
name: proxmox-csi-plugin-controller
namespace: csi-proxmox
labels:
helm.sh/chart: proxmox-csi-plugin-0.1.12
helm.sh/chart: proxmox-csi-plugin-0.1.14
app.kubernetes.io/name: proxmox-csi-plugin
app.kubernetes.io/instance: proxmox-csi-plugin
app.kubernetes.io/version: "v0.4.0"
Expand Down Expand Up @@ -112,7 +112,7 @@ metadata:
name: proxmox-csi-plugin-node
namespace: csi-proxmox
labels:
helm.sh/chart: proxmox-csi-plugin-0.1.12
helm.sh/chart: proxmox-csi-plugin-0.1.14
app.kubernetes.io/name: proxmox-csi-plugin
app.kubernetes.io/instance: proxmox-csi-plugin
app.kubernetes.io/version: "v0.4.0"
Expand Down Expand Up @@ -160,7 +160,7 @@ metadata:
name: proxmox-csi-plugin-controller
namespace: csi-proxmox
labels:
helm.sh/chart: proxmox-csi-plugin-0.1.12
helm.sh/chart: proxmox-csi-plugin-0.1.14
app.kubernetes.io/name: proxmox-csi-plugin
app.kubernetes.io/instance: proxmox-csi-plugin
app.kubernetes.io/version: "v0.4.0"
Expand Down Expand Up @@ -202,7 +202,7 @@ metadata:
name: proxmox-csi-plugin-node
namespace: csi-proxmox
labels:
helm.sh/chart: proxmox-csi-plugin-0.1.12
helm.sh/chart: proxmox-csi-plugin-0.1.14
app.kubernetes.io/name: proxmox-csi-plugin
app.kubernetes.io/instance: proxmox-csi-plugin
app.kubernetes.io/version: "v0.4.0"
Expand Down Expand Up @@ -345,7 +345,7 @@ metadata:
name: proxmox-csi-plugin-controller
namespace: csi-proxmox
labels:
helm.sh/chart: proxmox-csi-plugin-0.1.12
helm.sh/chart: proxmox-csi-plugin-0.1.14
app.kubernetes.io/name: proxmox-csi-plugin
app.kubernetes.io/instance: proxmox-csi-plugin
app.kubernetes.io/version: "v0.4.0"
Expand Down

0 comments on commit bbb627f

Please sign in to comment.