RELEASE/MINOR: kubernetes-ingress: Tag release 1.15.1.

RELEASE/MINOR: haproxy: Tag release 1.3.0.
BUILD: VCS: Rename master to main branch.
BUILD: CI: update Chart Releaser, Kind and Helm to respective latest
versions.

Changes in kubernetes-ingress:
- Use Ingress Controller 1.6.1 version for base image

Changes in haproxy:
- Use 2.4.0 for base HAProxy CE image

Signed-off-by: Dinko Korunic <[email protected]>

Author: dkorunic

.circleci/config.yml

@@ -62,4 +62,4 @@ workflows:
             tags:
               ignore: /.*/
             branches:
-              only: master
+              only: main

.circleci/install_charts.sh

@@ -5,7 +5,7 @@ set -o nounset
 set -o pipefail
 
 readonly CT_VERSION=latest
-readonly KIND_VERSION=v0.9.0
+readonly KIND_VERSION=v0.11.0
 readonly CLUSTER_NAME=chart-testing
 readonly REPO_ROOT="${REPO_ROOT:-$(git rev-parse --show-toplevel)}"
 

.circleci/install_tools.sh

@@ -2,8 +2,8 @@
 
 set -o errexit
 
-readonly HELM_VERSION=3.0.1
-readonly CHART_RELEASER_VERSION=0.2.3
+readonly HELM_VERSION=3.5.4
+readonly CHART_RELEASER_VERSION=1.2.1
 
 install_helm() {
     echo "Installing Helm"

CONTRIBUTING.md

@@ -68,22 +68,22 @@ $ git commit -s -m 'This is my commit message'
 1. Remember to sign off your commits as described above.
 1. Submit a pull request.
 
-***NOTE***: In order to make testing and merging of PRs easier, please submit changes to multiple charts in separate PRs.
+**_NOTE_**: In order to make testing and merging of PRs easier, please submit changes to multiple charts in separate PRs.
 
 ### Technical Requirements
 
-* Must pass linting and installing with the [chart-testing](https://github.com/helm/chart-testing) tool
-* Must follow [best practices](https://github.com/helm/helm/tree/master/docs/chart_best_practices) and [review guidelines](https://github.com/helm/charts/blob/master/REVIEW_GUIDELINES.md)
+- Must pass linting and installing with the [chart-testing](https://github.com/helm/chart-testing) tool
+- Must follow [best practices](https://helm.sh/docs/chart_best_practices/) and [review guidelines](https://github.com/helm/charts/blob/master/REVIEW_GUIDELINES.md)
 
 ### Documentation Requirements
 
-* A chart's `README.md` must include configuration options
-* A chart's `NOTES.txt` must include relevant post-installation information
+- A chart's `README.md` must include configuration options
+- A chart's `NOTES.txt` must include relevant post-installation information
 
 ### Merge Approval and Release Process
 
-* Must pass DCO check
-* Must pass CI jobs for linting and installing changed charts
-* Any change to a chart requires a version bump following [semver](https://semver.org/) principles
+- Must pass DCO check
+- Must pass CI jobs for linting and installing changed charts
+- Any change to a chart requires a version bump following [semver](https://semver.org/) principles
 
 Once changes have been merged, the release job will automatically run to package and release changed charts.

README.md

@@ -3,7 +3,7 @@
 ## HAProxy Helm Charts
 
 ![GitHub](https://img.shields.io/github/license/haproxytech/helm-charts)
-[![CircleCI](https://circleci.com/gh/haproxytech/helm-charts/tree/master.svg?style=svg)](https://circleci.com/gh/haproxytech/helm-charts/tree/master)
+[![CircleCI](https://circleci.com/gh/haproxytech/helm-charts/tree/main.svg?style=svg)](https://circleci.com/gh/haproxytech/helm-charts/tree/main)
 
 This repository hosts official [HAProxy Technologies](https://www.haproxy.com/) Helm Charts for deploying on [Kubernetes](https://kubernetes.io/).
 
@@ -35,16 +35,8 @@ helm search repo haproxytech/
 helm install my-release haproxytech/<chart>
 ```
 
-***NOTE***: For instructions on how to install a chart follow instructions in its `README.md`.
+**_NOTE_**: For instructions on how to install a chart follow instructions in its `README.md`.
 
 ## Contributing
 
 We welcome all contributions. Please refer to [guidelines](CONTRIBUTING.md) on how to make a contribution.
-
-
-
-
-
-
-
-

haproxy/Chart.yaml

@@ -14,16 +14,16 @@
 
 apiVersion: v1
 name: haproxy
-version: 1.2.0
+version: 1.3.0
 kubeVersion: ">=1.12.0-0"
 description: A Helm chart for HAProxy on Kubernetes
 keywords:
   - haproxy
-home: https://github.com/haproxytech/helm-charts/tree/master/haproxy
+home: https://github.com/haproxytech/helm-charts/tree/main/haproxy
 sources:
   - http://www.haproxy.org/
 icon: http://www.haproxy.org/img/HAProxyCommunityEdition_60px.png
 maintainers:
   - name: Dinko Korunic
     email: [email protected]
-appVersion: 2.3.9
+appVersion: 2.4.0

haproxy/README.md

@@ -4,7 +4,7 @@
 
 ## Introduction
 
-This chart bootstraps an HAProxy load balancer as deployment/daemonset on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. As oposed to [HAProxy Kubernetes Ingress Controller](https://github.com/haproxytech/helm-charts/tree/master/kubernetes-ingress) Chart, HAProxy is installed as a regular application and not as an Ingress Controller.
+This chart bootstraps an HAProxy load balancer as deployment/daemonset on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. As oposed to [HAProxy Kubernetes Ingress Controller](https://github.com/haproxytech/helm-charts/tree/main/kubernetes-ingress) Chart, HAProxy is installed as a regular application and not as an Ingress Controller.
 
 ### Prerequisites
 
@@ -34,13 +34,13 @@ helm repo update
 
 ## Install the chart
 
-To install the chart with Helm v3 as *my-release* deployment:
+To install the chart with Helm v3 as _my-release_ deployment:
 
 ```console
 helm install my-release haproxytech/haproxy
 ```
 
-***NOTE***: To install the chart with Helm v2 (legacy Helm) the syntax requires adding deployment name to `--name` parameter:
+**_NOTE_**: To install the chart with Helm v2 (legacy Helm) the syntax requires adding deployment name to `--name` parameter:
 
 ```console
 helm install haproxytech/haproxy \
@@ -58,9 +58,9 @@ helm install haproxytech/haproxy \
 
 ### Installing from a private registry
 
-To install the chart using a private registry for HAProxy (for instance to use a HAPEE image) into a separate namespace *prod*.
+To install the chart using a private registry for HAProxy (for instance to use a HAPEE image) into a separate namespace _prod_.
 
-***NOTE***: Helm v3 requires namespace to be precreated (eg. with ```kubectl create namespace prod```)
+**_NOTE_**: Helm v3 requires namespace to be precreated (eg. with `kubectl create namespace prod`)
 
 ```console
 helm install my-haproxy haproxytech/haproxy  \
@@ -90,7 +90,7 @@ helm install my-haproxy2 haproxytech/haproxy \
   --set kind=DaemonSet
 ```
 
-***NOTE***: With helm `--set` it is needed to put quotes and escape dots in the annotation key and commas in the value string.
+**_NOTE_**: With helm `--set` it is needed to put quotes and escape dots in the annotation key and commas in the value string.
 
 ### Installing with Horizontal Pod Autoscaler
 
@@ -104,7 +104,7 @@ helm install my-haproxy3 haproxytech/haproxy \
   --set autoscaling.targetCPUUtilizationPercentage=80
 ```
 
-***NOTE***: Make sure to look into other tunable values for HPA documented in [values.yaml](values.yaml).
+**_NOTE_**: Make sure to look into other tunable values for HPA documented in [values.yaml](values.yaml).
 
 ### Installing with service annotations
 
@@ -118,13 +118,13 @@ helm install my-haproxy4 haproxytech/haproxy \
   --set service.annotations."service\.beta\.kubernetes\.io/aws-load-balancer-cross-zone-load-balancing-enabled"="true"
 ```
 
-***NOTE***: With helm `--set` it is needed to put quotes and escape dots in the annotation key and commas in the value string.
+**_NOTE_**: With helm `--set` it is needed to put quotes and escape dots in the annotation key and commas in the value string.
 
 ### Using values from YAML file
 
 As opposed to using many `--set` invocations, much simpler approach is to define value overrides in a separate YAML file and specify them when invoking Helm:
 
-*mylb.yaml*:
+_mylb.yaml_:
 
 ```yaml
 kind: DaemonSet
@@ -146,7 +146,7 @@ config: |
 service:
   type: LoadBalancer
   annotations:
-    service.beta.kubernetes.io/aws-load-balancer-cross-zone-load-balancing-enabled: 'true'
+    service.beta.kubernetes.io/aws-load-balancer-cross-zone-load-balancing-enabled: "true"
     service.beta.kubernetes.io/aws-load-balancer-internal: 0.0.0.0/0
 ```
 
@@ -160,7 +160,7 @@ helm install my-haproxy5 -f mylb.yml haproxytech/haproxy
 
 In order to e.g. support SSL certificates, you can mount additional volumes from secrets:
 
-*mylb.yaml*:
+_mylb.yaml_:
 
 ```yaml
 service:
@@ -240,15 +240,15 @@ initContainers:
 
 ## Upgrading the chart
 
-To upgrade the *my-release* deployment:
+To upgrade the _my-release_ deployment:
 
 ```console
 helm upgrade my-release haproxytech/haproxy
 ```
 
 ## Uninstalling the chart
 
-To uninstall/delete the *my-release* deployment:
+To uninstall/delete the _my-release_ deployment:
 
 ```console
 helm delete my-release

haproxy/templates/NOTES.txt

@@ -45,6 +45,6 @@ Node IP can be found with:
   $ kubectl --namespace {{ .Release.Namespace }} get nodes -o jsonpath="{.items[0].status.addresses[1].address}"
 
 For more examples and up to date documentation, please visit:
-  * Helm chart documentation: https://github.com/haproxytech/helm-charts/tree/master/haproxy
+  * Helm chart documentation: https://github.com/haproxytech/helm-charts/tree/main/haproxy
   * HAProxy Alpine Docker container documentation: https://github.com/haproxytech/haproxy-docker-alpine
   * HAProxy documentation: https://www.haproxy.org/download/2.2/doc/configuration.txt

kubernetes-ingress/Chart.yaml

@@ -14,13 +14,13 @@
 
 apiVersion: v1
 name: kubernetes-ingress
-version: 1.15.0
+version: 1.15.1
 kubeVersion: ">=1.12.0-0"
 description: A Helm chart for HAProxy Kubernetes Ingress Controller
 keywords:
   - ingress
   - haproxy
-home: https://github.com/haproxytech/helm-charts/tree/master/kubernetes-ingress
+home: https://github.com/haproxytech/helm-charts/tree/main/kubernetes-ingress
 sources:
   - https://github.com/haproxytech/kubernetes-ingress
 icon: http://www.haproxy.org/img/HAProxyCommunityEdition_60px.png
@@ -31,4 +31,4 @@ maintainers:
     email: [email protected]
   - name: Dinko Korunic
     email: [email protected]
-appVersion: 1.6.0
+appVersion: 1.6.1

kubernetes-ingress/templates/NOTES.txt

@@ -58,7 +58,7 @@ In case that you are using multi-ingress controller environment, make sure to us
 with helm chart option controller.ingressClass.
 
 For more examples and up to date documentation, please visit:
-  * Helm chart documentation: https://github.com/haproxytech/helm-charts/tree/master/kubernetes-ingress
+  * Helm chart documentation: https://github.com/haproxytech/helm-charts/tree/main/kubernetes-ingress
   * Controller documentation: https://www.haproxy.com/documentation/hapee/2-0r1/traffic-management/kubernetes-ingress-controller/
   * Annotation reference: https://github.com/haproxytech/kubernetes-ingress/tree/master/documentation
   * Image parameters reference: https://github.com/haproxytech/kubernetes-ingress/blob/master/documentation/controller.md