From 404b9fb8546be8c2e3079c0d6e531a2d8e686587 Mon Sep 17 00:00:00 2001
From: Byron Mansfield <byron@byronmansfield.com>
Date: Wed, 6 Nov 2024 14:47:39 -0800
Subject: [PATCH] Updates locust version, adds fix for web-login, adds ability
 to pass reserved ip to load balancer service

---
 stable/locust/Chart.yaml                       | 4 ++--
 stable/locust/README.md                        | 5 +++--
 stable/locust/templates/master-deployment.yaml | 4 ++++
 stable/locust/templates/master-service.yaml    | 3 +++
 stable/locust/values.yaml                      | 3 ++-
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/stable/locust/Chart.yaml b/stable/locust/Chart.yaml
index f4b8e57a..8e0e2e32 100644
--- a/stable/locust/Chart.yaml
+++ b/stable/locust/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: locust
-version: "0.31.6"
-appVersion: 2.15.1
+version: "0.31.7"
+appVersion: 2.32.1
 home: https://github.com/locustio/locust
 icon: https://locust.io/static/img/logo.png
 maintainers:
diff --git a/stable/locust/README.md b/stable/locust/README.md
index a813cb91..be75a412 100644
--- a/stable/locust/README.md
+++ b/stable/locust/README.md
@@ -1,6 +1,6 @@
 # locust
 
-![Version: 0.31.6](https://img.shields.io/badge/Version-0.31.6-informational?style=flat-square) ![AppVersion: 2.15.1](https://img.shields.io/badge/AppVersion-2.15.1-informational?style=flat-square)
+![Version: 0.31.7](https://img.shields.io/badge/Version-0.31.7-informational?style=flat-square) ![AppVersion: 2.32.1](https://img.shields.io/badge/AppVersion-2.32.1-informational?style=flat-square)
 
 A chart to install Locust, a scalable load testing tool written in Python.
 
@@ -37,7 +37,7 @@ helm install --generate-name oci://ghcr.io/deliveryhero/helm-charts/locust
 To install a specific version of this chart:
 
 ```console
-helm install --generate-name oci://ghcr.io/deliveryhero/helm-charts/locust --version 0.31.6
+helm install --generate-name oci://ghcr.io/deliveryhero/helm-charts/locust --version 0.31.7
 ```
 
 To install the chart with the release name `my-release`:
@@ -120,6 +120,7 @@ helm install my-release oci://ghcr.io/deliveryhero/helm-charts/locust -f values.
 | securityContext | object | `{}` |  |
 | service.annotations | object | `{}` |  |
 | service.extraLabels | object | `{}` |  |
+| service.loadBalancerIP | string | `""` |  |
 | service.type | string | `"ClusterIP"` |  |
 | tolerations | list | `[]` |  |
 | worker.affinity | object | `{}` | Overwrites affinity from global |
diff --git a/stable/locust/templates/master-deployment.yaml b/stable/locust/templates/master-deployment.yaml
index 689329c9..e1093047 100644
--- a/stable/locust/templates/master-deployment.yaml
+++ b/stable/locust/templates/master-deployment.yaml
@@ -61,8 +61,12 @@ spec:
           - --headless
 {{- end }}
 {{- if .Values.master.auth.enabled }}
+{{- if or (semverCompare ">=2.21.0" .Values.image.tag) (semverCompare ">=2.21.0" .Values.master.image.tag) (semverCompare ">=2.21.0" .Values.worker.image.tag)}}
+          - --web-login={{ .Values.master.auth.username }}:{{ .Values.master.auth.password }}
+{{ else }}
           - --web-auth={{ .Values.master.auth.username }}:{{ .Values.master.auth.password }}
 {{- end }}
+{{- end }}
 {{- if .Values.loadtest.tags }}
           - --tags {{ .Values.loadtest.tags }}
 {{- end }}
diff --git a/stable/locust/templates/master-service.yaml b/stable/locust/templates/master-service.yaml
index 592d66f0..716dae3a 100644
--- a/stable/locust/templates/master-service.yaml
+++ b/stable/locust/templates/master-service.yaml
@@ -11,6 +11,9 @@ metadata:
   {{- end }}
 spec:
   type: {{ .Values.service.type }}
+  {{- if and (eq .Values.service.type "LoadBalancer") (.Values.service.loadBalancerIP)}}
+  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
+  {{- end }}
   ports:
   - name: master-p1
     port: 5557
diff --git a/stable/locust/values.yaml b/stable/locust/values.yaml
index d6f73e38..638adaf6 100644
--- a/stable/locust/values.yaml
+++ b/stable/locust/values.yaml
@@ -38,13 +38,14 @@ loadtest:
 
 image:
   repository: locustio/locust
-  tag: 2.15.1
+  tag: 2.32.1
   pullPolicy: IfNotPresent
 
 service:
   type: ClusterIP
   annotations: {}
   extraLabels: {}
+  loadBalancerIP: ""
 
 master:
   # master.image -- A custom docker image including tag