diff options
Diffstat (limited to 'helm')
| -rwxr-xr-x | helm/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml | 2 | ||||
| -rwxr-xr-x | helm/policy/templates/job.yaml | 95 | ||||
| -rwxr-xr-x | helm/policy/values.yaml | 7 |
3 files changed, 95 insertions, 9 deletions
diff --git a/helm/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml b/helm/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml index 0858af3c..138b114c 100755 --- a/helm/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml +++ b/helm/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml @@ -36,7 +36,7 @@ spring: maximumPoolSize: 10 jpa: hibernate: - ddl-auto: update + ddl-auto: none naming: physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl implicit-strategy: org.onap.policy.common.spring.utils.CustomImplicitNamingStrategy diff --git a/helm/policy/templates/job.yaml b/helm/policy/templates/job.yaml index eee143b5..560cea09 100755 --- a/helm/policy/templates/job.yaml +++ b/helm/policy/templates/job.yaml @@ -127,12 +127,96 @@ spec: apiVersion: v1 fieldPath: metadata.namespace containers: - - name: policy-galera-db-migrator - image: {{ .Values.global.repository }}/{{ .Values.dbmigrator.image }} + - name: policy-galera-db-migrator-policy + image: {{ .Values.global.dockerRepository }}/{{ .Values.dbmigrator.image }} + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + volumeMounts: + - mountPath: /dbcmd-config/db_migrator_policy_init.sh + name: {{ .Chart.Name }}-policy-config + subPath: db_migrator_policy_init.sh + command: + - /bin/sh + - -cx + - | + /dbcmd-config/db_migrator_policy_init.sh + env: + - name: SQL_HOST + value: "{{ index .Values "mariadb-galera" "service" "name" }}" + - name: SQL_USER + valueFrom: + secretKeyRef: + name: mariadb-galera-db-user-credentials + key: login + optional: false + - name: SQL_PASSWORD + valueFrom: + secretKeyRef: + name: mariadb-galera-db-user-credentials + key: password + optional: false + - name: SQL_DB + value: {{ .Values.dbmigrator.policyadmin.schema }} + - name: POLICY_HOME + value: {{ .Values.dbmigrator.policy_home }} + - name: SCRIPT_DIRECTORY + value: "sql" + resources: + limits: + cpu: 1 + memory: 4Gi + requests: + cpu: 100m + memory: 1Gi + restartPolicy: Never + serviceAccountName: {{ .Chart.Name }}-read + volumes: + - name: {{ .Chart.Name }}-policy-config + configMap: + name: {{ .Chart.Name }}-db-configmap + defaultMode: 0755 + items: + - key: db_migrator_policy_init.sh + path: db_migrator_policy_init.sh + +--- +apiVersion: batch/v1 +kind: Job +metadata: + name: policy-galera-config-clamp + namespace: default + labels: + app: policy-galera-config-clamp +spec: + template: + metadata: + labels: + app: policy-galera-config-clamp + name: policy-galera-config-clamp + spec: + imagePullSecrets: + - name: "default-docker-registry-key" + 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-galera-config + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + containers: + - name: policy-galera-db-migrator-clamp + image: {{ .Values.global.dockerRepository }}/{{ .Values.dbmigrator.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - mountPath: /dbcmd-config/db_migrator_policy_init.sh - name: {{ .Chart.Name }}-config + name: {{ .Chart.Name }}-clamp-config subPath: db_migrator_policy_init.sh command: - /bin/sh @@ -155,7 +239,7 @@ spec: key: password optional: false - name: SQL_DB - value: {{ .Values.dbmigrator.schema }} + value: {{ .Values.dbmigrator.clampacm.schema }} - name: POLICY_HOME value: {{ .Values.dbmigrator.policy_home }} - name: SCRIPT_DIRECTORY @@ -170,11 +254,10 @@ spec: restartPolicy: Never serviceAccountName: {{ .Chart.Name }}-read volumes: - - name: {{ .Chart.Name }}-config + - name: {{ .Chart.Name }}-clamp-config configMap: name: {{ .Chart.Name }}-db-configmap defaultMode: 0755 items: - key: db_migrator_policy_init.sh path: db_migrator_policy_init.sh - diff --git a/helm/policy/values.yaml b/helm/policy/values.yaml index 10d89199..f980325d 100755 --- a/helm/policy/values.yaml +++ b/helm/policy/values.yaml @@ -87,9 +87,12 @@ mariadb: image: mariadb:10.5.8 dbmigrator: - image: onap/policy-db-migrator:3.1.2-SNAPSHOT - schema: policyadmin + image: onap/policy-db-migrator:$tag policy_home: "/opt/app/policy" + policyadmin: + schema: policyadmin + clampacm: + schema: clampacm subChartsOnly: enabled: true |