feat(installer): update nfs, ceph-rbd chart files (#1841)

tkestack · Apr 15, 2022 · 0f38601 · 0f38601
1 parent 0e7a3b5
commit 0f38601
Show file tree

Hide file tree

Showing 11 changed files with 86 additions and 34 deletions.
diff --git a/...installer/app/installer/manifests/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml b/...installer/app/installer/manifests/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml
@@ -42,7 +42,11 @@ spec:
           # created by privileged CSI driver container.
           securityContext:
             privileged: true
-          image: "{{ .Values.nodeplugin.registrar.image.repository }}:{{ .Values.nodeplugin.registrar.image.tag }}"
+{{- if .Values.images.enable }}
+          image: "{{ .Values.images.nodeplugin.registrar }}"
+{{- else }}
+          image: "{{ .Values.nodeplugin.registrar.image.repository }}"
+{{- end }}
           imagePullPolicy: {{ .Values.nodeplugin.registrar.image.pullPolicy }}
           args:
             - "--v={{ .Values.logLevel }}"
@@ -61,7 +65,11 @@ spec:
           resources:
 {{ toYaml .Values.nodeplugin.registrar.resources | indent 12 }}
         - name: csi-rbdplugin
-          image: "{{ .Values.nodeplugin.plugin.image.repository }}:{{ .Values.nodeplugin.plugin.image.tag }}"
+{{- if .Values.images.enable }}
+          image: "{{ .Values.images.nodeplugin.plugin }}"
+{{- else }}
+          image: "{{ .Values.nodeplugin.plugin.image.repository }}"
+{{- end }}
           imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }}
           args:
             - "--nodeid=$(NODE_ID)"
@@ -142,7 +150,11 @@ spec:
         - name: liveness-prometheus
           securityContext:
             privileged: true
-          image: "{{ .Values.nodeplugin.plugin.image.repository }}:{{ .Values.nodeplugin.plugin.image.tag }}"
+  {{- if .Values.images.enable }}
+          image: "{{ .Values.images.nodeplugin.plugin }}"
+  {{- else }}
+          image: "{{ .Values.nodeplugin.plugin.image.repository }}"
+  {{- end }}
           imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }}
           args:
             - "--type=liveness"

diff --git a/...staller/app/installer/manifests/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml b/...staller/app/installer/manifests/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml
@@ -53,7 +53,11 @@ spec:
 {{- end }}
       containers:
         - name: csi-provisioner
-          image: "{{ .Values.provisioner.provisioner.image.repository }}:{{ .Values.provisioner.provisioner.image.tag }}"
+{{- if .Values.images.enable }}
+          image: "{{ .Values.images.provisioner.provisioner }}"
+{{- else }}
+          image: "{{ .Values.provisioner.provisioner.image.repository }}"
+{{- end }}
           imagePullPolicy: {{ .Values.provisioner.provisioner.image.pullPolicy }}
           args:
             - "--csi-address=$(ADDRESS)"
@@ -76,7 +80,11 @@ spec:
 {{ toYaml .Values.provisioner.provisioner.resources | indent 12 }}
 {{- if .Values.provisioner.resizer.enabled }}
         - name: csi-resizer
-          image: "{{ .Values.provisioner.resizer.image.repository }}:{{ .Values.provisioner.resizer.image.tag }}"
+  {{- if .Values.images.enable }}
+          image: "{{ .Values.images.provisioner.resizer }}"
+  {{- else }}
+          image: "{{ .Values.provisioner.resizer.image.repository }}"
+  {{- end }}
           imagePullPolicy: {{ .Values.provisioner.resizer.image.pullPolicy }}
           args:
             - "--v={{ .Values.logLevel }}"
@@ -95,7 +103,11 @@ spec:
 {{ toYaml .Values.provisioner.resizer.resources | indent 12 }}
 {{- end }}
         - name: csi-snapshotter
-          image: {{ .Values.provisioner.snapshotter.image.repository }}:{{ .Values.provisioner.snapshotter.image.tag }}
+{{- if .Values.images.enable }}
+          image: {{ .Values.images.provisioner.snapshotter }}
+{{- else }}
+          image: {{ .Values.provisioner.snapshotter.image.repository }}
+{{- end }}
           imagePullPolicy: {{ .Values.provisioner.snapshotter.image.pullPolicy }}
           args:
             - "--csi-address=$(ADDRESS)"
@@ -112,7 +124,11 @@ spec:
 {{ toYaml .Values.provisioner.snapshotter.resources | indent 12 }}
 {{- if .Values.provisioner.attacher.enabled }}
         - name: csi-attacher
-          image: "{{ .Values.provisioner.attacher.image.repository }}:{{ .Values.provisioner.attacher.image.tag }}"
+  {{- if .Values.images.enable }}
+          image: "{{ .Values.images.provisioner.attacher }}"
+  {{- else }}
+          image: "{{ .Values.provisioner.attacher.image.repository }}"
+  {{- end }}
           imagePullPolicy: {{ .Values.provisioner.attacher.image.pullPolicy }}
           args:
             - "--v={{ .Values.logLevel }}"
@@ -129,7 +145,11 @@ spec:
 {{ toYaml .Values.provisioner.attacher.resources | indent 12 }}
 {{- end }}
         - name: csi-rbdplugin
-          image: "{{ .Values.nodeplugin.plugin.image.repository }}:{{ .Values.nodeplugin.plugin.image.tag }}"
+{{- if .Values.images.enable }}
+          image: "{{ .Values.images.nodeplugin.plugin }}"
+{{- else }}
+          image: "{{ .Values.nodeplugin.plugin.image.repository }}"
+{{- end }}
           imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }}
           args:
             - "--nodeid=$(NODE_ID)"
@@ -190,7 +210,11 @@ spec:
 {{ toYaml .Values.nodeplugin.plugin.resources | indent 12 }}
 {{- if .Values.provisioner.deployController }}
         - name: csi-rbdplugin-controller
-          image: "{{ .Values.nodeplugin.plugin.image.repository }}:{{ .Values.nodeplugin.plugin.image.tag }}"
+  {{- if .Values.images.enable }}
+          image: "{{ .Values.images.nodeplugin.plugin }}"
+  {{- else }}
+          image: "{{ .Values.nodeplugin.plugin.image.repository }}"
+  {{- end }}
           imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }}
           args:
             - "--type=controller"
@@ -216,7 +240,11 @@ spec:
 {{- end }}
 {{- if .Values.provisioner.httpMetrics.enabled }}
         - name: liveness-prometheus
-          image: "{{ .Values.nodeplugin.plugin.image.repository }}:{{ .Values.nodeplugin.plugin.image.tag }}"
+  {{- if .Values.images.enable }}
+          image: "{{ .Values.images.nodeplugin.plugin }}"
+  {{- else }}  
+          image: "{{ .Values.nodeplugin.plugin.image.repository }}"
+  {{- end }}
           imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }}
           args:
             - "--type=liveness"

diff --git a/cmd/tke-installer/app/installer/manifests/charts/ceph-csi-rbd/values.yaml b/cmd/tke-installer/app/installer/manifests/charts/ceph-csi-rbd/values.yaml
@@ -69,13 +69,13 @@ nodeplugin:
     # Specifies whether http metrics should be exposed
     enabled: true
     # The port of the container to expose the metrics
-    containerPort: 8080
+    containerPort: 8681
 
     service:
       # Specifies whether a service should be created for the metrics
       enabled: true
       # The port to use for the service
-      servicePort: 8080
+      servicePort: 8681
       type: ClusterIP
 
       # Annotations for the service
@@ -101,15 +101,13 @@ nodeplugin:
 
   registrar:
     image:
-      repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar
-      tag: v2.4.0
+      repository: tkestack/csi-node-driver-registrar:v2.4.0
       pullPolicy: IfNotPresent
     resources: {}
 
   plugin:
     image:
