Update for helm charts rbd-3.12.3

ceph · Nov 25, 2024 · dcb9030 · dcb9030
1 parent dc3a896
commit dcb9030
Show file tree

Hide file tree

Showing 8 changed files with 160 additions and 250 deletions.
diff --git a/docs/index.yaml b/docs/index.yaml
diff --git a/docs/rbd/ceph-csi-rbd-3.12.3.tgz b/docs/rbd/ceph-csi-rbd-3.12.3.tgz
diff --git a/docs/rbd/ceph-csi-rbd/Chart.yaml b/docs/rbd/ceph-csi-rbd/Chart.yaml
@@ -1,15 +1,15 @@
 ---
 apiVersion: v1
-appVersion: canary
+appVersion: 3.12.3
 description: "Container Storage Interface (CSI) driver,
 provisioner, snapshotter, resizer and attacher for Ceph RBD"
 name: ceph-csi-rbd
-version: 3-canary
+version: 3.12.3
 keywords:
   - ceph
   - rbd
   - ceph-csi
 home: https://github.com/ceph/ceph-csi
 sources:
-  - https://github.com/ceph/ceph-csi/tree/devel/charts/ceph-csi-rbd
-icon: https://raw.githubusercontent.com/ceph/ceph-csi/devel/assets/ceph-logo.png
+  - https://github.com/ceph/ceph-csi/tree/v3.12.3/charts/ceph-csi-rbd
+icon: https://raw.githubusercontent.com/ceph/ceph-csi/v3.12.3/assets/ceph-logo.png
diff --git a/docs/rbd/ceph-csi-rbd/README.md b/docs/rbd/ceph-csi-rbd/README.md
diff --git a/docs/rbd/ceph-csi-rbd/templates/NOTES.txt b/docs/rbd/ceph-csi-rbd/templates/NOTES.txt
@@ -1,2 +1,2 @@
 Examples on how to configure a storage class and start using the driver are here:
-https://github.com/ceph/ceph-csi/tree/devel/examples/rbd
+https://github.com/ceph/ceph-csi/tree/v3.12.3/examples/rbd
diff --git a/docs/rbd/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml b/docs/rbd/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml
@@ -10,10 +10,6 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
     {{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }}
-{{- if .Values.nodeplugin.annotations }}
-  annotations:
-    {{- toYaml .Values.nodeplugin.annotations | nindent 4 -}}
-{{- end }}
 spec:
   selector:
     matchLabels:
@@ -31,10 +27,6 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         {{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 8 }}{{- end }}
-    {{- if .Values.nodeplugin.podAnnotations }}
-      annotations:
-        {{- toYaml .Values.nodeplugin.podAnnotations | nindent 8 -}}
-    {{- end }}
     spec:
       securityContext: {{ toYaml .Values.nodeplugin.podSecurityContext | nindent 8 }}
       serviceAccountName: {{ include "ceph-csi-rbd.serviceAccountName.nodeplugin" . }}
@@ -78,7 +70,6 @@ spec:
 {{- if and .Values.readAffinity .Values.readAffinity.enabled }}
             - "--crush-location-labels={{ .Values.readAffinity.crushLocationLabels | join "," }}"
 {{- end }}
-            - "--logslowopinterval={{ .Values.logSlowOperationInterval }}"
           env:
             - name: POD_IP
               valueFrom:

diff --git a/docs/rbd/ceph-csi-rbd/templates/provisioner-deployment.yaml b/docs/rbd/ceph-csi-rbd/templates/provisioner-deployment.yaml
@@ -10,10 +10,6 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
     {{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }}
-{{- if .Values.provisioner.annotations }}
-  annotations:
-    {{- toYaml .Values.provisioner.annotations | nindent 4 -}}
-{{- end }}
 spec:
   replicas: {{ .Values.provisioner.replicaCount }}
   strategy:
@@ -36,10 +32,6 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         {{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 8 }}{{- end }}
-    {{- if .Values.provisioner.podAnnotations }}
-      annotations:
-        {{- toYaml .Values.provisioner.podAnnotations | nindent 8 -}}
-    {{- end }}
     spec:
 {{- if gt (int .Values.provisioner.replicaCount) 1 }}
       affinity:
@@ -105,7 +97,6 @@ spec:
             - "--clustername={{ .Values.provisioner.clustername }}"
             {{- end }}
             - "--setmetadata={{ .Values.provisioner.setmetadata }}"
-            - "--logslowopinterval={{ .Values.logSlowOperationInterval }}"
           env:
             - name: POD_IP
               valueFrom:
