Merge branch 'main' of github.com:SpecterOps/Nemesis

SpecterOps · Apr 25, 2024 · 0f720ce · 0f720ce
2 parents a696f34 + a31b1aa
commit 0f720ce
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/helm/nemesis/templates/nlp.yaml b/helm/nemesis/templates/nlp.yaml
@@ -18,6 +18,21 @@ spec:
         app: nlp
         component: enrichment-pipeline
     spec:
+      initContainers:
+        - name: init-nlp-rabbitmq
+          image: busybox:1.36.1
+          env:
+            - name: RABBITMQ_USER
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.rabbitmq.existingSecret }}
+                  key: rabbitmq-admin-user
+            - name: RABBITMQ_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.rabbitmq.existingSecret }}
+                  key: rabbitmq-admin-password
+          command: ['sh', '-c', 'until wget "http://$RABBITMQ_USER:$RABBITMQ_PASSWORD@nemesis-rabbitmq-svc.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.cluster.local:15672/rabbitmq/api/aliveness-test/%2F"; do echo waiting for rabbitmq; sleep 2; done;']
       containers:
         - env:
             - name: ENVIRONMENT

diff --git a/helm/nemesis/templates/passwordcracker.yaml b/helm/nemesis/templates/passwordcracker.yaml
@@ -20,7 +20,6 @@ spec:
       initContainers:
         - name: init-passwordcracker-rabbitmq
           image: busybox:1.36.1
-          command: ['sh', '-c', 'until wget "http://$RABBITMQ_USER:$RABBITMQ_PASSWORD@nemesis-rabbitmq-svc.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.cluster.local:15672/rabbitmq/api/aliveness-test/%2F"; do echo waiting for rabbitmq; sleep 2; done;']
           env:
             - name: RABBITMQ_USER
               valueFrom:
@@ -32,6 +31,7 @@ spec:
                 secretKeyRef:
                   name: {{ .Values.rabbitmq.existingSecret }}
                   key: rabbitmq-admin-password
+          command: ['sh', '-c', 'until wget "http://$RABBITMQ_USER:$RABBITMQ_PASSWORD@nemesis-rabbitmq-svc.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.cluster.local:15672/rabbitmq/api/aliveness-test/%2F"; do echo waiting for rabbitmq; sleep 2; done;']
         - name: init-passwordcracker-postgres
           image: "{{ .Values.nemesisWaiter.image.repository }}:{{ .Values.nemesisWaiter.image.tag }}"
           imagePullPolicy: {{ .Values.nemesisWaiter.image.pullPolicy }}