aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorAndreas Geissler <andreas-geissler@telekom.de>2023-01-31 14:55:55 +0000
committerGerrit Code Review <gerrit@onap.org>2023-01-31 14:55:55 +0000
commite75a83ca1a7786c1501f4d7242fad5f690eae2ee (patch)
treeb25d42247b96c4fed371f60219525277130d3d09 /kubernetes
parentf41e68866ff8bb86b04d765661bdcdd3a18ce2ce (diff)
parenta4275991aff6b4dafb19e57325c04ac0fb811a66 (diff)
Merge "[POLICY] Use variable MariaDB image for DB jobs"
Diffstat (limited to 'kubernetes')
-rwxr-xr-xkubernetes/policy/resources/config/db.sh6
-rwxr-xr-xkubernetes/policy/templates/job.yaml2
-rwxr-xr-xkubernetes/policy/values.yaml6
3 files changed, 4 insertions, 10 deletions
diff --git a/kubernetes/policy/resources/config/db.sh b/kubernetes/policy/resources/config/db.sh
index 866d422c14..36574bc1ad 100755
--- a/kubernetes/policy/resources/config/db.sh
+++ b/kubernetes/policy/resources/config/db.sh
@@ -17,12 +17,12 @@
# limitations under the License.
*/}}
-mysql() { /usr/bin/mysql -h ${MYSQL_HOST} -P ${MYSQL_USER} "$@"; };
+mysqlcmd() { mysql -h ${MYSQL_HOST} -P ${MYSQL_USER} "$@"; };
for db in migration pooling policyadmin policyclamp operationshistory clampacm
do
- mysql -uroot -p"${MYSQL_ROOT_PASSWORD}" --execute "CREATE DATABASE IF NOT EXISTS ${db};"
- mysql -uroot -p"${MYSQL_ROOT_PASSWORD}" --execute "GRANT ALL PRIVILEGES ON \`${db}\`.* TO '${MYSQL_USER}'@'%' ;"
+ mysqlcmd -uroot -p"${MYSQL_ROOT_PASSWORD}" --execute "CREATE DATABASE IF NOT EXISTS ${db};"
+ mysqlcmd -uroot -p"${MYSQL_ROOT_PASSWORD}" --execute "GRANT ALL PRIVILEGES ON \`${db}\`.* TO '${MYSQL_USER}'@'%' ;"
done
mysql -uroot -p"${MYSQL_ROOT_PASSWORD}" --execute "FLUSH PRIVILEGES;"
diff --git a/kubernetes/policy/templates/job.yaml b/kubernetes/policy/templates/job.yaml
index 9dbf4cdd50..eb5968a7ff 100755
--- a/kubernetes/policy/templates/job.yaml
+++ b/kubernetes/policy/templates/job.yaml
@@ -50,7 +50,7 @@ spec:
fieldPath: metadata.namespace
containers:
- name: {{ include "common.name" . }}-galera-config
- image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.mariadb.image }}
+ image: {{ include "repositoryGenerator.image.mariadb" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- mountPath: /dbcmd-config/db.sh
diff --git a/kubernetes/policy/values.yaml b/kubernetes/policy/values.yaml
index c9e236a65c..1ee31c2c7c 100755
--- a/kubernetes/policy/values.yaml
+++ b/kubernetes/policy/values.yaml
@@ -168,12 +168,6 @@ policy-gui:
# DB configuration defaults.
#################################################################
-repository: nexus3.onap.org:10001
-pullPolicy: Always
-
-mariadb:
- image: mariadb:10.5.8
-
dbmigrator:
image: onap/policy-db-migrator:2.5.1
schema: policyadmin