@@ -158,25 +149,12 @@ spec:
             - "--feature-gates=HonorPVReclaimPolicy=true"
             - "--prevent-volume-mode-conversion=true"
             - "--immediate-topology=false"
-{{- if and .Values.provisioner.provisioner.args .Values.provisioner.provisioner.args.httpEndpointPort }}
-            - "--http-endpoint=$(POD_IP):{{ .Values.provisioner.provisioner.args.httpEndpointPort }}"
-{{- end }}
 {{- range .Values.provisioner.provisioner.extraArgs }}
             - "--{{ . }}"
 {{- end }}
           env:
             - name: ADDRESS
               value: "unix:///csi/{{ .Values.provisionerSocketFile }}"
-{{- if and .Values.provisioner.provisioner.args .Values.provisioner.provisioner.args.httpEndpointPort }}
-            - name: POD_IP
-              valueFrom:
-                fieldRef:
-                  fieldPath: status.podIP
-          ports:
-            - containerPort: {{ .Values.provisioner.provisioner.args.httpEndpointPort }}
-              name: http-endpoint
-              protocol: TCP
-{{- end }}
           volumeMounts:
             - name: socket-dir
               mountPath: /csi
@@ -194,25 +172,12 @@ spec:
             - "--retry-interval-start=500ms"
             - "--handle-volume-inuse-error=false"
             - "--feature-gates=RecoverVolumeExpansionFailure=true"
-{{- if and .Values.provisioner.resizer.args .Values.provisioner.resizer.args.httpEndpointPort }}
-            - "--http-endpoint=$(POD_IP):{{ .Values.provisioner.resizer.args.httpEndpointPort }}"
-{{- end }}
 {{- range .Values.provisioner.resizer.extraArgs }}
             - "--{{ . }}"
 {{- end }}
           env:
             - name: ADDRESS
               value: "unix:///csi/{{ .Values.provisionerSocketFile }}"
-{{- if and .Values.provisioner.resizer.args .Values.provisioner.resizer.args.httpEndpointPort }}
-            - name: POD_IP
-              valueFrom:
-                fieldRef:
-                  fieldPath: status.podIP
-          ports:
-            - containerPort: {{ .Values.provisioner.resizer.args.httpEndpointPort }}
-              name: http-endpoint
-              protocol: TCP
-{{- end }}
           volumeMounts:
             - name: socket-dir
               mountPath: /csi
@@ -229,25 +194,12 @@ spec:
             - "--leader-election=true"
             - "--extra-create-metadata=true"
             - "--enable-volume-group-snapshots={{.Values.provisioner.snapshotter.args.enableVolumeGroupSnapshots }}"
-{{- if and .Values.provisioner.snapshotter.args .Values.provisioner.snapshotter.args.httpEndpointPort }}
-            - "--http-endpoint=$(POD_IP):{{ .Values.provisioner.snapshotter.args.httpEndpointPort }}"
-{{- end }}
 {{- range .Values.provisioner.snapshotter.extraArgs }}
             - "--{{ . }}"
 {{- end }}
           env:
             - name: ADDRESS
               value: "unix:///csi/{{ .Values.provisionerSocketFile }}"
-{{- if and .Values.provisioner.snapshotter.args .Values.provisioner.snapshotter.args.httpEndpointPort }}
-            - name: POD_IP
-              valueFrom:
-                fieldRef:
-                  fieldPath: status.podIP
-          ports:
-            - containerPort: {{ .Values.provisioner.snapshotter.args.httpEndpointPort }}
-              name: http-endpoint
-              protocol: TCP
-{{- end }}
           volumeMounts:
             - name: socket-dir
               mountPath: /csi
@@ -263,25 +215,12 @@ spec:
             - "--leader-election=true"
             - "--retry-interval-start=500ms"
             - "--default-fstype=ext4"
-{{- if and .Values.provisioner.attacher.args .Values.provisioner.attacher.args.httpEndpointPort }}
-            - "--http-endpoint=$(POD_IP):{{ .Values.provisioner.attacher.args.httpEndpointPort }}"
-{{- end }}
 {{- range .Values.provisioner.attacher.extraArgs }}
             - "--{{ . }}"
 {{- end }}
           env:
             - name: ADDRESS
               value: "unix:///csi/{{ .Values.provisionerSocketFile }}"
-{{- if and .Values.provisioner.attacher.args .Values.provisioner.attacher.args.httpEndpointPort }}
-            - name: POD_IP
-              valueFrom:
-                fieldRef:
-                  fieldPath: status.podIP
-          ports:
-            - containerPort: {{ .Values.provisioner.attacher.args.httpEndpointPort }}
-              name: http-endpoint
-              protocol: TCP
-{{- end }}
           volumeMounts:
             - name: socket-dir
               mountPath: /csi

