Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding https checks for HAproxy and Galera #494

Merged
merged 14 commits into from
Oct 2, 2023
+105 −6
Merged

Adding https checks for HAproxy and Galera #494

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
791c20f
adding https checks for HAproxy and Galera
Sep 11, 2023
b1dd7d0
script based check
Sep 15, 2023
16e8645
updating image
Sep 15, 2023
3de4fd7
updating helm chart logic
Sep 18, 2023
dcfae77
updating helm chart logic
Sep 18, 2023
03c438d
PR suggestions and fixes
Sep 25, 2023
1d81364
PR suggestions and fixes
Sep 25, 2023
aa25f98
fixing haproxy checkscript
Sep 26, 2023
4615470
bumbp helm version
Sep 26, 2023
1f8d136
fix docs/linter
Sep 26, 2023
7d66247
working solution, but problematic bash
Sep 27, 2023
8bd872e
script DASH compliant
Sep 27, 2023
003d76d
script DASH compliant
Sep 27, 2023
be46192
removing redundant error message
Sep 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ helm repo add appuio https://charts.appuio.ch
| [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/data-cube-curation-0.3.1/total)](https://github.com/appuio/charts/releases/tag/data-cube-curation-0.3.1) | [data-cube-curation](appuio/data-cube-curation/README.md) |
| [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/exoip-1.0.4/total)](https://github.com/appuio/charts/releases/tag/exoip-1.0.4) | [exoip](appuio/exoip/README.md) |
| [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/generic-0.1.2/total)](https://github.com/appuio/charts/releases/tag/generic-0.1.2) | [generic](appuio/generic/README.md) |
| [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/haproxy-2.3.1/total)](https://github.com/appuio/charts/releases/tag/haproxy-2.3.1) | [haproxy](appuio/haproxy/README.md) |
| [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/haproxy-2.3.2/total)](https://github.com/appuio/charts/releases/tag/haproxy-2.3.2) | [haproxy](appuio/haproxy/README.md) |
| [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/mariadb-galera-1.2.4/total)](https://github.com/appuio/charts/releases/tag/mariadb-galera-1.2.4) | [mariadb-galera](appuio/mariadb-galera/README.md) |
| [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/maxscale-2.0.1/total)](https://github.com/appuio/charts/releases/tag/maxscale-2.0.1) | [maxscale](appuio/maxscale/README.md) |
| [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/metrics-server-2.12.1/total)](https://github.com/appuio/charts/releases/tag/metrics-server-2.12.1) | [metrics-server](appuio/metrics-server/README.md) |
Expand Down
2 changes: 1 addition & 1 deletion appuio/haproxy/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
appVersion: 2.7.3
description: A Helm chart for HAProxy which can be customized by a config map.
name: haproxy
version: 2.3.1
version: 2.3.2
maintainers:
- name: APPUiO Team
email: [email protected]
2 changes: 1 addition & 1 deletion appuio/haproxy/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# haproxy

![Version: 2.3.1](https://img.shields.io/badge/Version-2.3.1-informational?style=flat-square) ![AppVersion: 2.7.3](https://img.shields.io/badge/AppVersion-2.7.3-informational?style=flat-square)
![Version: 2.3.2](https://img.shields.io/badge/Version-2.3.2-informational?style=flat-square) ![AppVersion: 2.7.3](https://img.shields.io/badge/AppVersion-2.7.3-informational?style=flat-square)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would set the version of the helm chart to 2.4.0.


A Helm chart for HAProxy which can be customized by a config map.

Expand Down
5 changes: 4 additions & 1 deletion appuio/haproxy/templates/configmap-galera.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ metadata:
data:
haproxy.cfg: |
global
tune.bufsize 300000 # 300k shoulb be fine, average prometheus response in 100 test queries was 244k
log stdout format raw local0
{{- include "haproxy.resolversConfig" . | nindent 4 }}

Expand All @@ -37,10 +38,12 @@ data:
backend galera-nodes
mode tcp
option srvtcpka
option httpchk GET /metrics
http-check expect string mysql_global_status_wsrep_ready\ 1
balance {{ $galera.balance }}
{{ if and $galera.check.enabled $galera.check.mysql.enabled }}option mysql-check user {{ $galera.check.mysql.user }}{{ end }}
default-server init-addr none {{ if $galera.check.enabled }}check {{ end }}resolvers mydns
{{- range $index, $node := .Values.haproxy.galera.nodes }}
server node-{{ $index }} {{ $node.address }}:{{ default "3306" $node.port }}{{ if $node.backup }} backup{{ end }}
server node-{{ $index }} {{ $node.address }}:{{ default "3306" $node.port }} check port 9104 {{ if $node.backup }} backup{{ end }}
{{- end }}
{{- end }}