chore(charts): add config to values.yaml

Author: duanhongyi

charts/controller/templates/_helpers.tpl

@@ -221,3 +221,74 @@ resources:
 {{- end }}
 {{- end }}
 {{- end }}
+
+{{/* Generate controller config default limit specs */}}
+{{ define "controller.config.defaultLimitSpecs" }}
+- model: api.limitspec
+  pk: std1
+  fields:
+    cpu:
+      name: Unknown CPU
+      cores: 32
+      clock: 3100MHZ
+      boost: 3700MHZ
+      threads: 64
+    memory:
+      size: 64GB
+      type: DDR4-ECC
+    features:
+      gpu:
+        name: Unknown Integrated GPU
+        tmus: 1
+        rops: 1
+        cores: 128
+        memory:
+          size: shared
+          type: shared
+      network: 10G
+    keywords:
+    - unknown
+    disabled: false
+    created: {{ now | date "2006-01-02T15:04:05.000Z" }}
+    updated: {{ now | date "2006-01-02T15:04:05.000Z" }}
+{{- end }}
+
+{{/* Generate controller config default limit plans */}}
+{{ define "controller.config.defaultLimitPlans" }}
+{{- $index := 0 }}
+{{- $cpus := tuple 1 2 4 8 16 32 }}
+{{- $scales := tuple 1 2 4 8 }}
+{{- range $cpu := $cpus }}
+{{- range $scale := $scales }}
+{{- $memory := mul $cpu $scale }}
+- model: api.limitplan
+  pk: std1.large.c{{ $cpu }}m{{ $memory }}
+  fields:
+    spec_id: std1
+    cpu: {{ $cpu }}
+    memory: {{ $memory }}
+    features:
+      gpu: 1
+      network: 1
+    disabled: false
+    priority: {{ add 10000 (mul (add1 $index) 100) }}
+    limits:
+      cpu: {{ $cpu }}
+      memory: {{ $memory }}Gi
+      ephemeral-storage: 2Gi
+    requests:
+      cpu: {{ divf $cpu 4 }}
+      memory: {{ divf $memory 2 }}Gi
+      ephemeral-storage: 2Gi
+    annotations:
+      kubernetes.io/egress-bandwidth: 100M
+      kubernetes.io/ingress-bandwidth: 100M
+    node_selector: {}
+    pod_security_context: {}
+    container_security_context: {}
+    created: {{ now | date "2006-01-02T15:04:05.000Z" }}
+    updated: {{ now | date "2006-01-02T15:04:05.000Z" }}
+{{- $index = (add1 $index) }}
+{{- end }}
+{{- end }}
+{{- end }}

charts/controller/templates/controller-configmap.yaml

@@ -6,84 +6,14 @@ metadata:
     heritage: drycc
 data:
   limit-specs.json: |
-    [{
-      "model": "api.limitspec",
-      "pk": "std1",
-      "fields": {
-        "cpu": {
-          "name": "Unknown CPU",
-          "cores": 32,
-          "clock": "3100MHZ",
-          "boost": "3700MHZ",
-          "threads": 64
-        },
-        "memory": {
-          "size": "64GB",
-          "type": "DDR4-ECC"
-        },
-        "features": {
-          "gpu": {
-            "name": "Unknown Integrated GPU",
-            "tmus": 1,
-            "rops": 1,
-            "cores": 128,
-            "memory": {
-              "size": "shared",
-              "type": "shared"
-            }
-          },
-          "network": "10G"
-        },
-        "keywords": ["unknown"],
-        "disabled": false,
-        "created": "{{ now | date "2006-01-02T15:04:05.000Z" }}",
-        "updated": "{{ now | date "2006-01-02T15:04:05.000Z" }}"
-      }
-    }]
-  # Given a name SPEC.NETWORK.PLAN(eg: std1.xlarge.c1m1), increment the:
-  # * SPEC different specification families can be selected based on business and usage scenarios.
-  # * NETWORK 
-  # * PLAN Specific CPU configuration, such as c1m1 representing one CPU and 1GB of memory.
+    {{- if .Values.config.limitSpecs }}
+    {{- (tpl .Values.config.limitSpecs $)  | nindent 4 }}
+    {{- else}}
+    {{- include "controller.config.defaultLimitSpecs" . | fromYamlArray | toPrettyJson | nindent 4 }}
+    {{- end }}
   limit-plans.json: |
-    [
-    {{- $items := tuple "1/1/10" "1/2/10" "1/4/20" "2/2/20" "2/4/30" "2/8/30" }}
-    {{- range $index, $item := $items }}
-    {{- $cpu := index (splitList "/" $item) 0 }}
-    {{- $memory := index (splitList "/" $item) 1 }}
-    {{- $network := index (splitList "/" $item) 2 }}
-    {
-      "model": "api.limitplan",
-      "pk": "std1.large.c{{ $cpu }}m{{ $memory }}",
-      "fields": {
-        "spec_id": "std1",
-        "cpu": {{ $cpu }},
-        "memory": {{ $memory }},
-        "features": {
-          "gpu": 1,
-          "network": 1
-        },
-        "disabled": false,
-        "priority": {{ add 100 $index }},
-        "limits": {
-          "cpu": {{ $cpu }},
-          "memory": "{{ $memory }}Gi",
-          "ephemeral-storage": "2Gi"
-        },
-        "requests": {
-          "cpu": {{ divf $cpu 2 }},
-          "memory": "{{ divf $memory 2 }}Gi",
-          "ephemeral-storage": "2Gi"
-        },
-        "annotations": {
-          "kubernetes.io/egress-bandwidth": "{{ $network }}M",
-          "kubernetes.io/ingress-bandwidth": "{{ $network }}M"
-        },
-        "node_selector": {},
-        "pod_security_context": {},
-        "container_security_context": {},
-        "created": "{{ now | date "2006-01-02T15:04:05.000Z" }}",
-        "updated": "{{ now | date "2006-01-02T15:04:05.000Z" }}"
-      }
-    }{{ if not (eq $item ($items|last)) }},{{ end }}
+    {{- if .Values.config.limitPlans }}
+    {{- (tpl .Values.config.limitPlans $)  | nindent 4 }}
+    {{- else}}
+    {{- include "controller.config.defaultLimitPlans" . | fromYamlArray | toPrettyJson | nindent 4 }}
     {{- end }}
-    ]

charts/controller/values.yaml

@@ -65,10 +65,17 @@ workflowManagerSecretKey: ""
 
 # Configuring this will no longer use the built-in rabbitmq component
 rabbitmqUrl: ""
+
+# limit specs, plans config
+config:
+  limitSpecs: ""
+  limitPlans: ""
+
 # Service
 service:
   # Provide any additional service annotations
   annotations: {}
+
 # Any custom controller environment variables
 # can be specified as key-value pairs under environment
 # this is usually a non required setting.