updates to helm files

Signed-off-by: Neil South <[email protected]>
Project-MONAI · Sep 5, 2022 · 87b6529 · 87b6529
1 parent 6e4a1e9
commit 87b6529
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 6 deletions.
diff --git a/deploy/helm/Gateway.yaml b/deploy/helm/Gateway.yaml
@@ -16,7 +16,10 @@ replicaCount: 1
 image:
   repository: registry.gitlab.com/answerdigital/londonai/aide/workflow-manager-images/infomatics-gateway
   pullPolicy: IfNotPresent
-  tag: 2022-08-01
+  tag: 2022-08-30-01
+
+imagePullSecrets:
+ - name: gitlab-image-pull
 
 enviromentVariables:
   InformaticsGateway__messaging__publisherSettings__endpoint: "rabbitmq-monai"
@@ -29,6 +32,8 @@ enviromentVariables:
   InformaticsGateway__storage__settings__accessKey: "rootminio"
   InformaticsGateway__storage__settings__accessToken: "rootminio"
   InformaticsGateway__dicom__scp__rejectUnknownSources: false
+  Kestrel__EndPoints__Http__Url: "http://::5000"
+  InformaticsGateway__storage__watermarkPercent: 95
 
 
 service:

diff --git a/deploy/helm/MTM.yaml b/deploy/helm/MTM.yaml
@@ -0,0 +1,54 @@
+# Copyright 2022 MONAI Consortium
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+replicaCount: 1
+
+image:
+  repository: registry.gitlab.com/answerdigital/londonai/aide/workflow-manager-images/task-manager
+  pullPolicy: IfNotPresent
+  tag: 2022-08-22-02
+
+imagePullSecrets:
+ - name: gitlab-image-pull
+
+enviromentVariables:
+  WorkflowManager__storage__settings__endpoint: "minio.monai:9000"
+  WorkflowManager__storage__settings__accessKey: "rootminio"
+  WorkflowManager__storage__settings__accessToken: "rootminio"
+  WorkflowManager__storage__settings__executableLocation: "mc"
+  WorkflowManager__messaging__publisherSettings__endpoint: "rabbitmq.monai"
+  WorkflowManager__messaging__subscriberSettings__endpoint: "rabbitmq.monai"
+
+enviromentVariablesFromSecrets:
+  secrets:
+    - name: WorkflowManager__messaging__subscriberSettings__username
+      secretName: rabbit-secret-master
+      secretKey: username
+    - name: WorkflowManager__messaging__subscriberSettings__password
+      secretName: rabbit-secret-master
+      secretKey: password
+    - name: WorkflowManager__messaging__publisherSettings__username
+      secretName: rabbit-secret-master
+      secretKey: username
+    - name: WorkflowManager__messaging__publisherSettings__password
+      secretName: rabbit-secret-master
+      secretKey: password
+
+service:
+  type: ClusterIP
+  port: 5000
+
+
+
+
diff --git a/deploy/helm/MWM.yaml b/deploy/helm/MWM.yaml
@@ -27,9 +27,10 @@ enviromentVariables:
   WorkflowManager__storage__settings__accessKey: "rootminio"
   WorkflowManager__storage__settings__accessToken: "rootminio"
   WorkflowManager__storage__settings__executableLocation: "mc"
-  WorkflowManager__messaging__publisherSettings__endpoint: "rabbitmq.monai"
-  WorkflowManager__messaging__subscriberSettings__endpoint: "rabbitmq.monai"
+  WorkflowManager__messaging__publisherSettings__endpoint: "rabbitmq-monai.monai"
+  WorkflowManager__messaging__subscriberSettings__endpoint: "rabbitmq-monai.monai"
   WorkloadManagerDatabase__ConnectionString: "mongodb://root:[email protected]:27017"
+  Kestrel__EndPoints__Http__Url: "http://::5000"
 
 enviromentVariablesFromSecrets:
   secrets:

diff --git a/deploy/helm/templates/deployment.yaml b/deploy/helm/templates/deployment.yaml
@@ -63,7 +63,7 @@ spec:
               value: {{ $value | quote }}
               {{- end }}
 
-              {{- range .Values.enviromentVariablesFromSecrets.secrets }}
+              {{- range (.Values.enviromentVariablesFromSecrets).secrets }}
             - name: {{ .name }}
               valueFrom:
                 secretKeyRef:

diff --git a/deploy/helm/templates/volume.yml b/deploy/helm/templates/volume.yml
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-{{- if .Values.volumeMounts -}}
+{{- if .Values.volumeMounts }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:

diff --git a/deploy/helm/templates/volumeclaim.yml b/deploy/helm/templates/volumeclaim.yml
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-{{- if .Values.volumeMounts -}}
+{{- if .Values.volumeMounts }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata: