notifier + prefixtree deployments

dynexo · Nov 26, 2020 · 1c504c2 · 1c504c2
1 parent 94825d8
commit 1c504c2
Show file tree

Hide file tree

Showing 10 changed files with 187 additions and 0 deletions.
diff --git a/artemis-chart/templates/notifier-deployment.yaml b/artemis-chart/templates/notifier-deployment.yaml
@@ -0,0 +1,83 @@
+apiVersion: {{ template "artemis.deployment.apiVersion" . }}
+kind: Deployment
+metadata:
+  labels:
+    app: {{ .Release.Name }}-notifier
+{{ include "artemis.labels" . | indent 4 }}
+  name: {{ .Release.Name }}-notifier
+spec:
+  selector:
+    matchLabels:
+      app: {{ .Release.Name }}-notifier
+  replicas: {{ .Values.replicaCount | default 1 }}
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      creationTimestamp: null
+      labels:
+        app: {{ .Release.Name }}-notifier
+      annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+    spec:
+      initContainers:
+      - name: populate-pvc
+        image: busybox
+        volumeMounts:
+        - mountPath: /configmaps
+          name: notifier-configmap
+        - mountPath: /pvc
+          name: notifier-pvc
+          subPath: configs
+        command: ['sh', '-c', 'false | cp -i /configmaps/logging.yaml /pvc/ 2> /dev/null']
+      - name: wait-for-rmq
+        image: busybox
+        command: ['sh', '-c', 'until nc -z {{ .Release.Name }}-{{ .Values.rabbitmqHost }}-svc {{ .Values.rabbitmqPort }}; do echo waiting for services; sleep 10; done;']
+      containers:
+      - env:
+        - name: RABBITMQ_HOST
+          valueFrom:
+            configMapKeyRef:
+              name: {{ .Release.Name }}-configmap
+              key: rabbitmqHost
+        - name: RABBITMQ_PASS
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Release.Name }}-secret
+              key: rabbitmqPass
+        - name: RABBITMQ_PORT
+          valueFrom:
+            configMapKeyRef:
+              name: {{ .Release.Name }}-configmap
+              key: rabbitmqPort
+        - name: RABBITMQ_USER
+          valueFrom:
+            configMapKeyRef:
+              name: {{ .Release.Name }}-configmap
+              key: rabbitmqUser
+        - name: REST_PORT
+          valueFrom:
+            configMapKeyRef:
+              name: {{ .Release.Name }}-configmap
+              key: restPort
+        image: inspiregroup/artemis-notifier:{{ .Values.systemVersion }}
+        imagePullPolicy: Always
+        name: notifier
+        resources: {}
+        volumeMounts:
+        - mountPath: /etc/artemis/logging.yaml
+          name: notifier-pvc
+          subPath: configs/logging.yaml
+      restartPolicy: Always
+      volumes:
+      - configMap:
+          name: {{ .Release.Name }}-volumes
+        name: notifier-configmap
+      - persistentVolumeClaim:
+          claimName: {{ .Release.Name }}-notifier-pvc
+        name: notifier-pvc
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | nindent 8 }}
+      {{- end }}
+status: {}
diff --git a/artemis-chart/templates/prefixtree-deployment.yaml b/artemis-chart/templates/prefixtree-deployment.yaml
@@ -0,0 +1,96 @@
+apiVersion: {{ template "artemis.deployment.apiVersion" . }}
+kind: Deployment
+metadata:
+  labels:
+    app: {{ .Release.Name }}-prefixtree
+{{ include "artemis.labels" . | indent 4 }}
+  name: {{ .Release.Name }}-prefixtree
+spec:
+  selector:
+    matchLabels:
+      app: {{ .Release.Name }}-prefixtree
+  replicas: {{ .Values.replicaCount | default 1 }}
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      creationTimestamp: null
+      labels:
+        app: {{ .Release.Name }}-prefixtree
+      annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+    spec:
+      initContainers:
+      - name: populate-pvc
+        image: busybox
+        volumeMounts:
+        - mountPath: /configmaps
+          name: prefixtree-configmap
+        - mountPath: /pvc
+          name: prefixtree-pvc
+          subPath: configs
+        command: ['sh', '-c', 'false | cp -i /configmaps/logging.yaml /pvc/ 2> /dev/null']
+      - name: wait-for-rmq
+        image: busybox
+        command: ['sh', '-c', 'until nc -z {{ .Release.Name }}-{{ .Values.rabbitmqHost }}-svc {{ .Values.rabbitmqPort }}; do echo waiting for services; sleep 10; done;']
+      - name: wait-for-redis
+        image: busybox
+        command: [ 'sh', '-c', 'until nc -z {{ .Release.Name }}-{{ .Values.redisHost }}-svc {{ .Values.redisPort }}; do echo waiting for services; sleep 10; done;' ]
+      containers:
+      - env:
+        - name: RABBITMQ_HOST
+          valueFrom:
+            configMapKeyRef:
+              name: {{ .Release.Name }}-configmap
+              key: rabbitmqHost
+        - name: RABBITMQ_PASS
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Release.Name }}-secret
+              key: rabbitmqPass
+        - name: RABBITMQ_PORT
+          valueFrom:
+            configMapKeyRef:
+              name: {{ .Release.Name }}-configmap
+              key: rabbitmqPort
+        - name: RABBITMQ_USER
+          valueFrom:
+            configMapKeyRef:
+              name: {{ .Release.Name }}-configmap
+              key: rabbitmqUser
+        - name: REDIS_HOST
+          valueFrom:
+            configMapKeyRef:
+              name: {{ .Release.Name }}-configmap
+              key: redisHost
+        - name: REDIS_PORT
+          valueFrom:
+            configMapKeyRef:
+              name: {{ .Release.Name }}-configmap
+              key: redisPort
+        - name: REST_PORT
+          valueFrom:
+            configMapKeyRef:
+              name: {{ .Release.Name }}-configmap
+              key: restPort
+        image: inspiregroup/artemis-prefixtree:{{ .Values.systemVersion }}
+        imagePullPolicy: Always
+        name: prefixtree
+        resources: {}
+        volumeMounts:
+        - mountPath: /etc/artemis/logging.yaml
+          name: prefixtree-pvc
+          subPath: configs/logging.yaml
+      restartPolicy: Always
+      volumes:
+      - configMap:
+          name: {{ .Release.Name }}-volumes
+        name: prefixtree-configmap
+      - persistentVolumeClaim:
+          claimName: {{ .Release.Name }}-prefixtree-pvc
+        name: prefixtree-pvc
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | nindent 8 }}
+      {{- end }}
+status: {}
diff --git a/docker-compose.benchmark.yaml b/docker-compose.benchmark.yaml
@@ -339,6 +339,7 @@ services:
             - artemis
         environment:
             HIJACK_LOG_FILTER: ${HIJACK_LOG_FILTER}
