diff --git a/deploy/kubernetes/easyhaproxy-clusterip.yml b/deploy/kubernetes/easyhaproxy-clusterip.yml index 438a2f8..81e3753 100644 --- a/deploy/kubernetes/easyhaproxy-clusterip.yml +++ b/deploy/kubernetes/easyhaproxy-clusterip.yml @@ -6,7 +6,7 @@ metadata: name: ingress-easyhaproxy namespace: easyhaproxy labels: - helm.sh/chart: easyhaproxy-0.1.3 + helm.sh/chart: easyhaproxy-0.1.4 app.kubernetes.io/name: easyhaproxy app.kubernetes.io/instance: ingress app.kubernetes.io/version: "4.2.0" @@ -19,7 +19,7 @@ metadata: name: ingress-easyhaproxy namespace: easyhaproxy labels: - helm.sh/chart: easyhaproxy-0.1.3 + helm.sh/chart: easyhaproxy-0.1.4 app.kubernetes.io/name: easyhaproxy app.kubernetes.io/instance: ingress app.kubernetes.io/version: "4.2.0" @@ -85,7 +85,7 @@ metadata: name: ingress-easyhaproxy namespace: easyhaproxy labels: - helm.sh/chart: easyhaproxy-0.1.3 + helm.sh/chart: easyhaproxy-0.1.4 app.kubernetes.io/name: easyhaproxy app.kubernetes.io/instance: ingress app.kubernetes.io/version: "4.2.0" @@ -107,7 +107,7 @@ metadata: name: ingress-easyhaproxy namespace: easyhaproxy labels: - helm.sh/chart: easyhaproxy-0.1.3 + helm.sh/chart: easyhaproxy-0.1.4 app.kubernetes.io/name: easyhaproxy app.kubernetes.io/instance: ingress app.kubernetes.io/version: "4.2.0" @@ -139,7 +139,7 @@ metadata: name: ingress-easyhaproxy namespace: easyhaproxy labels: - helm.sh/chart: easyhaproxy-0.1.3 + helm.sh/chart: easyhaproxy-0.1.4 app.kubernetes.io/name: easyhaproxy app.kubernetes.io/instance: ingress app.kubernetes.io/version: "4.2.0" @@ -171,7 +171,7 @@ spec: - name: easyhaproxy securityContext: {} - image: "byjg/easy-haproxy:master" + image: "byjg/easy-haproxy:4.2.0" imagePullPolicy: Always ports: - name: http diff --git a/deploy/kubernetes/easyhaproxy-daemonset.yml b/deploy/kubernetes/easyhaproxy-daemonset.yml index a2ece4d..aad000d 100644 --- a/deploy/kubernetes/easyhaproxy-daemonset.yml +++ b/deploy/kubernetes/easyhaproxy-daemonset.yml @@ -6,7 +6,7 @@ metadata: name: ingress-easyhaproxy namespace: easyhaproxy labels: - helm.sh/chart: easyhaproxy-0.1.3 + helm.sh/chart: easyhaproxy-0.1.4 app.kubernetes.io/name: easyhaproxy app.kubernetes.io/instance: ingress app.kubernetes.io/version: "4.2.0" @@ -19,7 +19,7 @@ metadata: name: ingress-easyhaproxy namespace: easyhaproxy labels: - helm.sh/chart: easyhaproxy-0.1.3 + helm.sh/chart: easyhaproxy-0.1.4 app.kubernetes.io/name: easyhaproxy app.kubernetes.io/instance: ingress app.kubernetes.io/version: "4.2.0" @@ -85,7 +85,7 @@ metadata: name: ingress-easyhaproxy namespace: easyhaproxy labels: - helm.sh/chart: easyhaproxy-0.1.3 + helm.sh/chart: easyhaproxy-0.1.4 app.kubernetes.io/name: easyhaproxy app.kubernetes.io/instance: ingress app.kubernetes.io/version: "4.2.0" @@ -106,7 +106,7 @@ metadata: name: ingress-easyhaproxy namespace: easyhaproxy labels: - helm.sh/chart: easyhaproxy-0.1.3 + helm.sh/chart: easyhaproxy-0.1.4 app.kubernetes.io/name: easyhaproxy app.kubernetes.io/instance: ingress app.kubernetes.io/version: "4.2.0" diff --git a/deploy/kubernetes/easyhaproxy-nodeport.yml b/deploy/kubernetes/easyhaproxy-nodeport.yml index 3968165..e4965ad 100644 --- a/deploy/kubernetes/easyhaproxy-nodeport.yml +++ b/deploy/kubernetes/easyhaproxy-nodeport.yml @@ -6,7 +6,7 @@ metadata: name: ingress-easyhaproxy namespace: easyhaproxy labels: - helm.sh/chart: easyhaproxy-0.1.3 + helm.sh/chart: easyhaproxy-0.1.4 app.kubernetes.io/name: easyhaproxy app.kubernetes.io/instance: ingress app.kubernetes.io/version: "4.2.0" @@ -19,7 +19,7 @@ metadata: name: ingress-easyhaproxy namespace: easyhaproxy labels: - helm.sh/chart: easyhaproxy-0.1.3 + helm.sh/chart: easyhaproxy-0.1.4 app.kubernetes.io/name: easyhaproxy app.kubernetes.io/instance: ingress app.kubernetes.io/version: "4.2.0" @@ -85,7 +85,7 @@ metadata: name: ingress-easyhaproxy namespace: easyhaproxy labels: - helm.sh/chart: easyhaproxy-0.1.3 + helm.sh/chart: easyhaproxy-0.1.4 app.kubernetes.io/name: easyhaproxy app.kubernetes.io/instance: ingress app.kubernetes.io/version: "4.2.0" @@ -107,7 +107,7 @@ metadata: name: ingress-easyhaproxy namespace: easyhaproxy labels: - helm.sh/chart: easyhaproxy-0.1.3 + helm.sh/chart: easyhaproxy-0.1.4 app.kubernetes.io/name: easyhaproxy app.kubernetes.io/instance: ingress app.kubernetes.io/version: "4.2.0" @@ -139,7 +139,7 @@ metadata: name: ingress-easyhaproxy namespace: easyhaproxy labels: - helm.sh/chart: easyhaproxy-0.1.3 + helm.sh/chart: easyhaproxy-0.1.4 app.kubernetes.io/name: easyhaproxy app.kubernetes.io/instance: ingress app.kubernetes.io/version: "4.2.0" diff --git a/docs/kubernetes.md b/docs/kubernetes.md index 7ecd388..cbb1f7b 100644 --- a/docs/kubernetes.md +++ b/docs/kubernetes.md @@ -74,6 +74,8 @@ easyhaproxy: certbot: DEBUG easyhaproxy: DEBUG haproxy: DEBUG + letsencrypt: + email: "" service: create: false # If false, it will create a DaemonSet with hostPort. The easiest. diff --git a/helm/easyhaproxy/templates/deployment.yaml b/helm/easyhaproxy/templates/deployment.yaml index 86fb22c..ecaa538 100644 --- a/helm/easyhaproxy/templates/deployment.yaml +++ b/helm/easyhaproxy/templates/deployment.yaml @@ -69,3 +69,7 @@ spec: value: {{ .Values.easyhaproxy.logLevel.haproxy }} - name: CERTBOT_LOG_LEVEL value: {{ .Values.easyhaproxy.logLevel.certbot }} + {{- if .Values.easyhaproxy.letsencrypt.email }} + - name: EASYHAPROXY_LETSENCRYPT_EMAIL + value: {{ .Values.easyhaproxy.letsencrypt.email }} + {{ end }} diff --git a/helm/easyhaproxy/values.yaml b/helm/easyhaproxy/values.yaml index 9f1b413..c3bb6a6 100644 --- a/helm/easyhaproxy/values.yaml +++ b/helm/easyhaproxy/values.yaml @@ -69,6 +69,8 @@ easyhaproxy: certbot: DEBUG easyhaproxy: DEBUG haproxy: DEBUG + letsencrypt: + email: "" # Make sure to create this masterNode: