Remove db-migrator for clamp in Helm charts

Liquibase is now used so db-migrator is not needed for clamp.

Issue-ID: POLICY-5399
Change-Id: I913d3f730482e2c57ef497ae2f5e7383e2d8756f
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>

diff --git a/helm/policy/templates/job-pg.yaml b/helm/policy/templates/job-pg.yaml
index 186bbfc..12487f2 100644 (file)
--- a/helm/policy/templates/job-pg.yaml
+++ b/helm/policy/templates/job-pg.yaml
@@ -160,79 +160,3 @@ spec:
             items:
               - key: init_pg.sh
                 path: init_pg.sh
-
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: policy-pg-config-clamp
-  namespace: default
-  labels:
-    app: policy-pg-config-clamp
-spec:
-  template:
-    metadata:
-      labels:
-        app: policy-pg-config-clamp
-      name: policy-pg-config-clamp
-    spec:
-      initContainers:
-        - name: policy-init-readiness
-          image: {{ .Values.global.repository }}/{{ .Values.global.image.readiness }}
-          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-          command:
-          - /app/ready.py
-          args:
-          - --job-name
-          - policy-pg-config
-          env:
-          - name: NAMESPACE
-            valueFrom:
-              fieldRef:
-                apiVersion: v1
-                fieldPath: metadata.namespace
-      containers:
-      - name: policy-pg-db-migrator-clamp
-        image: {{ .Values.global.repository }}/{{ .Values.global.image.dbMigrator }}
-        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        volumeMounts:
-        - mountPath: /dbcmd-config/init_pg.sh
-          name: {{ .Chart.Name }}-clamp-config
-          subPath: init_pg.sh
-        command:
-        - /bin/sh
-        - -cx
-        - |
-           /dbcmd-config/init_pg.sh
-        env:
-        - name: SQL_HOST
-          value: {{ .Values.dbConfig.postgres.service }}
-        - name: SQL_USER
-          value: {{ .Values.dbConfig.postgres.user }}
-        - name: SQL_PASSWORD
-          value: {{ .Values.dbConfig.postgres.password }}
-        - name: SQL_DB
-          value: {{ .Values.dbmigrator.clampacm.schema }}
-        - name: POLICY_HOME
-          value: {{ .Values.dbmigrator.policy_home }}
-        - name: SCRIPT_DIRECTORY
-          value: "postgres"
-        - name: PGPASSWORD
-          value: {{ .Values.dbConfig.postgres.password }}
-        resources:
-          limits:
-            cpu: 1
-            memory: 4Gi
-          requests:
-            cpu: 100m
-            memory: 1Gi
-      restartPolicy: Never
-      serviceAccountName: {{ .Chart.Name }}-read
-      volumes:
-        - name: {{ .Chart.Name }}-clamp-config
-          configMap:
-            name: {{ .Chart.Name }}-db-configmap
-            defaultMode: 0755
-            items:
-              - key: init_pg.sh
-                path: init_pg.sh

diff --git a/helm/policy/values.yaml b/helm/policy/values.yaml
index b5d1d4c..a9b2958 100644 (file)
--- a/helm/policy/values.yaml
+++ b/helm/policy/values.yaml
@@ -102,8 +102,6 @@ dbmigrator:
   policy_home: "/opt/app/policy"
   policyadmin:
     schema: policyadmin
-  clampacm:
-    schema: clampacm
 
 subChartsOnly:
   enabled: true