Merge branch 'master' into 4.4.0

deploy/docker/docker-compose.yml

@@ -2,7 +2,7 @@ version: "3"
 
 services:
   easyhaproxy:
-    image: byjg/easy-haproxy:4.3.0
+    image: byjg/easy-haproxy:4.3.1-rc1
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - certs_letsencrypt:/certs/letsencrypt

deploy/kubernetes/easyhaproxy-clusterip.yml

@@ -6,10 +6,10 @@ metadata:
   name: ingress-easyhaproxy
   namespace: easyhaproxy
   labels:
-    helm.sh/chart: easyhaproxy-0.1.5
+    helm.sh/chart: easyhaproxy-0.1.6
     app.kubernetes.io/name: easyhaproxy
     app.kubernetes.io/instance: ingress
-    app.kubernetes.io/version: "4.3.0"
+    app.kubernetes.io/version: "4.3.1-rc1"
     app.kubernetes.io/managed-by: Helm
 ---
 # Source: easyhaproxy/templates/clusterrole.yaml
@@ -19,10 +19,10 @@ metadata:
   name: ingress-easyhaproxy
   namespace: easyhaproxy
   labels:
-    helm.sh/chart: easyhaproxy-0.1.5
+    helm.sh/chart: easyhaproxy-0.1.6
     app.kubernetes.io/name: easyhaproxy
     app.kubernetes.io/instance: ingress
-    app.kubernetes.io/version: "4.3.0"
+    app.kubernetes.io/version: "4.3.1-rc1"
     app.kubernetes.io/managed-by: Helm
 rules:
 - apiGroups:
@@ -85,10 +85,10 @@ metadata:
   name: ingress-easyhaproxy
   namespace: easyhaproxy
   labels:
-    helm.sh/chart: easyhaproxy-0.1.5
+    helm.sh/chart: easyhaproxy-0.1.6
     app.kubernetes.io/name: easyhaproxy
     app.kubernetes.io/instance: ingress
-    app.kubernetes.io/version: "4.3.0"
+    app.kubernetes.io/version: "4.3.1-rc1"
     app.kubernetes.io/managed-by: Helm
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -107,10 +107,10 @@ metadata:
   name: ingress-easyhaproxy
   namespace: easyhaproxy
   labels:
-    helm.sh/chart: easyhaproxy-0.1.5
+    helm.sh/chart: easyhaproxy-0.1.6
     app.kubernetes.io/name: easyhaproxy
     app.kubernetes.io/instance: ingress
-    app.kubernetes.io/version: "4.3.0"
+    app.kubernetes.io/version: "4.3.1-rc1"
     app.kubernetes.io/managed-by: Helm
   annotations:
     {}
@@ -139,10 +139,10 @@ metadata:
   name: ingress-easyhaproxy
   namespace: easyhaproxy
   labels:
-    helm.sh/chart: easyhaproxy-0.1.5
+    helm.sh/chart: easyhaproxy-0.1.6
     app.kubernetes.io/name: easyhaproxy
     app.kubernetes.io/instance: ingress
-    app.kubernetes.io/version: "4.3.0"
+    app.kubernetes.io/version: "4.3.1-rc1"
     app.kubernetes.io/managed-by: Helm
 spec:
   selector:
@@ -171,7 +171,7 @@ spec:
         - name: easyhaproxy
           securityContext:
             {}
-          image: "byjg/easy-haproxy:4.3.0"
+          image: "byjg/easy-haproxy:4.3.1-rc1"
           imagePullPolicy: Always
           ports:
             - name: http

deploy/kubernetes/easyhaproxy-daemonset.yml

@@ -6,10 +6,10 @@ metadata:
   name: ingress-easyhaproxy
   namespace: easyhaproxy
   labels:
-    helm.sh/chart: easyhaproxy-0.1.5
+    helm.sh/chart: easyhaproxy-0.1.6
     app.kubernetes.io/name: easyhaproxy
     app.kubernetes.io/instance: ingress
-    app.kubernetes.io/version: "4.3.0"
+    app.kubernetes.io/version: "4.3.1-rc1"
     app.kubernetes.io/managed-by: Helm
 ---
 # Source: easyhaproxy/templates/clusterrole.yaml
@@ -19,10 +19,10 @@ metadata:
   name: ingress-easyhaproxy
   namespace: easyhaproxy
   labels:
-    helm.sh/chart: easyhaproxy-0.1.5
+    helm.sh/chart: easyhaproxy-0.1.6
     app.kubernetes.io/name: easyhaproxy
     app.kubernetes.io/instance: ingress
-    app.kubernetes.io/version: "4.3.0"
+    app.kubernetes.io/version: "4.3.1-rc1"
     app.kubernetes.io/managed-by: Helm
 rules:
 - apiGroups:
@@ -85,10 +85,10 @@ metadata:
   name: ingress-easyhaproxy
   namespace: easyhaproxy
   labels:
-    helm.sh/chart: easyhaproxy-0.1.5
+    helm.sh/chart: easyhaproxy-0.1.6
     app.kubernetes.io/name: easyhaproxy
     app.kubernetes.io/instance: ingress
-    app.kubernetes.io/version: "4.3.0"
+    app.kubernetes.io/version: "4.3.1-rc1"
     app.kubernetes.io/managed-by: Helm
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -106,10 +106,10 @@ metadata:
   name: ingress-easyhaproxy
   namespace: easyhaproxy
   labels:
-    helm.sh/chart: easyhaproxy-0.1.5
+    helm.sh/chart: easyhaproxy-0.1.6
     app.kubernetes.io/name: easyhaproxy
     app.kubernetes.io/instance: ingress
-    app.kubernetes.io/version: "4.3.0"
+    app.kubernetes.io/version: "4.3.1-rc1"
     app.kubernetes.io/managed-by: Helm
 spec:
   selector:
@@ -138,7 +138,7 @@ spec:
         - name: easyhaproxy
           securityContext:
             {}
-          image: "byjg/easy-haproxy:4.3.0"
+          image: "byjg/easy-haproxy:4.3.1-rc1"
           imagePullPolicy: Always
           ports:
             - name: http

deploy/kubernetes/easyhaproxy-nodeport.yml

@@ -6,10 +6,10 @@ metadata:
   name: ingress-easyhaproxy
   namespace: easyhaproxy
   labels:
-    helm.sh/chart: easyhaproxy-0.1.5
+    helm.sh/chart: easyhaproxy-0.1.6
     app.kubernetes.io/name: easyhaproxy
     app.kubernetes.io/instance: ingress
-    app.kubernetes.io/version: "4.3.0"
+    app.kubernetes.io/version: "4.3.1-rc1"
     app.kubernetes.io/managed-by: Helm
 ---
 # Source: easyhaproxy/templates/clusterrole.yaml
@@ -19,10 +19,10 @@ metadata:
   name: ingress-easyhaproxy
   namespace: easyhaproxy
   labels:
-    helm.sh/chart: easyhaproxy-0.1.5
+    helm.sh/chart: easyhaproxy-0.1.6
     app.kubernetes.io/name: easyhaproxy
     app.kubernetes.io/instance: ingress
-    app.kubernetes.io/version: "4.3.0"
+    app.kubernetes.io/version: "4.3.1-rc1"
     app.kubernetes.io/managed-by: Helm
 rules:
 - apiGroups:
@@ -85,10 +85,10 @@ metadata:
   name: ingress-easyhaproxy
   namespace: easyhaproxy
   labels:
-    helm.sh/chart: easyhaproxy-0.1.5
+    helm.sh/chart: easyhaproxy-0.1.6
     app.kubernetes.io/name: easyhaproxy
     app.kubernetes.io/instance: ingress
-    app.kubernetes.io/version: "4.3.0"
+    app.kubernetes.io/version: "4.3.1-rc1"
     app.kubernetes.io/managed-by: Helm
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -107,10 +107,10 @@ metadata:
   name: ingress-easyhaproxy
   namespace: easyhaproxy
   labels:
-    helm.sh/chart: easyhaproxy-0.1.5
+    helm.sh/chart: easyhaproxy-0.1.6
     app.kubernetes.io/name: easyhaproxy
     app.kubernetes.io/instance: ingress
-    app.kubernetes.io/version: "4.3.0"
+    app.kubernetes.io/version: "4.3.1-rc1"
     app.kubernetes.io/managed-by: Helm
   annotations:
     {}
@@ -139,10 +139,10 @@ metadata:
   name: ingress-easyhaproxy
   namespace: easyhaproxy
   labels:
