Merge pull request #3 from DO-Solutions/lb-updates

Lb updates

Author: do-joe

helm/templates/frontend.yaml

@@ -149,28 +149,7 @@ spec:
     port: 80
     targetPort: 8080
 
-{{/*{{- if .Values.frontend.tls }}*/}}
-{{/*apiVersion: cert-manager.io/v1*/}}
-{{/*kind: Issuer*/}}
-{{/*metadata:*/}}
-{{/*  name: {{ .Values.frontend.name }}-external*/}}
-{{/*  namespace: {{ .Release.Namespace }}*/}}
-{{/*spec:*/}}
-{{/*  # ACME issuer configuration*/}}
-{{/*  # `email` - the email address to be associated with the ACME account (make sure it's a valid one)*/}}
-{{/*  # `server` - the URL used to access the ACME server’s directory endpoint*/}}
-{{/*  # `privateKeySecretRef` - Kubernetes Secret to store the automatically generated ACME account private key*/}}
-{{/*  acme:*/}}
-{{/*    email: <YOUR_VALID_EMAIL_ADDRESS_HERE>*/}}
-{{/*    server: https://acme-v02.api.letsencrypt.org/directory*/}}
-{{/*    privateKeySecretRef:*/}}
-{{/*      name: letsencrypt-{{ .Values.frontend.name }}-external-private-key*/}}
-{{/*    solvers:*/}}
-{{/*      # Use the HTTP-01 challenge provider*/}}
-{{/*      - http01:*/}}
-{{/*          ingress:*/}}
-{{/*            class: cilium*/}}
-{{/*{{- end }}*/}}
+
 {{- if .Values.devDeployment }}
 # Dev deployment: Expose via LoadBalancer Service
 ---

helm/templates/loadgenerator.yaml

@@ -95,7 +95,7 @@ spec:
         image: busybox:latest@sha256:37f7b378a29ceb4c551b1b5582e27747b855bbfaa73fa11914fe0df028dc581f
         env:
         - name: FRONTEND_ADDR
-          value: "{{ .Values.frontend.name }}:80"
+          value: "{{ default .Values.frontend.name .Values.frontend.fqdn }}"
       {{- end }}
       containers:
       - name: main

src/loadgenerator/Dockerfile

@@ -25,6 +25,8 @@ COPY requirements.txt .
 RUN pip install --prefix="/install" -r requirements.txt
 
 FROM base
+ENV USERS=10
+ENV RATE=1
 
 RUN apk update \
     && apk add --no-cache libstdc++ \
@@ -40,4 +42,6 @@ COPY locustfile.py .
 # enable gevent support in debugger
 ENV GEVENT_SUPPORT=True
 
-ENTRYPOINT locust --host="http://${FRONTEND_ADDR}" --headless -u "${USERS:-10}" -r "${RATE:-1}" 2>&1
+# Will automatically follow redirects in case HTTP -> HTTPS redirect in place
+ENTRYPOINT ["/bin/sh", "-c", "locust --host=\"http://$FRONTEND_ADDR\" --headless -u \"${USERS}\" -r \"${RATE}\""]
+

src/loadgenerator/locustfile.py

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 import random
-from locust import FastHttpUser, TaskSet, between
+from locust import HttpUser, TaskSet, between
 from faker import Faker
 import datetime
 fake = Faker()
@@ -87,6 +87,6 @@ def on_start(self):
         viewCart: 3,
         checkout: 1}
 
-class WebsiteUser(FastHttpUser):
+class WebsiteUser(HttpUser):
     tasks = [UserBehavior]
     wait_time = between(1, 10)