diff --git a/docs/rbd/ceph-csi-rbd/values.yaml b/docs/rbd/ceph-csi-rbd/values.yaml
@@ -46,7 +46,7 @@ csiConfig: []
 csiMapping: []
 
 # Configuration for the encryption KMS
-# Ref: https://github.com/ceph/ceph-csi/blob/devel/docs/rbd/deploy.md
+# Ref: https://github.com/ceph/ceph-csi/blob/devel/docs/deploy-rbd.md
 # Example:
 # encryptionKMSConfig:
 #   vault-unique-id-1:
@@ -69,9 +69,6 @@ commonLabels: {}
 logLevel: 5
 # sidecarLogLevel is the variable for Kubernetes sidecar container's log level
 sidecarLogLevel: 1
-# Log slow operations at the specified rate.
-# Operation is considered slow if it outlives its deadline.
-logSlowOperationInterval: 30s
 
 # Set fsGroupPolicy for CSI Driver object spec
 # https://kubernetes-csi.github.io/docs/support-fsgroup.html
@@ -149,7 +146,7 @@ nodeplugin:
   plugin:
     image:
       repository: quay.io/cephcsi/cephcsi
-      tag: canary
+      tag: v3.12.3
       pullPolicy: IfNotPresent
     resources: {}
 
@@ -159,12 +156,8 @@ nodeplugin:
 
   affinity: {}
 
-  annotations: {}
-
   podSecurityContext: {}
 
-  podAnnotations: {}
-
 provisioner:
   name: provisioner
   replicaCount: 3
@@ -253,11 +246,6 @@ provisioner:
       tag: v5.0.1
       pullPolicy: IfNotPresent
     resources: {}
-    args:
-    #   # httpEndpointPort specifies the http server port for
-    #   # diagnostics, health checks and metrics.
-    #   # Uncomment below line to enable the `http-endpoint` arg for sidecar
-    #   httpEndpointPort: 8090
     ## For further options, check
     ## https://github.com/kubernetes-csi/external-provisioner#command-line-options
     extraArgs: []
@@ -273,11 +261,6 @@ provisioner:
       tag: v4.6.1
       pullPolicy: IfNotPresent
     resources: {}
-    args:
-    #   # httpEndpointPort specifies the http server port for
-    #   # diagnostics, health checks and metrics.
-    #   # Uncomment below line to enable the `http-endpoint` arg for sidecar
-    #   httpEndpointPort: 8093
     ## For further options, check
     ## https://github.com/kubernetes-csi/external-attacher#command-line-options
     extraArgs: []
@@ -290,11 +273,6 @@ provisioner:
       tag: v1.11.1
       pullPolicy: IfNotPresent
     resources: {}
-    args:
-    #   # httpEndpointPort specifies the http server port for
-    #   # diagnostics, health checks and metrics.
-    #   # Uncomment below line to enable the `http-endpoint` arg for sidecar
-    #   httpEndpointPort: 8091
     ## For further options, check
     ## https://github.com/kubernetes-csi/external-resizer#recommended-optional-arguments
     extraArgs: []
@@ -305,29 +283,22 @@ provisioner:
       tag: v8.0.1
       pullPolicy: IfNotPresent
     resources: {}
-    args:
-      # enableVolumeGroupSnapshots enables support for volume group snapshots
-      enableVolumeGroupSnapshots: false
-      # httpEndpointPort specifies the http server port for
-      # diagnostics, health checks and metrics.
-      # Uncomment below line to enable the `http-endpoint` arg for sidecar
-      # httpEndpointPort: 8092
     ## For further options, check
     ## https://github.com/kubernetes-csi/external-snapshotter#csi-external-snapshotter-sidecar-command-line-options
     extraArgs: []
 
+    args:
+      # enableVolumeGroupSnapshots enables support for volume group snapshots
+      enableVolumeGroupSnapshots: false
+
   nodeSelector: {}
 
   tolerations: []
 
   affinity: {}
 
-  annotations: {}
-
   podSecurityContext: {}
 
-  podAnnotations: {}
-
 topology:
   # domainLabels define which node labels to use as domains
   # for CSI nodeplugins to advertise their domains
@@ -415,7 +386,7 @@ storageClass:
   # By default host-path /var/log/ceph of node is bind-mounted into
   # csi-rbdplugin pod at /var/log/ceph mount path. This is to configure
   # target bindmount path used inside container for ceph clients logging.
-  # See docs/design/proposals/rbd-nbd.md for available configuration options.
+  # See docs/rbd-nbd.md for available configuration options.
   # cephLogDir: /var/log/ceph
   cephLogDir: ""