branding changes for helm chart

RobokopU24 · Jan 5, 2024 · 9e5a172 · 9e5a172
1 parent 6d80579
commit 9e5a172
Show file tree

Hide file tree

Showing 9 changed files with 72 additions and 72 deletions.
diff --git a/helm/data-services/.helmignore → helm/orion/.helmignore b/helm/data-services/.helmignore → helm/orion/.helmignore
diff --git a/helm/data-services/Chart.yaml → helm/orion/Chart.yaml b/helm/data-services/Chart.yaml → helm/orion/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
-name: data-services
-description: A Helm chart for Kubernetes
+name: orion
+description: A Helm chart for running Operational Routine for the Ingest and Output of Networks (ORION)
 
 # A chart can be either an 'application' or a 'library' chart.
 #

diff --git a/helm/data-services/index.yaml → helm/orion/index.yaml b/helm/data-services/index.yaml → helm/orion/index.yaml
diff --git a/helm/data-services/renci-values.yaml → helm/orion/renci-values.yaml b/helm/data-services/renci-values.yaml → helm/orion/renci-values.yaml
@@ -1,8 +1,8 @@
-# Values for running data-services on Sterling at RENCI
+# Values for running ORION on Sterling at RENCI
 
 replicaCount: 1
 
-dataServices:
+orion:
   graphID: "all"
   # optionally use a remote graph spec by supplying a url
   # graphSpec: 'https://stars.renci.org/var/data_services/graph_specs/current-graph-spec.yml'

diff --git a/helm/data-services/templates/_helpers.tpl → helm/orion/templates/_helpers.tpl b/helm/data-services/templates/_helpers.tpl → helm/orion/templates/_helpers.tpl
@@ -1,7 +1,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "data-services.name" -}}
+{{- define "orion.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
@@ -10,7 +10,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "data-services.fullname" -}}
+{{- define "orion.fullname" -}}
 {{- if .Values.fullnameOverride }}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
@@ -26,16 +26,16 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "data-services.chart" -}}
+{{- define "orion.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
 Common labels
 */}}
-{{- define "data-services.labels" -}}
-helm.sh/chart: {{ include "data-services.chart" . }}
-{{ include "data-services.selectorLabels" . }}
+{{- define "orion.labels" -}}
+helm.sh/chart: {{ include "orion.chart" . }}
+{{ include "orion.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -45,17 +45,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Selector labels
 */}}
-{{- define "data-services.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "data-services.name" . }}
+{{- define "orion.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "orion.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
 {{/*
 Create the name of the service account to use
 */}}
-{{- define "data-services.serviceAccountName" -}}
+{{- define "orion.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create }}
-{{- default (include "data-services.fullname" .) .Values.serviceAccount.name }}
+{{- default (include "orion.fullname" .) .Values.serviceAccount.name }}
 {{- else }}
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}

diff --git a/...ata-services/templates/graph-builder.yaml → helm/orion/templates/graph-builder.yaml b/...ata-services/templates/graph-builder.yaml → helm/orion/templates/graph-builder.yaml
@@ -9,35 +9,35 @@ spec:
     spec:
       restartPolicy: Never
       securityContext:
-        runAsUser: {{ .Values.dataServices.securityContext.runAsUser }}
-        runAsGroup: {{ .Values.dataServices.securityContext.runAsGroup }}
-        fsGroup: {{ .Values.dataServices.securityContext.runAsGroup }}
+        runAsUser: {{ .Values.orion.securityContext.runAsUser }}
+        runAsGroup: {{ .Values.orion.securityContext.runAsGroup }}
+        fsGroup: {{ .Values.orion.securityContext.runAsGroup }}
       containers:
         - name: ds-graph-analyzer
-          image: {{ .Values.dataServices.image.repository }}:{{ .Values.dataServices.image.tag }}
-          imagePullPolicy: {{ .Values.dataServices.image.pullPolicy }}
+          image: {{ .Values.orion.image.repository }}:{{ .Values.orion.image.tag }}
+          imagePullPolicy: {{ .Values.orion.image.pullPolicy }}
           command: ["bash"]
           stdin: True
           tty: True
           volumeMounts:
             - name: ds-sources-volume
               mountPath: /ORION_storage
-              {{- if .Values.dataServices.sourcesVolume.nfs_mount_subpath }}
-              subPath: {{ .Values.dataServices.sourcesVolume.nfs_mount_subpath }}
+              {{- if .Values.orion.sourcesVolume.nfs_mount_subpath }}
+              subPath: {{ .Values.orion.sourcesVolume.nfs_mount_subpath }}
               {{- end }}
             - name: ds-sources-volume
               mountPath: /ORION_logs
-              subPath: {{ .Values.dataServices.sourcesVolume.nfs_mount_subpath }}logs
+              subPath: {{ .Values.orion.sourcesVolume.nfs_mount_subpath }}logs
             - name: ds-graphs-volume
               mountPath: /ORION_graphs
-              {{- if .Values.dataServices.graphsVolume.nfs_mount_subpath }}
-              subPath: {{ .Values.dataServices.graphsVolume.nfs_mount_subpath }}
+              {{- if .Values.orion.graphsVolume.nfs_mount_subpath }}
+              subPath: {{ .Values.orion.graphsVolume.nfs_mount_subpath }}
               {{- end }}
-            {{- if .Values.dataServices.extraVolume.use_extra_volume }}
+            {{- if .Values.orion.extraVolume.use_extra_volume }}
             - name: ds-extra-volume
               mountPath: /ORION_extra
-              {{- if .Values.dataServices.extraVolume.nfs_mount_subpath }}
-              subPath: {{ .Values.dataServices.extraVolume.nfs_mount_subpath }}
+              {{- if .Values.orion.extraVolume.nfs_mount_subpath }}
+              subPath: {{ .Values.orion.extraVolume.nfs_mount_subpath }}
               {{- end }}
             {{- end }}
             - mountPath: /data
@@ -47,26 +47,26 @@ spec:
               value: /ORION_storage
             - name: ORION_GRAPHS
               value: /ORION_graphs
-            {{- if .Values.dataServices.useLocalGraphSpec }}
+            {{- if .Values.orion.useLocalGraphSpec }}
             - name: ORION_GRAPH_SPEC
-              value: {{ .Values.dataServices.graphSpec }}
+              value: {{ .Values.orion.graphSpec }}
             {{- else }}
             - name: ORION_GRAPH_SPEC_URL
-              value: {{ .Values.dataServices.graphSpec}}
+              value: {{ .Values.orion.graphSpec}}
             {{- end }}
             - name: ORION_LOGS
               value: /ORION_logs
             - name: ORION_NEO4J_PASSWORD
               value: ds-password
             - name: ORION_OUTPUT_URL
-              value: {{ .Values.dataServices.outputURL }}
-            {{- if .Values.dataServices.normalization.nodeNormEndpoint }}
+              value: {{ .Values.orion.outputURL }}
+            {{- if .Values.orion.normalization.nodeNormEndpoint }}
             - name: NODE_NORMALIZATION_ENDPOINT
-              value: {{ .Values.dataServices.normalization.nodeNormEndpoint }}
+              value: {{ .Values.orion.normalization.nodeNormEndpoint }}
             {{- end }}
-            {{- if .Values.dataServices.normalization.edgeNormEndpoint }}
+            {{- if .Values.orion.normalization.edgeNormEndpoint }}
             - name: EDGE_NORMALIZATION_ENDPOINT
-              value: {{ .Values.dataServices.normalization.edgeNormEndpoint }}
+              value: {{ .Values.orion.normalization.edgeNormEndpoint }}
             {{- end }}
             - name: DRUGCENTRAL_DB_HOST
               value: {{ .Values.drugcentral.host | quote }}
@@ -89,26 +89,26 @@ spec:
             - name: PHAROS_DB_NAME
               value: {{ .Values.pharos.db_name | quote }}
           resources:
-            {{- toYaml .Values.dataServices.resources | nindent 12 }}
-      {{- if .Values.dataServices.buildMode }}
+            {{- toYaml .Values.orion.resources | nindent 12 }}
+      {{- if .Values.orion.buildMode }}
       initContainers:
         - name: ds-graph-builder
-          image: {{ .Values.dataServices.image.repository }}:{{ .Values.dataServices.image.tag }}
-          imagePullPolicy: {{ .Values.dataServices.image.pullPolicy }}
-          args: ["python", "/ORION/Common/build_manager.py", {{ .Values.dataServices.graphID }} ]
+          image: {{ .Values.orion.image.repository }}:{{ .Values.orion.image.tag }}
+          imagePullPolicy: {{ .Values.orion.image.pullPolicy }}
+          args: ["python", "/ORION/Common/build_manager.py", {{ .Values.orion.graphID }} ]
           volumeMounts:
             - mountPath: /ORION_storage
               name: ds-sources-volume
-              {{- if .Values.dataServices.sourcesVolume.nfs_mount_subpath }}
-              subPath: {{ .Values.dataServices.sourcesVolume.nfs_mount_subpath }}
+              {{- if .Values.orion.sourcesVolume.nfs_mount_subpath }}
+              subPath: {{ .Values.orion.sourcesVolume.nfs_mount_subpath }}
               {{- end }}
             - mountPath: /ORION_logs
               name: ds-sources-volume
-              subPath: {{ .Values.dataServices.sourcesVolume.nfs_mount_subpath }}logs
+              subPath: {{ .Values.orion.sourcesVolume.nfs_mount_subpath }}logs
             - mountPath: /ORION_graphs
               name: ds-graphs-volume
-              {{- if .Values.dataServices.graphsVolume.nfs_mount_subpath }}
-              subPath: {{ .Values.dataServices.graphsVolume.nfs_mount_subpath }}
+              {{- if .Values.orion.graphsVolume.nfs_mount_subpath }}
+              subPath: {{ .Values.orion.graphsVolume.nfs_mount_subpath }}
               {{- end }}
             - mountPath: /data
               name: ds-neo4j-scratch-volume
@@ -117,26 +117,26 @@ spec:
               value: /ORION_storage
             - name: ORION_GRAPHS
               value: /ORION_graphs
-            {{- if .Values.dataServices.useLocalGraphSpec }}
+            {{- if .Values.orion.useLocalGraphSpec }}
             - name: ORION_GRAPH_SPEC
-              value: {{ .Values.dataServices.graphSpec }}
+              value: {{ .Values.orion.graphSpec }}
             {{- else }}
             - name: ORION_GRAPH_SPEC_URL
-              value: {{ .Values.dataServices.graphSpec }}
+              value: {{ .Values.orion.graphSpec }}
             {{- end }}
             - name: ORION_LOGS
               value: /ORION_logs
             - name: ORION_NEO4J_PASSWORD
               value: ds-password
             - name: ORION_OUTPUT_URL
-              value: {{ .Values.dataServices.outputURL }}
-            {{- if .Values.dataServices.normalization.nodeNormEndpoint }}
+              value: {{ .Values.orion.outputURL }}
+            {{- if .Values.orion.normalization.nodeNormEndpoint }}
             - name: NODE_NORMALIZATION_ENDPOINT
-              value: {{ .Values.dataServices.normalization.nodeNormEndpoint }}
+              value: {{ .Values.orion.normalization.nodeNormEndpoint }}
             {{- end }}
-            {{- if .Values.dataServices.normalization.edgeNormEndpoint }}
+            {{- if .Values.orion.normalization.edgeNormEndpoint }}
             - name: EDGE_NORMALIZATION_ENDPOINT
-              value: {{ .Values.dataServices.normalization.edgeNormEndpoint }}
+              value: {{ .Values.orion.normalization.edgeNormEndpoint }}
             {{- end }}
             - name: DRUGCENTRAL_DB_HOST
               value: {{ .Values.drugcentral.host | quote }}
@@ -159,34 +159,34 @@ spec:
             - name: PHAROS_DB_NAME
               value: {{ .Values.pharos.db_name | quote }}
           resources:
-            {{- toYaml .Values.dataServices.resources | nindent 12 }}
+            {{- toYaml .Values.orion.resources | nindent 12 }}
       {{- end }}
       volumes:
-        {{- if .Values.dataServices.sourcesVolume.use_nfs }}
+        {{- if .Values.orion.sourcesVolume.use_nfs }}
         - name: ds-sources-volume
           nfs:
-            server: {{ .Values.dataServices.sourcesVolume.nfs_server }}
-            path: {{ .Values.dataServices.sourcesVolume.nfs_path }}
+            server: {{ .Values.orion.sourcesVolume.nfs_server }}
+            path: {{ .Values.orion.sourcesVolume.nfs_path }}
         {{- else }}
         - name: ds-sources-volume
           persistentVolumeClaim:
             claimName: ds-sources-pvc
         {{- end }}
-        {{- if .Values.dataServices.graphsVolume.use_nfs }}
+        {{- if .Values.orion.graphsVolume.use_nfs }}
         - name: ds-graphs-volume
           nfs:
-            server: {{ .Values.dataServices.graphsVolume.nfs_server }}
-            path: {{ .Values.dataServices.graphsVolume.nfs_path }}
+            server: {{ .Values.orion.graphsVolume.nfs_server }}
+            path: {{ .Values.orion.graphsVolume.nfs_path }}
         {{- else }}
         - name: ds-graphs-volume
           persistentVolumeClaim:
             claimName: ds-graphs-pvc
         {{- end }}
-        {{- if .Values.dataServices.extraVolume.use_extra_volume }}
+        {{- if .Values.orion.extraVolume.use_extra_volume }}
         - name: ds-extra-volume
           nfs:
-            server: {{ .Values.dataServices.extraVolume.nfs_server }}
-            path: {{ .Values.dataServices.extraVolume.nfs_path }}
+            server: {{ .Values.orion.extraVolume.nfs_server }}
+            path: {{ .Values.orion.extraVolume.nfs_path }}
         {{- end }}
         - name: ds-neo4j-scratch-volume
           ephemeral:
@@ -196,5 +196,5 @@ spec:
                 storageClassName:
                 resources:
                   requests:
-                    storage: {{ .Values.dataServices.neo4jScratchVolume.size }}
+                    storage: {{ .Values.orion.neo4jScratchVolume.size }}
   backoffLimit: 0
diff --git a/helm/data-services/templates/graphs-pvc.yaml → helm/orion/templates/graphs-pvc.yaml b/helm/data-services/templates/graphs-pvc.yaml → helm/orion/templates/graphs-pvc.yaml
@@ -1,4 +1,4 @@
-{{- if not .Values.dataServices.graphsVolume.use_nfs }}
+{{- if not .Values.orion.graphsVolume.use_nfs }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
@@ -10,8 +10,8 @@ spec:
   - ReadWriteOnce
   resources:
     requests:
-      storage: {{ .Values.dataServices.graphsVolume.size }}
+      storage: {{ .Values.orion.graphsVolume.size }}
     limits:
-      storage: {{ .Values.dataServices.graphsVolume.size }}
+      storage: {{ .Values.orion.graphsVolume.size }}
   storageClassName: basic
 {{- end }}
diff --git a/.../data-services/templates/sources-pvc.yaml → helm/orion/templates/sources-pvc.yaml b/.../data-services/templates/sources-pvc.yaml → helm/orion/templates/sources-pvc.yaml
@@ -1,4 +1,4 @@
-{{- if not .Values.dataServices.sourcesVolume.use_nfs }}
+{{- if not .Values.orion.sourcesVolume.use_nfs }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
@@ -10,8 +10,8 @@ spec:
   - ReadWriteOnce
   resources:
     requests:
-      storage: {{ .Values.dataServices.sourcesVolume.size }}
+      storage: {{ .Values.orion.sourcesVolume.size }}
     limits:
-      storage: {{ .Values.dataServices.sourcesVolume.size }}
+      storage: {{ .Values.orion.sourcesVolume.size }}
   storageClassName: basic
 {{- end }}
diff --git a/helm/data-services/values.yaml → helm/orion/values.yaml b/helm/data-services/values.yaml → helm/orion/values.yaml
@@ -1,8 +1,8 @@
-# Default values for data-services.
+# Default values for ORION.
 
 replicaCount: 1
 
-dataServices:
+orion:
   graphID: "Test_Graph"
   graphSpec: "testing-graph-spec.yml"
   # useLocalGraphSpec true if the graphSpec is a file in the codebase (mainly for testing), false if a remote URL