+            HIJACK_LOG_FIELDS: ${HIJACK_LOG_FIELDS}
             RABBITMQ_USER: ${RABBITMQ_USER}
             RABBITMQ_PASS: ${RABBITMQ_PASS}
             RABBITMQ_HOST: ${RABBITMQ_HOST}

diff --git a/docker-compose.testautoconf.yaml b/docker-compose.testautoconf.yaml
@@ -351,6 +351,7 @@ services:
             - artemis
         environment:
             HIJACK_LOG_FILTER: ${HIJACK_LOG_FILTER}
+            HIJACK_LOG_FIELDS: ${HIJACK_LOG_FIELDS}
             RABBITMQ_USER: ${RABBITMQ_USER}
             RABBITMQ_PASS: ${RABBITMQ_PASS}
             RABBITMQ_HOST: ${RABBITMQ_HOST}

diff --git a/docker-compose.testautoignore.yaml b/docker-compose.testautoignore.yaml
@@ -351,6 +351,7 @@ services:
             - artemis
         environment:
             HIJACK_LOG_FILTER: ${HIJACK_LOG_FILTER}
+            HIJACK_LOG_FIELDS: ${HIJACK_LOG_FIELDS}
             RABBITMQ_USER: ${RABBITMQ_USER}
             RABBITMQ_PASS: ${RABBITMQ_PASS}
             RABBITMQ_HOST: ${RABBITMQ_HOST}

diff --git a/docker-compose.testdetection.yaml b/docker-compose.testdetection.yaml
@@ -351,6 +351,7 @@ services:
             - artemis
         environment:
             HIJACK_LOG_FILTER: ${HIJACK_LOG_FILTER}
+            HIJACK_LOG_FIELDS: ${HIJACK_LOG_FIELDS}
             RABBITMQ_USER: ${RABBITMQ_USER}
             RABBITMQ_PASS: ${RABBITMQ_PASS}
             RABBITMQ_HOST: ${RABBITMQ_HOST}

diff --git a/docker-compose.testrpki.yaml b/docker-compose.testrpki.yaml
@@ -351,6 +351,7 @@ services:
             - artemis
         environment:
             HIJACK_LOG_FILTER: ${HIJACK_LOG_FILTER}
+            HIJACK_LOG_FIELDS: ${HIJACK_LOG_FIELDS}
             RABBITMQ_USER: ${RABBITMQ_USER}
             RABBITMQ_PASS: ${RABBITMQ_PASS}
             RABBITMQ_HOST: ${RABBITMQ_HOST}

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -326,6 +326,7 @@ services:
             - artemis
         environment:
             HIJACK_LOG_FILTER: ${HIJACK_LOG_FILTER}
+            HIJACK_LOG_FIELDS: ${HIJACK_LOG_FIELDS}
             RABBITMQ_USER: ${RABBITMQ_USER}
             RABBITMQ_PASS: ${RABBITMQ_PASS}
             RABBITMQ_HOST: ${RABBITMQ_HOST}

diff --git a/other/docker-compose.testcafe.yaml b/other/docker-compose.testcafe.yaml
@@ -300,6 +300,7 @@ services:
             - artemis
         environment:
             HIJACK_LOG_FILTER: ${HIJACK_LOG_FILTER}
+            HIJACK_LOG_FIELDS: ${HIJACK_LOG_FIELDS}
             RABBITMQ_USER: ${RABBITMQ_USER}
             RABBITMQ_PASS: ${RABBITMQ_PASS}
             RABBITMQ_HOST: ${RABBITMQ_HOST}

diff --git a/vagrant-vm/vagrant-docker-compose.yaml b/vagrant-vm/vagrant-docker-compose.yaml
@@ -298,6 +298,7 @@ services:
             - artemis
         environment:
             HIJACK_LOG_FILTER: ${HIJACK_LOG_FILTER}
+            HIJACK_LOG_FIELDS: ${HIJACK_LOG_FIELDS}
             RABBITMQ_USER: ${RABBITMQ_USER}
             RABBITMQ_PASS: ${RABBITMQ_PASS}
             RABBITMQ_HOST: ${RABBITMQ_HOST}