Merge pull request #198 from icgc-argo/update-clinical-chart-1.1.5

Update clinical chart, add new version package, regenerate repo index
icgc-argo · Oct 20, 2023 · 781fd6f · 781fd6f
2 parents 80edc9d + ac371c0
commit 781fd6f
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 7 deletions.
diff --git a/clinical/Chart.yaml b/clinical/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: "1.0"
 description: A Helm chart for Argo clinical
 name: clinical
-version: 1.1.4
+version: 1.1.5
diff --git a/clinical/templates/ingress.yaml b/clinical/templates/ingress.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.ingress.enabled -}}
-{{- $svcPort := .Values.service.port -}}
-{{- $svcPortName := .Values.service.portName -}}
+#{{- $svcPort := .Values.service.clinical.port -}}
+#{{- $svcPortName := .Values.service.clinical.portName -}}
 {{- $fullName := include "clinical.fullname" . -}}
 {{- $ingressPaths := .Values.ingress.paths -}}
 {{- if semverCompare ">=1.19" .Capabilities.KubeVersion.Version -}}
@@ -51,10 +51,10 @@ spec:
               service:
                 name: {{ $fullName }}
                 port:
-                  name: {{ $svcPortName }}
+                  name: {{ .portName }}
               {{- else }}
               serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
+              servicePort: {{ .portName }}
               {{- end }}
           {{- end }}
     {{- end }}

diff --git a/clinical/templates/tests/test-connection.yaml b/clinical/templates/tests/test-connection.yaml
@@ -14,5 +14,5 @@ spec:
     - name: wget
       image: busybox
       command: ['wget']
-      args:  ['{{ include "clinical.fullname" . }}:{{ .Values.service.port }}']
+      args:  ['{{ include "clinical.fullname" . }}:{{ .Values.service.clinical.port }}']
   restartPolicy: Never
diff --git a/clinical/values.yaml b/clinical/values.yaml
@@ -35,6 +35,10 @@ ingress:
       paths:
         - path: /
           pathType: ImplementationSpecific
+          portName: clinical
+        - path: /gql
+          pathType: ImplementationSpecific
+          portName: clinical-gql
 
   tls: []
   #  - secretName: chart-example-tls

diff --git a/docs/clinical-1.1.5.tgz b/docs/clinical-1.1.5.tgz
diff --git a/docs/index.yaml b/docs/index.yaml
@@ -499,6 +499,15 @@ entries:
     - https://icgc-argo.github.io/charts/argo-vault-0.1.0.tgz
     version: 0.1.0
   clinical:
+  - apiVersion: v1
+    appVersion: "1.0"
+    created: "2023-10-20T10:24:43.448274-04:00"
+    description: A Helm chart for Argo clinical
+    digest: 761de2eb31b765457f10e23ac85a63a0cc8a20e7cd59229b55d4cb7f185e43a5
+    name: clinical
+    urls:
+    - https://icgc-argo.github.io/charts/clinical-1.1.5.tgz
+    version: 1.1.5
   - apiVersion: v1
     appVersion: "1.0"
     created: "2023-10-19T15:54:16.385031-04:00"
@@ -2563,4 +2572,4 @@ entries:
     urls:
     - https://icgc-argo.github.io/charts/workflow-ui-0.1.0.tgz
     version: 0.1.0
-generated: "2023-10-19T15:54:16.384091-04:00"
+generated: "2023-10-20T10:24:43.441834-04:00"