chore(charts): change filer settings

Author: duanhongyi

charts/controller/templates/_helpers.tpl

@@ -16,6 +16,10 @@ env:
   value: "{{ .Values.global.registrySecretPrefix }}"
 - name: "IMAGE_PULL_POLICY"
   value: "{{ .Values.appImagePullPolicy }}"
+- name: "DRYCC_FILER_IMAGE"
+  value: "{{ (tpl .Values.filerImage .) }}"
+- name: "DRYCC_FILER_IMAGE_PULL_POLICY"
+  value: "{{ (tpl .Values.filerImagePullPolicy .) }}"
 - name: "KUBERNETES_CLUSTER_DOMAIN"
   value: "{{ .Values.global.clusterDomain }}"
 {{- if (.Values.appStorageClass) }}

charts/controller/values.yaml

@@ -31,6 +31,9 @@ registrationMode: "admin_only"
 k8sApiVerifyTls: "true"
 # Set app image pull policy
 appImagePullPolicy: "Always"
+# Filer settings image and image pull policy
+filerImage: "registry.drycc.cc/drycc/filer:canary"
+filerImagePullPolicy: "Always"
 # Set storageClassName. It is used for application.
 appStorageClass: "{{ .Values.storage.csi.storageClassName }}"
 # Set runtimeClassName. It is used for application.

rootfs/api/filer.py

@@ -53,7 +53,7 @@ def get_server(self):
             "labels": {"app": self.app_id, "pod": pod_name, "volume": self.volume.name},
             "app_type": "filer", "replicas": 1, "deploy_timeout": 120, "volumes": [k8s_volume],
             "volume_mounts": [{"mountPath": self.path, "name": self.volume.name}],
-            "restart_policy": "Never", "image_pull_policy": "Always",
+            "restart_policy": "Never", "image_pull_policy": settings.DRYCC_FILER_IMAGE_PULL_POLICY,
         })
         address = self.scheduler.pod.get(self.app_id, pod_name).json()["status"]["podIP"]
         return {"address": address, "username": username, "password": password}

rootfs/api/settings/production.py

@@ -303,6 +303,7 @@
 # Drycc filer image
 # Provide get and put operations for `drycc volumes:client`
 DRYCC_FILER_IMAGE = os.environ.get('DRYCC_FILER_IMAGE', 'registry.drycc.cc/drycc/filer:canary')
+DRYCC_FILER_IMAGE_PULL_POLICY = os.environ.get('DRYCC_FILER_IMAGE_PULL_POLICY', 'IfNotPresent')
 DRYCC_FILER_DURATION = int(os.environ.get('DRYCC_FILER_DURATION', '3600'))
 DRYCC_FILER_WAITTIME = int(os.environ.get('DRYCC_FILER_WAITTIME', '1200'))