-    helm.sh/chart: easyhaproxy-0.1.5
+    helm.sh/chart: easyhaproxy-0.1.6
     app.kubernetes.io/name: easyhaproxy
     app.kubernetes.io/instance: ingress
-    app.kubernetes.io/version: "4.3.0"
+    app.kubernetes.io/version: "4.3.1-rc1"
     app.kubernetes.io/managed-by: Helm
 spec:
   selector:
@@ -171,7 +171,7 @@ spec:
         - name: easyhaproxy
           securityContext:
             {}
-          image: "byjg/easy-haproxy:4.3.0"
+          image: "byjg/easy-haproxy:4.3.1-rc1"
           imagePullPolicy: Always
           ports:
             - name: http

docs/docker.md

@@ -10,7 +10,7 @@ If not, EasyHAProxy will connect the container with the EasyHAProxy network.
 e.g.:
 
 ```bash
-docker create network easyhaproxy
+docker network create easyhaproxy
 ```
 
 And then run the EasyHAProxy

docs/kubernetes.md

@@ -36,7 +36,7 @@ kubectl label nodes node-01 "easyhaproxy/node=master"
 kubectl create namespace easyhaproxy
 
 kubectl apply -f \
-    https://raw.githubusercontent.com/byjg/docker-easy-haproxy/4.3.0/deploy/kubernetes/easyhaproxy-daemonset.yml
+    https://raw.githubusercontent.com/byjg/docker-easy-haproxy/4.3.1-rc1/deploy/kubernetes/easyhaproxy-daemonset.yml
 ```
 
 If necessary, you can configure environment variables. To get a list of the variables, please follow the [docker container environment](docker-environment.md)

docs/microk8s.md

@@ -4,17 +4,36 @@ Microk8s is a lightweight Kubernetes distribution that can run on a single machi
 You can add custom addons to your Microk8s installation.
 Here are the steps to install EasyHAProxy on your Microk8s.
 
-## Installing ByJG repository
+## Enabling EasyHAProxy on MicroK8s
 
-Before install the addons, you need to add the ByJG repository to your Microk8s installation.
+EasyHAProxy is being part of official MicroK8s Community edition since MicroK8s version 1.27.
 
-1. Access the microk8s host machine and run:
+Just enable the community add-on
+
+```
+microk8s enable community
+```
+
+and you'll see:
+
+```
+$ microk8s status
+
+microk8s is running
+...
+addons:
+  ...
+  disabled:
+    easyhaproxy          # (community) EasyHAProxy can detect and configure HAProxy automatically based on ingress labels
+```
+
+However, if you are using MicroK8s before 1.27 you need to enable it directly from the ByJG repository by accessing the microk8s host machine and run:
 
 ```shell
 microk8s addons repo add byjg https://github.com/byjg/microk8s-addons.git
 ```
 
-2. Check if it is installed:
+And you should see:
 
 ```text
 $ microk8s status
@@ -30,7 +49,7 @@ addons:
 
 ## Installing EasyHAProxy addon
 
-EasyHAProxy can detect and configure HAProxy automatically based on ingress labels.
+Once you have enable the EasyHAProxy from the community repository or from ByJG repository and can enable it by running:
 
 Usage:
 
@@ -46,6 +65,8 @@ Install as a NodePort
 microk8s enable easyhaproxy --nodeport
 ```
 
+**Remember**: you need to disable any ingress controller you have previously installed, for example, nginx, traefik, etc. before install EasyHaProxy.
+
 For more parameters you can refer to the [Kubernetes](kubernetes.md) page.
 
 ----

docs/swarm.md

@@ -11,7 +11,7 @@ If not, EasyHAProxy will connect the service with the EasyHAProxy service networ
 e.g.:
 
 ```bash
-docker create network easyhaproxy
+docker network create -d overlay easyhaproxy
 ```
 
 And then deploy the EasyHAProxy stack:
@@ -79,6 +79,8 @@ networks:
     external: true
 ```
 
+Note: The services to be discovered **don't need** to be in the same network as EasyHAProxy is. 
+
 Once the container is running, EasyHAProxy will detect automatically and start to redirect all traffic from `example.org:80` to your container.
 
 You don't need to expose any port in your container.

helm/easyhaproxy/Chart.yaml

@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.5
+version: 0.1.6
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "4.3.0"
+appVersion: "4.3.1-rc1"