diff --git a/charts/omada-controller/5.15/templates/deployment.yaml b/charts/omada-controller/5.15/templates/deployment.yaml index d15731a..7c9d569 100644 --- a/charts/omada-controller/5.15/templates/deployment.yaml +++ b/charts/omada-controller/5.15/templates/deployment.yaml @@ -74,6 +74,11 @@ spec: mountPath: /opt/tplink/EAPController/data - name: logs mountPath: /opt/tplink/EAPController/logs + {{- if .Values.tlsSecretName }} + - name: tls-certs + mountPath: /cert + readOnly: true + {{- end }} volumes: - name: work {{- if .Values.persistence.enabled }} @@ -96,6 +101,11 @@ spec: {{- else }} emptyDir: {} {{- end }} + {{- if .Values.tlsSecretName }} + - name: tls-certs + secret: + secretName: {{ .Values.tlsSecretName | quote }} + {{- end }} {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/charts/omada-controller/5.15/templates/hpa.yaml b/charts/omada-controller/5.15/templates/hpa.yaml deleted file mode 100644 index 7a7d21a..0000000 --- a/charts/omada-controller/5.15/templates/hpa.yaml +++ /dev/null @@ -1,28 +0,0 @@ -{{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 -kind: HorizontalPodAutoscaler -metadata: - name: {{ include "omada-controller.fullname" . }} - labels: - {{- include "omada-controller.labels" . | nindent 4 }} -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: {{ include "omada-controller.fullname" . }} - minReplicas: {{ .Values.autoscaling.minReplicas }} - maxReplicas: {{ .Values.autoscaling.maxReplicas }} - metrics: - {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} - - type: Resource - resource: - name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} - {{- end }} - {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - - type: Resource - resource: - name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} - {{- end }} -{{- end }} diff --git a/charts/omada-controller/5.15/templates/service.yaml b/charts/omada-controller/5.15/templates/service.yaml index de7079a..e641279 100644 --- a/charts/omada-controller/5.15/templates/service.yaml +++ b/charts/omada-controller/5.15/templates/service.yaml @@ -17,11 +17,11 @@ spec: protocol: TCP name: manage - port: {{ .Values.service.managessl.port }} - targetPort: 8043 + targetPort: {{ .Values.env.MANAGE_HTTPS_PORT }} protocol: TCP name: managessl - port: {{ .Values.service.portalssl.port }} - targetPort: {{ .Values.env.MANAGE_HTTPS_PORT }} + targetPort: 8843 protocol: TCP name: portalssl - port: {{ .Values.service.eapmanage.port }} @@ -62,27 +62,6 @@ spec: name: eapdiscovery selector: {{- include "omada-controller.selectorLabels" . | nindent 4 }} ---- -apiVersion: v1 -kind: Service -metadata: - name: {{ include "omada-controller.fullname" . }}-udp - labels: - {{- include "omada-controller.labels" . | nindent 4 }} -spec: - type: NodePort - ports: - - port: {{ .Values.service.eapdiscovery.port }} - targetPort: 29810 - protocol: UDP - name: eapdiscovery - selector: - {{- include "omada-controller.selectorLabels" . | nindent 4 }} - {{- if .Values.service.externalIPs.enabled }} - externalTrafficPolicy: Local - externalIPs:{{- range .Values.service.externalIPs.ip }} - - {{.}}{{- end }} - {{- end }} {{ else }} apiVersion: v1 kind: Service diff --git a/charts/omada-controller/5.15/values.yaml b/charts/omada-controller/5.15/values.yaml index 2ea112f..b314beb 100644 --- a/charts/omada-controller/5.15/values.yaml +++ b/charts/omada-controller/5.15/values.yaml @@ -44,6 +44,8 @@ securityContext: {} # runAsNonRoot: true # runAsUser: 1000 +tlsSecretName: {} + service: enabled: true type: NodePort @@ -96,13 +98,6 @@ resources: {} # cpu: 100m # memory: 128Mi -autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 100 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - nodeSelector: {} tolerations: []