============== =========== ======= ======== ======== ============= ========
New Delhi 1.28.6 3.13.1 1.28.x 20.10.x 1.14.4 0.41.0
Oslo 1.28.6 3.13.1 1.30.x 23.0.x 1.16.2 0.44.0
- Paris 1.28.6 3.13.1 1.30.x 23.0.x 1.16.2 0.44.0
+ Paris 1.30.4 3.16.4 1.30.x 23.0.x 1.17.2 0.45.0
============== =========== ======= ======== ======== ============= ========
.. table:: OOM Software Requirements (production)
============== ====== ============ ==============
New Delhi 1.21.0 v1.0.0 22.0.4
Oslo 1.24.1 v1.2.1 26.0.6
- Paris 1.24.1 v1.2.1 26.0.6
+ Paris 1.25.2 v1.2.1 26.0.6
============== ====== ============ ==============
.. table:: OOM Software Requirements (optional)
============== =========== ========== =========== ============ ===========
New Delhi 45.x 1.16.0 0.28.1 - -
Oslo 45.x 1.20.2 0.36.0 5.7.2 1.18.0
- Paris 45.x 1.20.2 0.37.1 5.7.2 1.18.0
+ Paris 71.x 1.21.2 0.38.1 5.7.2 1.19.1
============== =========== ========== =========== ============ ===========
apiVersion: v2
description: ONAP Controller Design Studio (CDS)
name: cds
-version: 13.0.3
+version: 16.0.0
dependencies:
- name: common
version: ~13.x-0
repository: '@local'
- name: mariadb-galera
- version: ~13.x-0
+ version: ~16.x-0
repository: '@local'
condition: global.mariadbGalera.localCluster
- name: cds-blueprints-processor
apiVersion: v2
description: Chart for MariaDB Galera cluster
name: mariadb-galera
-version: 13.2.4
+version: 16.0.0
keywords:
- mariadb
- mysql
mariadbOperator:
image: mariadb
- appVersion: 11.4.4
+ appVersion: 11.7.2
persistence:
#storageClassName: default
size: 3Gi
galera:
enabled: true
agentImage: mariadb-operator/mariadb-operator
- agentVersion: 0.37.1
+ agentVersion: 0.38.1
initImage: mariadb-operator/mariadb-operator
- initVersion: 0.37.1
+ initVersion: 0.38.1
## String to partially override common.names.fullname template (will maintain the release name)
##
apiVersion: v2
description: Chart for MariaDB Galera init job
name: mariadb-init
-version: 13.0.5
+version: 16.0.0
dependencies:
- name: common
echo "Creating database ${DB} and user ${USER}..."
- mysql $MYSQL_OPTS -e "CREATE OR REPLACE USER '${USER}'@'%' IDENTIFIED BY '${PASS}'"
- mysql $MYSQL_OPTS -e "CREATE DATABASE IF NOT EXISTS ${DB}"
- mysql $MYSQL_OPTS -e "GRANT ALL PRIVILEGES ON ${DB}.* TO '${USER}'@'%'"
+ mariadb $MYSQL_OPTS -e "CREATE OR REPLACE USER '${USER}'@'%' IDENTIFIED BY '${PASS}'"
+ mariadb $MYSQL_OPTS -e "CREATE DATABASE IF NOT EXISTS ${DB}"
+ mariadb $MYSQL_OPTS -e "GRANT ALL PRIVILEGES ON ${DB}.* TO '${USER}'@'%'"
echo "Created database ${DB} and user ${USER}."
done <<EOF
echo "Creating database ynsaUCru6mUNwGal and user u5WZ1GMSIS1wHZF..."
- mysql -h ${DB_HOST} -P ${DB_PORT} -uroot -p$MYSQL_ROOT_PASSWORD << 'EOF' || exit 1
+ mariadb -h ${DB_HOST} -P ${DB_PORT} -uroot -p$MYSQL_ROOT_PASSWORD << 'EOF' || exit 1
CREATE OR REPLACE USER 'u5WZ1GMSIS1wHZF'@'localhost' IDENTIFIED BY '${MYSQL_PASSWORD}';
CREATE OR REPLACE USER 'u5WZ1GMSIS1wHZF'@'%' IDENTIFIED BY '${MYSQL_PASSWORD}';
CREATE DATABASE IF NOT EXISTS ynsaUCru6mUNwGal;
echo "Creating database testDB and user testUser..."
- mysql -h ${DB_HOST} -P ${DB_PORT} -uroot -p$MYSQL_ROOT_PASSWORD << 'EOF' || exit 1
+ mariadb -h ${DB_HOST} -P ${DB_PORT} -uroot -p$MYSQL_ROOT_PASSWORD << 'EOF' || exit 1
CREATE OR REPLACE USER 'testUser'@'localhost' IDENTIFIED BY '${MYSQL_PASSWORD}';
CREATE OR REPLACE USER 'testUser'@'%' IDENTIFIED BY '${MYSQL_PASSWORD}';
CREATE DATABASE IF NOT EXISTS testDB;
echo "Creating database dbOne and user one..."
- mysql -h ${DB_HOST} -P ${DB_PORT} -uroot -p$MYSQL_ROOT_PASSWORD << 'EOF' || exit 1
+ mariadb -h ${DB_HOST} -P ${DB_PORT} -uroot -p$MYSQL_ROOT_PASSWORD << 'EOF' || exit 1
CREATE OR REPLACE USER 'one'@'localhost' IDENTIFIED BY '${MYSQL_PASSWORD_DBONE}';
CREATE OR REPLACE USER 'one'@'%' IDENTIFIED BY '${MYSQL_PASSWORD_DBONE}';
CREATE DATABASE IF NOT EXISTS dbOne;
echo "Created database dbOne and user one."
echo "Creating database dbTwo and user two..."
- mysql -h ${DB_HOST} -P ${DB_PORT} -uroot -p$MYSQL_ROOT_PASSWORD << 'EOF' || exit 1
+ mariadb -h ${DB_HOST} -P ${DB_PORT} -uroot -p$MYSQL_ROOT_PASSWORD << 'EOF' || exit 1
CREATE OR REPLACE USER 'two'@'localhost' IDENTIFIED BY '${MYSQL_PASSWORD_DBTWO}';
CREATE OR REPLACE USER 'two'@'%' IDENTIFIED BY '${MYSQL_PASSWORD_DBTWO}';
CREATE DATABASE IF NOT EXISTS dbTwo;
apiVersion: v2
description: Template used to generate the right repository link
name: repositoryGenerator
-version: 13.0.1
+version: 13.0.2
jreImage: onap/integration-java11:10.0.0
kubectlImage: bitnami/kubectl:1.22.4
loggingImage: beats/filebeat:5.5.0
- mariadbImage: bitnami/mariadb:10.5.8
+ mariadbImage: mariadb:11.7.2
mongodbImage: percona/percona-server-mongodb:7.0.5-3
nginxImage: bitnami/nginx:1.21.4
postgresImage: crunchydata/crunchy-postgres:centos8-13.2-4.6.1
repository: '@local'
condition: cassandra.enabled
- name: cds
- version: ~13.x-0
+ version: ~16.x-0
repository: '@local'
condition: cds.enabled
- name: common
repository: '@local'
condition: dcaegen2-services.enabled
- name: mariadb-galera
- version: ~13.x-0
+ version: ~16.x-0
repository: '@local'
condition: mariadb-galera.enabled
- name: multicloud
repository: '@local'
condition: sdc.enabled
- name: sdnc
- version: ~15.x-0
+ version: ~16.x-0
repository: '@local'
condition: sdnc.enabled
- name: so
- version: ~15.x-0
+ version: ~16.x-0
repository: '@local'
condition: so.enabled
- name: strimzi
loggingImage: beats/filebeat:5.5.0
# mariadb client image
- mariadbImage: bitnami/mariadb:10.5.8
+ mariadbImage: mariadb:11.7.2
# mongodb server image
mongodbImage: percona/percona-server-mongodb:7.0.16-10
apiVersion: v2
description: SDN Controller
name: sdnc
-version: 15.1.1
+version: 16.0.0
dependencies:
- name: common
version: ~13.x-0
repository: '@local'
- name: network-name-gen
- version: ~13.x-0
+ version: ~16.x-0
repository: '@local'
condition: network-name-gen.enabled
- name: dgbuilder
repository: '@local'
condition: config.geoEnabled
- name: mariadb-galera
- version: ~13.x-0
+ version: ~16.x-0
repository: '@local'
condition: global.mariadbGalera.localCluster
- name: elasticsearch
apiVersion: v2\r
description: Name Generation Micro Service\r
name: network-name-gen\r
-version: 13.0.0\r
+version: 16.0.0\r
\r
dependencies:\r
- name: common\r
version: ~13.x-0\r
repository: '@local'\r
- name: mariadb-init\r
- version: ~13.x-0\r
+ version: ~16.x-0\r
repository: '@local'\r
- name: serviceAccount\r
version: ~13.x-0\r
apiVersion: v2
description: ONAP Service Orchestrator
name: so
-version: 15.1.0
+version: 16.0.0
dependencies:
- name: common
version: ~13.x-0
repository: '@local'
- name: mariadb-galera
- version: ~13.x-0
+ version: ~16.x-0
repository: '@local'
condition: global.mariadbGalera.localCluster
- name: repositoryGenerator
repository: 'file://components/so-etsi-sol003-adapter'
condition: so-etsi-sol003-adapter.enabled
- name: so-mariadb
- version: ~13.x-0
+ version: ~16.x-0
repository: 'file://components/so-mariadb'
- name: so-nssmf-adapter
version: ~13.x-0
apiVersion: v2
description: MariaDB Service
name: so-mariadb
-version: 13.0.1
+version: 16.0.0
dependencies:
- name: common
echo "Creating camundabpmn database . . ." 1>/tmp/mariadb-camundabpmn.log 2>&1
-mysql -uroot -p$MYSQL_ROOT_PASSWORD << EOF || exit 1
+mysqlcmd -uroot -p$MYSQL_ROOT_PASSWORD << EOF || exit 1
DROP DATABASE IF EXISTS camundabpmn;
CREATE DATABASE camundabpmn;
DROP USER IF EXISTS '${CAMUNDA_DB_USER}';
cd /docker-entrypoint-initdb.d/db-sql-scripts
-mysql -uroot -p$MYSQL_ROOT_PASSWORD -f < mariadb_engine_7.14.0.sql || exit 1
-mysql -uroot -p$MYSQL_ROOT_PASSWORD -f < mariadb_identity_7.14.0.sql || exit 1
+mysqlcmd -uroot -p$MYSQL_ROOT_PASSWORD -f < mariadb_engine_7.14.0.sql || exit 1
+mysqlcmd -uroot -p$MYSQL_ROOT_PASSWORD -f < mariadb_identity_7.14.0.sql || exit 1
echo "Created camundabpmn database . . ." 1>>/tmp/mariadb-camundabpmn.log 2>&1
echo "Creating requestdb database . . ." 1>/tmp/mariadb-requestdb.log 2>&1
-mysql -uroot -p$MYSQL_ROOT_PASSWORD << EOF || exit 1
+mysqlcmd -uroot -p$MYSQL_ROOT_PASSWORD << EOF || exit 1
DROP DATABASE IF EXISTS requestdb;
CREATE DATABASE /*!32312 IF NOT EXISTS*/ requestdb /*!40100 DEFAULT CHARACTER SET latin1 */;
DROP USER IF EXISTS '${REQUEST_DB_USER}';
echo "Creating catalogdb database . . ." 1>/tmp/mariadb-catalogdb.log 2>&1
-mysql -uroot -p$MYSQL_ROOT_PASSWORD << EOF || exit 1
+mysqlcmd -uroot -p$MYSQL_ROOT_PASSWORD << EOF || exit 1
DROP DATABASE IF EXISTS catalogdb;
CREATE DATABASE /*!32312 IF NOT EXISTS*/ catalogdb /*!40100 DEFAULT CHARACTER SET latin1 */;
DROP USER IF EXISTS '${CATALOG_DB_USER}';
NFVO_DB_PASSWORD=`prepare_password $NFVO_DB_PASSWORD`
-mysql -uroot -p$MYSQL_ROOT_PASSWORD << EOF || exit 1
+mysqlcmd -uroot -p$MYSQL_ROOT_PASSWORD << EOF || exit 1
CREATE DATABASE /*!32312 IF NOT EXISTS*/ nfvo /*!40100 DEFAULT CHARACTER SET latin1 */;
DROP USER IF EXISTS '${NFVO_DB_USER}';
CREATE USER '${NFVO_DB_USER}';
CNFM_DB_PASSWORD=`prepare_password $CNFM_DB_PASSWORD`
-mysql -uroot -p$MYSQL_ROOT_PASSWORD << EOF || exit 1
+mysqlcmd -uroot -p$MYSQL_ROOT_PASSWORD << EOF || exit 1
CREATE DATABASE /*!32312 IF NOT EXISTS*/ cnfm /*!40100 DEFAULT CHARACTER SET latin1 */;
DROP USER IF EXISTS '${CNFM_DB_USER}';
CREATE USER '${CNFM_DB_USER}';
DB_PASSWORD=`prepare_password $DB_PASSWORD`
-mysql -uroot -p$MYSQL_ROOT_PASSWORD << EOF || exit 1
+mysqlcmd -uroot -p$MYSQL_ROOT_PASSWORD << EOF || exit 1
DROP USER IF EXISTS '${DB_USER}';
CREATE USER '${DB_USER}';
GRANT USAGE ON *.* TO '${DB_USER}'@'%' IDENTIFIED BY '${DB_PASSWORD}';
DB_ADMIN_PASSWORD=`prepare_password $DB_ADMIN_PASSWORD`
-mysql -uroot -p$MYSQL_ROOT_PASSWORD << EOF || exit 1
+mysqlcmd -uroot -p$MYSQL_ROOT_PASSWORD << EOF || exit 1
DROP USER IF EXISTS '${DB_ADMIN}';
CREATE USER '${DB_ADMIN}';
GRANT USAGE ON *.* TO '${DB_ADMIN}'@'%' IDENTIFIED BY '${DB_ADMIN_PASSWORD}';
initContainers: {{ include "common.readinessCheck.waitFor" . | nindent 6 }}
containers:
- name: {{ include "common.name" . }}-config
- image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
+ image: {{ include "repositoryGenerator.image.mariadb" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- /bin/bash
- >
{{- if include "common.onServiceMesh" . }}
echo "waiting 15s for istio side cars to be up"; sleep 15s;{{- end }}
- mysql() { /usr/bin/mysql -h ${DB_HOST} -P ${DB_PORT} "$@"; };
- export -f mysql;
- mysql --user=root --password=${MYSQL_ROOT_PASSWORD} requestdb -e exit > /dev/null 2>&1 {{ if not .Values.global.migration.enabled }} && echo "Database already initialized!!!" && exit 0 {{ end }};
- for f in /docker-entrypoint-initdb.d/*; do case "$f" in *.sh) echo "$0: running $f"; . "$f" ;; *.sql) echo "$0: running $f"; "${mysql[@]}" < "$f"; echo ;; *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | "${mysql[@]}"; echo ;; *) echo "$0: ignoring $f" ;; esac; echo; done;
+ mysqlcmd() { mariadb -h ${DB_HOST} -P ${DB_PORT} "$@"; };
+ export -f mysqlcmd;
+ mysqlcmd --user=root --password=${MYSQL_ROOT_PASSWORD} requestdb -e exit > /dev/null 2>&1 {{ if not .Values.global.migration.enabled }} && echo "Database already initialized!!!" && exit 0 {{ end }};
+ for f in /docker-entrypoint-initdb.d/*; do case "$f" in *.sh) echo "$0: running $f"; . "$f" ;; *.sql) echo "$0: running $f"; "${mysqlcmd[@]}" < "$f"; echo ;; *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | "${mysqlcmd[@]}"; echo ;; *) echo "$0: ignoring $f" ;; esac; echo; done;
{{- if .Values.global.migration.enabled }}
- mysql -vv --user=root --password=${MYSQL_ROOT_PASSWORD} < `ls -tr /var/data/mariadb/* | tail -1`;
+ mysqlcmd -vv --user=root --password=${MYSQL_ROOT_PASSWORD} < `ls -tr /var/data/mariadb/* | tail -1`;
{{- end }}
env:
- name: DB_HOST
nodePortPrefix: 302
nodePortPrefixExt: 304
repository: nexus3.onap.org:10001
- readinessImage: onap/oom/readiness:6.1.2
+ readinessImage: onap/oom/readiness:6.2.0
ubuntuInitRepository: docker.io
mariadbGalera:
# flag to enable the DB creation via mariadb-operator
#################################################################
# Application configuration defaults.
#################################################################
-# application image
-repository: nexus3.onap.org:10001
-image: mariadb:10.1.38
pullPolicy: Always
-ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
# Local mariadb galera instance default name
mariadb-galera:
Code Review / oom.git / commitdiff