chore(controller): change app storage class name

Author: duanhongyi

charts/controller/templates/_helpers.tpl

@@ -5,9 +5,6 @@ env:
   value: {{ .Chart.AppVersion }}
 - name: REGISTRATION_MODE
   value: {{ .Values.registrationMode }}
-# Environmental variable value for $GATEWAY_CLASS
-- name: "DRYCC_GATEWAY_CLASS"
-  value: "{{ .Values.global.gatewayClass }}"
 - name: "K8S_API_VERIFY_TLS"
   value: "{{ .Values.k8sApiVerifyTls }}"
 - name: "DRYCC_REGISTRY_LOCATION"
@@ -22,6 +19,8 @@ env:
   value: "{{ (tpl .Values.filerImagePullPolicy .) }}"
 - name: "KUBERNETES_CLUSTER_DOMAIN"
   value: "{{ .Values.global.clusterDomain }}"
+- name: "DRYCC_APP_GATEWAY_CLASS"
+  value: "{{ .Values.appGatewayClass }}"
 {{- if (.Values.appStorageClass) }}
 - name: "DRYCC_APP_STORAGE_CLASS"
   value: "{{ (tpl .Values.appStorageClass .) }}"

charts/controller/values.yaml

@@ -32,7 +32,9 @@ 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.
+# Set app gateway, It is used for application gateway.
+appGatewayClass: ""
+# Set storageClassName, It is used for application mount.
 appStorageClass: "longhorn"
 # Set runtimeClassName. It is used for application.
 appRuntimeClass: ""
@@ -69,7 +71,6 @@ workflowManagerAccessKey: ""
 workflowManagerSecretKey: ""
 # Prefix for the imagepull secret created when using private registry
 registrySecretPrefix: "private-registry"
-
 # limit specs, plans config
 config:
   metrics: ""
@@ -174,8 +175,6 @@ prometheus:
 global:
   # Admin email, used for each component to send email to administrator
   email: "drycc@drycc.cc"
-  # GatewayClass is cluster-scoped resource defined by the infrastructure provider.
-  gatewayClass: ""
   # A domain name consists of one or more parts.
   # Periods (.) are used to separate these parts.
   # Each part must be 1 to 63 characters in length and can contain lowercase letters, digits, and hyphens (-).

rootfs/api/models/gateway.py

@@ -93,7 +93,7 @@ def listeners(self):
         return listeners
 
     def refresh_to_k8s(self):
-        kwargs = {"listeners": self.listeners, "gateway_class": settings.GATEWAY_CLASS}
+        kwargs = {"listeners": self.listeners, "gateway_class": settings.DRYCC_APP_GATEWAY_CLASS}
         if self.app.tls_set.latest().certs_auto_enabled:
             kwargs["annotations"] = {"cert-manager.io/issuer": self.app.id}
         try:

rootfs/api/settings/production.py

@@ -319,9 +319,6 @@
 else:
     MUTATE_KEY = None
 
-# gateway class name
-GATEWAY_CLASS = os.environ.get('DRYCC_GATEWAY_CLASS', '')
-
 IMAGE_PULL_POLICY = os.environ.get('IMAGE_PULL_POLICY', "IfNotPresent")
 
 # apply task size
@@ -357,6 +354,8 @@
 
 DRYCC_DEPLOY_HOOK_SECRET_KEY = os.environ.get('DRYCC_DEPLOY_HOOK_SECRET_KEY', None)
 
+DRYCC_APP_GATEWAY_CLASS = os.environ.get('DRYCC_APP_GATEWAY_CLASS', "")
+
 DRYCC_APP_STORAGE_CLASS = os.environ.get('DRYCC_APP_STORAGE_CLASS', "")
 
 DRYCC_APP_DNS_POLICY = os.environ.get('DRYCC_APP_DNS_POLICY', "")