-      repository: quay.io/cephcsi/cephcsi
-      tag: v3.6.0
+      repository: tkestack/cephcsi:v3.6.0
       pullPolicy: IfNotPresent
     resources: {}
 
@@ -165,13 +163,13 @@ provisioner:
     # Specifies whether http metrics should be exposed
     enabled: true
     # The port of the container to expose the metrics
-    containerPort: 8080
+    containerPort: 8681
 
     service:
       # Specifies whether a service should be created for the metrics
       enabled: true
       # The port to use for the service
-      servicePort: 8080
+      servicePort: 8681
       type: ClusterIP
 
       # Annotations for the service
@@ -197,33 +195,29 @@ provisioner:
 
   provisioner:
     image:
-      repository: k8s.gcr.io/sig-storage/csi-provisioner
-      tag: v3.1.0
+      repository: tkestack/csi-provisioner:v3.1.0
       pullPolicy: IfNotPresent
     resources: {}
 
   attacher:
     name: attacher
     enabled: true
     image:
-      repository: k8s.gcr.io/sig-storage/csi-attacher
-      tag: v3.4.0
+      repository: tkestack/csi-attacher:v3.4.0
       pullPolicy: IfNotPresent
     resources: {}
 
   resizer:
     name: resizer
     enabled: true
     image:
-      repository: k8s.gcr.io/sig-storage/csi-resizer
-      tag: v1.4.0
+      repository: tkestack/csi-resizer:v1.4.0
       pullPolicy: IfNotPresent
     resources: {}
 
   snapshotter:
     image:
-      repository: k8s.gcr.io/sig-storage/csi-snapshotter
-      tag: v4.2.0
+      repository: tkestack/csi-snapshotter:v4.2.0
       pullPolicy: IfNotPresent
     resources: {}
 
@@ -252,7 +246,7 @@ topology:
 
 storageClass:
   # Specifies whether the storageclass should be created
-  create: false
+  create: true
   name: csi-rbd-sc
 
   # Annotations for the storage class
@@ -277,7 +271,7 @@ storageClass:
 
   # (required) Ceph pool into which the RBD image shall be created
   # eg: pool: replicapool
-  pool: replicapool
+  pool: csp
 
   # (optional) RBD image features, CSI creates image with image-format 2 CSI
   # RBD currently supports `layering`, `journaling`, `exclusive-lock`,
@@ -406,7 +400,7 @@ selinuxMount: true
 
 secret:
   # Specifies whether the secret should be created
-  create: false
+  create: true
   name: csi-rbd-secret
   # Key values correspond to a user name and its key, as defined in the
   # ceph cluster. User ID should have required access to the 'pool'
@@ -452,3 +446,13 @@ externallyManagedConfigmap: false
 cephConfConfigMapName: ceph-config
 # Name of the configmap used for encryption kms configuration
 kmsConfigMapName: ceph-csi-encryption-kms-config
+images:
+  enable: false
+  nodeplugin:
+    registrar:
+    plugin:
+  provisioner:
+    provisioner:
+    attacher:
+    resizer:
+    snapshotter:
diff --git a/.../app/installer/manifests/charts/nfs-subdir-external-provisioner/templates/deployment.yaml b/.../app/installer/manifests/charts/nfs-subdir-external-provisioner/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "nfs-subdir-external-provisioner.fullname" . }}
+  namespace: {{ .Values.namespace }}
   labels:
     {{- include "nfs-subdir-external-provisioner.labels" . | nindent 4 }}
 spec:
@@ -43,7 +44,7 @@ spec:
       {{- end }}
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}

diff --git a/...ler/manifests/charts/nfs-subdir-external-provisioner/templates/persistentvolumeclaim.yaml b/...ler/manifests/charts/nfs-subdir-external-provisioner/templates/persistentvolumeclaim.yaml
@@ -3,6 +3,7 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: pvc-{{ template "nfs-subdir-external-provisioner.fullname" . }}
+  namespace: {{ .Values.namespace }}
   labels:
     {{- include "nfs-subdir-external-provisioner.labels" . | nindent 4 }}
 spec:

