diff --git a/stable/nginx-lego/Chart.yaml b/stable/nginx-lego/Chart.yaml index 5361b55dca..608d0f92de 100755 --- a/stable/nginx-lego/Chart.yaml +++ b/stable/nginx-lego/Chart.yaml @@ -1,5 +1,5 @@ name: nginx-lego -version: 0.1.0 +version: 0.2.0 description: Chart for nginx-ingress-controller and kube-lego keywords: - kube-lego diff --git a/stable/nginx-lego/templates/default-service.yaml b/stable/nginx-lego/templates/default-service.yaml index 06d3e34245..af44a4a516 100644 --- a/stable/nginx-lego/templates/default-service.yaml +++ b/stable/nginx-lego/templates/default-service.yaml @@ -10,4 +10,4 @@ spec: - port: 80 targetPort: 8080 selector: - app: {{ template "fullname" . }}-default-backend \ No newline at end of file + app: {{ template "fullname" . }}-default-backend diff --git a/stable/nginx-lego/templates/lego-configmap.yaml b/stable/nginx-lego/templates/lego-configmap.yaml index 4fcc595102..6446db6bb2 100644 --- a/stable/nginx-lego/templates/lego-configmap.yaml +++ b/stable/nginx-lego/templates/lego-configmap.yaml @@ -3,7 +3,9 @@ apiVersion: v1 metadata: name: {{ template "fullname" . }}-lego data: + # modify this to specify your address lego.email: {{ .Values.lego.configmap.email | quote }} + # configure letencrypt's production api lego.url: {{ .Values.lego.configmap.url | quote }} kind: ConfigMap -{{- end }} \ No newline at end of file +{{- end }} diff --git a/stable/nginx-lego/templates/lego-deployment.yaml b/stable/nginx-lego/templates/lego-deployment.yaml index 3fdaa72a53..2ca1ac3f43 100644 --- a/stable/nginx-lego/templates/lego-deployment.yaml +++ b/stable/nginx-lego/templates/lego-deployment.yaml @@ -8,7 +8,7 @@ spec: template: metadata: labels: - app: {{ template "fullname" . }}-lego + app: kube-lego spec: containers: - name: {{ .Chart.Name }}-lego @@ -37,4 +37,4 @@ spec: fieldPath: status.podIP resources: {{ toYaml .Values.nginx.resources | indent 10 }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/stable/nginx-lego/templates/nginx-deployment.yaml b/stable/nginx-lego/templates/nginx-deployment.yaml index 0db7d24250..7e198e734e 100644 --- a/stable/nginx-lego/templates/nginx-deployment.yaml +++ b/stable/nginx-lego/templates/nginx-deployment.yaml @@ -27,7 +27,9 @@ spec: ports: - containerPort: 80 - containerPort: 443 +{{- if .Values.nginx.monitoring }} - containerPort: 8080 +{{- end }} resources: {{ toYaml .Values.nginx.resources | indent 10 }} args: diff --git a/stable/nginx-lego/templates/lego-service.yaml b/stable/nginx-lego/templates/nginx-monitoring.yaml similarity index 50% rename from stable/nginx-lego/templates/lego-service.yaml rename to stable/nginx-lego/templates/nginx-monitoring.yaml index a0a63eeb7c..ebeed407ec 100644 --- a/stable/nginx-lego/templates/lego-service.yaml +++ b/stable/nginx-lego/templates/nginx-monitoring.yaml @@ -1,15 +1,15 @@ -{{- if .Values.lego.enabled }} +{{- if .Values.nginx.monitoring }} apiVersion: v1 kind: Service metadata: - name: {{ template "fullname" . }}-lego + name: {{ template "fullname" . }}-monitoring labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" spec: type: ClusterIP ports: - - port: 80 - name: "lego" + - port: 18080 + name: vts-stats selector: - app: {{ template "fullname" . }}-lego + app: {{ template "fullname" . }} {{- end }} \ No newline at end of file diff --git a/stable/nginx-lego/values.yaml b/stable/nginx-lego/values.yaml index fc6a90bef3..dfc9f533d2 100644 --- a/stable/nginx-lego/values.yaml +++ b/stable/nginx-lego/values.yaml @@ -12,6 +12,7 @@ nginx: pullPolicy: IfNotPresent service: type: LoadBalancer + monitoring: false resources: limits: cpu: 1 @@ -69,4 +70,4 @@ lego: memory: 2Gi requests: cpu: 1 - memory: 128Mi \ No newline at end of file + memory: 128Mi