use new name in charts

Signed-off-by: Steve Taylor <[email protected]>

Author: sbtaylor15

chart/scec-arangodb/.helmignore renamed to chart/pdvd-arangodb/.helmignore

@@ -0,0 +1,7 @@
+apiVersion: v2
+description: Arango Statefulset
+icon: https://ortelius.github.io/pdvd-charts/ortelius.svg
+name: pdvd-arangodb
+type: application
+version: 12.0.0
+appVersion: 12.0.0

chart/pdvd-arangodb/Chart.yaml

@@ -1,7 +1,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "scec-arangodb.name" -}}
+{{- define "pdvd-arangodb.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 "scec-arangodb.fullname" -}}
+{{- define "pdvd-arangodb.fullname" -}}
 {{- if .Values.fullnameOverride }}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
@@ -26,6 +26,6 @@ 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 "scec-arangodb.chart" -}}
+{{- define "pdvd-arangodb.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}

chart/scec-arangodb/README.md renamed to chart/pdvd-arangodb/README.md

@@ -1,24 +1,23 @@
 ---
-{{ if (((.Values.global).arangodb).enabled) }}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: {{ include "scec-arangodb.name" . }}
+  name: {{ include "pdvd-arangodb.name" . }}
 spec:
   replicas: {{ .Values.replicaCount }}
   updateStrategy:
     type: RollingUpdate
-  serviceName: {{ include "scec-arangodb.name" . }}
+  serviceName: {{ include "pdvd-arangodb.name" . }}
   selector:
     matchLabels:
-      app:  {{ include "scec-arangodb.name" . }}
+      app:  {{ include "pdvd-arangodb.name" . }}
   template:
     metadata:
       labels:
-        app: {{ include "scec-arangodb.name" . }}
+        app: {{ include "pdvd-arangodb.name" . }}
     spec:
       containers:
-        - name: {{ include "scec-arangodb.name" . }}
+        - name: {{ include "pdvd-arangodb.name" . }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
@@ -30,38 +29,37 @@ spec:
                   name: arangodb
                   key: DBPassword
           volumeMounts:
-          - name: dbdata
+          - name: arangodata
             mountPath: /var/lib/arangodb3
-          - name: dbappsdata
+          - name: arangoappsdata
             mountPath: /var/lib/arangodb3-apps
       {{ if not (and (contains "gke" (.Capabilities.KubeVersion.Version | toString)) (contains "eks" (.Capabilities.KubeVersion.Version | toString))) }}
       volumes:
-      - name: dbdata
+      - name: arangodata
         hostPath:
           type: DirectoryOrCreate
-          path: /dbdata  # matches kind containerPath in Kind Cluster.yaml
-      - name: dbappsdata
+          path: /arangodata  # matches kind containerPath in Kind Cluster.yaml
+      - name: arangoappsdata
         hostPath:
           type: DirectoryOrCreate
-          path: /dbappsdata  # matches kind containerPath in Kind Cluster.yaml
+          path: /arangoappsdata  # matches kind containerPath in Kind Cluster.yaml
       {{ end }}
   {{ if or (contains "gke" (.Capabilities.KubeVersion.Version | toString)) (contains "eks" (.Capabilities.KubeVersion.Version | toString)) }}
   volumeClaimTemplates:
   - metadata:
-      name: dbdata
+      name: arangodata
     spec:
       accessModes: [ "ReadWriteOnce" ]
       storageClassName: "ortelius-sc"
       resources:
         requests:
           storage: 100Gi
   - metadata:
-      name: dbappsdata
+      name: arangoappsdata
     spec:
       accessModes: [ "ReadWriteOnce" ]
       storageClassName: "ortelius-sc"
       resources:
         requests:
           storage: 10Gi
   {{ end }}
-{{ end }}

chart/scec-arangodb/templates/_helpers.tpl renamed to chart/pdvd-arangodb/templates/_helpers.tpl

@@ -1,5 +1,4 @@
 ---
-{{ if (((.Values.global).arangodb).enabled) }}
 apiVersion: v1
 kind: Secret
 type: Opaque
@@ -10,14 +9,13 @@ data:
   {{ $dbuser := .Values.arangodb_user | default "root" }}
   {{ $dbhost := .Values.arangodb_host | default "localhost" }}
   {{ $dbport := .Values.arangodb_port | default "8529" }}
-  {{ $dbname := .Values.arangodb_name | default "ortelius" }}
+  {{ $dbname := .Values.arangodb_name | default "vulnmgt" }}
   DBPassword: {{ $dbpass | b64enc }}
   DBUserName: {{ $dbuser | b64enc }}
   {{ if (((.Values.global).arangodb).enabled) }}
-  DBHost:  {{ printf "scec-arangodb.%s.svc.cluster.local" .Release.Namespace | b64enc  }}
+  DBHost:  {{ printf "pdvd-arangodb.%s.svc.cluster.local" .Release.Namespace | b64enc  }}
   {{ else }}
   DBHost: {{ $dbhost | b64enc }}
   {{ end }}
   DBPort: {{ $dbport | b64enc }}
   DBName: {{ $dbname | b64enc }}
-{{ end }}

chart/scec-arangodb/templates/deployment.yaml renamed to chart/pdvd-arangodb/templates/deployment.yaml

@@ -16,10 +16,10 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "scec-arangodb.name" . }}
+  name: {{ include "pdvd-arangodb.name" . }}
 spec:
   selector:
-    app: {{ include "scec-arangodb.name" . }}
+    app: {{ include "pdvd-arangodb.name" . }}
   ports:
     - protocol: TCP
       port: 8529

chart/scec-arangodb/templates/secret.yaml renamed to chart/pdvd-arangodb/templates/secret.yaml

@@ -1,4 +1,3 @@
-{{ if (((.Values.global).arangodb).enabled) }}
 {{- if or (contains "gke" (.Capabilities.KubeVersion.Version | toString)) (contains "eks" (.Capabilities.KubeVersion.Version | toString)) }}
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
@@ -23,5 +22,4 @@ reclaimPolicy: Retain
 allowVolumeExpansion: true
 volumeBindingMode: WaitForFirstConsumer
 {{- end }}
-{{ end }}
-{{ end }}
+{{ end }}