diff --git a/...staller/manifests/charts/nfs-subdir-external-provisioner/templates/podsecuritypolicy.yaml b/...staller/manifests/charts/nfs-subdir-external-provisioner/templates/podsecuritypolicy.yaml
@@ -3,6 +3,7 @@ apiVersion: {{ template "podSecurityPolicy.apiVersion" . }}
 kind: PodSecurityPolicy
 metadata:
   name: {{ template "nfs-subdir-external-provisioner.fullname" . }}
+  namespace: {{ .Values.namespace }}
   labels:
     {{- include "nfs-subdir-external-provisioner.labels" . | nindent 4 }}
 spec:

diff --git a/...taller/app/installer/manifests/charts/nfs-subdir-external-provisioner/templates/role.yaml b/...taller/app/installer/manifests/charts/nfs-subdir-external-provisioner/templates/role.yaml
@@ -5,6 +5,7 @@ metadata:
   labels:
     {{- include "nfs-subdir-external-provisioner.labels" . | nindent 4 }}
   name: leader-locking-{{ template "nfs-subdir-external-provisioner.fullname" . }}
+  namespace: {{ .Values.namespace }}
 rules:
   - apiGroups: [""]
     resources: ["endpoints"]

diff --git a/...app/installer/manifests/charts/nfs-subdir-external-provisioner/templates/rolebinding.yaml b/...app/installer/manifests/charts/nfs-subdir-external-provisioner/templates/rolebinding.yaml
@@ -5,6 +5,7 @@ metadata:
   labels:
     {{- include "nfs-subdir-external-provisioner.labels" . | nindent 4 }}
   name: leader-locking-{{ template "nfs-subdir-external-provisioner.fullname" . }}
+  namespace: {{ .Values.namespace }}
 subjects:
   - kind: ServiceAccount
     name: {{ template "nfs-subdir-external-provisioner.serviceAccountName" . }}

diff --git a/.../installer/manifests/charts/nfs-subdir-external-provisioner/templates/serviceaccount.yaml b/.../installer/manifests/charts/nfs-subdir-external-provisioner/templates/serviceaccount.yaml
@@ -9,4 +9,5 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   name: {{ template "nfs-subdir-external-provisioner.serviceAccountName" . }}
+  namespace: {{ .Values.namespace }}
 {{- end -}}
diff --git a/...pp/installer/manifests/charts/nfs-subdir-external-provisioner/templates/storageclass.yaml b/...pp/installer/manifests/charts/nfs-subdir-external-provisioner/templates/storageclass.yaml
@@ -5,6 +5,7 @@ metadata:
   labels:
     {{- include "nfs-subdir-external-provisioner.labels" . | nindent 4 }}
   name: {{ .Values.storageClass.name }}
+  namespace: {{ .Values.namespace }}
   annotations:
   {{- if .Values.storageClass.defaultClass }}
     storageclass.kubernetes.io/is-default-class: "true"

diff --git a/cmd/tke-installer/app/installer/manifests/charts/nfs-subdir-external-provisioner/values.yaml b/cmd/tke-installer/app/installer/manifests/charts/nfs-subdir-external-provisioner/values.yaml
@@ -1,9 +1,8 @@
-replicaCount: 1
+replicaCount: 2
 strategyType: Recreate
 
 image:
-  repository: k8s.gcr.io/sig-storage/nfs-subdir-external-provisioner
-  tag: v4.0.2
+  repository: tkestack/nfs-subdir-external-provisioner:v4.0.2
   pullPolicy: IfNotPresent
 imagePullSecrets: []
 
@@ -28,7 +27,7 @@ storageClass:
 
   # Set a StorageClass name
   # Ignored if storageClass.create is false
-  name: nfs-client
+  name: nfs-sc
 
   # Allow volume to be expanded dynamically
   allowVolumeExpansion: true
@@ -105,3 +104,5 @@ affinity: {}
 
 # Additional labels for any resource created
 labels: {}
+
+namespace: