resolve comments

Author: dspo

charts/templates/configmap.yaml

@@ -5,8 +5,18 @@ metadata:
   namespace: {{ .Release.Namespace }}
 data:
   config.yaml: |
-    log_level: "{{ .Values.logLevel | default "debug" }}"
-
-    controller_name: {{ .Values.controllerName | default "apisix.apache.org/api7-ingress-controller" }}
-
-    leader_election_id: "api7-ingress-controller-leader"
+    cert_file: {{ .Values.config.certFile | default "" }}
+    key_file: {{ .Values.config.keyFile | default "" }}
+    log_level: {{ .Values.config.logLevel | default "info" }}
+    controller_name: {{ .Values.config.controllerName | default "apisix.apache.org/api7-ingress-controller" }}
+    leader_election_id: {{ .Values.config.leaderElection.id | default "api7-ingress-controller-leader" }}
+    leader_election:
+      leaseDuration: {{ .Values.config.leaderElection.leaseDuration | default "15s" }}
+      renewDeadline: {{ .Values.config.leaderElection.renewDeadline | default "10s" }}
+      retryPeriod: {{ .Values.config.leaderElection.retryPeriod | default "2s" }}
+      disable: {{ .Values.config.leaderElection.disable | default false }}
+    metrics_addr: {{ .Values.config.metricsAddr | default ":8080" }}
+    enable_http2: {{ .Values.config.enableHTTP2 | default false }}
+    probe_addr: {{ .Values.config.probeAddr | default ":8081" }}
+    secure_metrics: {{ .Values.config.secureMetrics | default "" }}
+    exec_adc_timeout: {{ .Values.config.execADCTimeout | default "15s" }}

charts/templates/deployment.yaml

@@ -6,19 +6,19 @@ metadata:
   name: {{ .Release.Name }}
   namespace: {{ .Release.Namespace }}
   annotations:
-  {{- range $key, $value := .Values.annotations }}
+  {{- range $key, $value := .Values.deployment.annotations }}
     {{ $key }}: {{ $value | quote }}
   {{- end }}
 spec:
-  replicas: {{ .Values.replicas }}
+  replicas: {{ .Values.deployment.replicas }}
   selector:
     matchLabels:
       {{- include "api7-ingress-controller-manager.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       annotations:
-        {{- if .Values.podAnnotations }}
-        {{- range $key, $value := $.Values.podAnnotations }}
+        {{- if .Values.deployment.podAnnotations }}
+        {{- range $key, $value := $.Values.deployment.podAnnotations }}
         {{ $key }}: {{ $value | quote }}
         {{- end }}
         {{- end }}
@@ -35,7 +35,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+        image: "{{ .Values.deployment.image.repository }}:{{ .Values.deployment.image.tag }}"
         volumeMounts:
         - name: {{ .Release.Name }}-ingress-config
           mountPath: /app/conf/config.yaml
@@ -61,20 +61,20 @@ spec:
             cpu: 10m
             memory: 64Mi
         securityContext:
-          {{- toYaml .Values.podSecurityContext | nindent 10 }}
-      {{- with .Values.nodeSelector }}
+          {{- toYaml .Values.deployment.podSecurityContext | nindent 10 }}
+      {{- with .Values.deployment.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.tolerations }}
+      {{- with .Values.deployment.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.affinity }}
+      {{- with .Values.deployment.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.topologySpreadConstraints }}
+      {{- with .Values.deployment.topologySpreadConstraints }}
       topologySpreadConstraints:
         {{- tpl (. | toYaml) $ | nindent 8 }}
       {{- end }}

charts/values.yaml

@@ -1,24 +1,7 @@
 nameOverride: ""
 fullnameOverride: ""
 labelsOverride: {}
-annotations: {}
-podAnnotations: {}
-controllerName: apisix.apache.org/api7-ingress-controller
-replicas: 1
-admin:
-  key: '' # Pass the admin key generated for the ingress gateway group
-  tlsVerify: false
-  endpoint: '' #Dashboard endpoint 
-statusAddress: ''
-logLevel: info
-nodeSelector: {}
-tolerations: []
-affinity: {}
-podSecurityContext:
-  allowPrivilegeEscalation: false
-  capabilities:
-    drop:
-    - ALL
+
 # -- See https://kubernetes.io/docs/tasks/run-application/configure-pdb/ for more details
 podDisruptionBudget:
   # -- Enable or disable podDisruptionBudget
@@ -31,12 +14,42 @@ podDisruptionBudget:
   maxUnavailable: 1
 # -- Topology Spread Constraints for pod assignment spread across your cluster among failure-domains
 # ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/#spread-constraints-for-pods
-topologySpreadConstraints: []
-image:
-  repository: api7/api7-ingress-controller
-  pullPolicy: IfNotPresent
-  tag: "dev"
 
 autoscaling:
   enabled: false
   minReplicas: 1
+
+deployment:
+  annotations: {}
+  podAnnotations: {}
+  replicas: 1
+  nodeSelector: {}
+  tolerations: []
+  affinity: {}
+  podSecurityContext:
+    allowPrivilegeEscalation: false
+    capabilities:
+      drop:
+        - ALL
+  topologySpreadConstraints: []
+  image:
+    repository: api7/api7-ingress-controller
+    pullPolicy: IfNotPresent
+    tag: "dev"
+
+config:
+  certFile: ""
+  keyFile: ""
+  logLevel: "info"
+  controllerName: apisix.apache.org/api7-ingress-controller
+  leaderElection:
+    id: "api7-ingress-controller-leader"
+    leaseDuration: "15s"
+    renewDeadline: "10s"
+    retryPeriod: "2s"
+    disable: false
+  metricsAddr: ":8080"
+  enableHTTP2: false
+  probeAddr: ":8081"
+  secureMetrics: ""
+  execADCTimeout: "15s"