repository: 'file://components/aai-babel'
condition: aai-babel.enabled
- name: aai-graphadmin
- version: ~15.x-0
+ version: ~16.x-0
repository: 'file://components/aai-graphadmin'
condition: aai-graphadmin.enabled
- name: aai-modelloader
apiVersion: v2
description: ONAP AAI GraphAdmin
name: aai-graphadmin
-version: 15.0.2
+version: 16.0.0
dependencies:
- name: common
aai.server.url=http://aai.{{ include "common.namespace" . }}/aai/{{ .Values.global.config.schema.version.api.default }}/
aai.global.callback.url=http://aai.{{ include "common.namespace" . }}/aai/
-{{- if or (.Values.global.config.basic.auth.enabled) ( include "common.onServiceMesh" .) }}
+{{- if or (.Values.global.auth.enabled) ( include "common.onServiceMesh" .) }}
aai.tools.enableBasicAuth=true
-aai.tools.username={{ (index .Values.global.config.basic.auth.users 0).username }}
-aai.tools.password={{ (index .Values.global.config.basic.auth.users 0).password }}
+aai.tools.username={{ (index .Values.global.auth.users 0).username }}
+aai.tools.password={{ (index .Values.global.auth.users 0).password }}
{{- end }}
aai.notification.current.version={{ .Values.global.config.schema.version.api.default }}
aai.datagrooming.enableghost2checkoff=false
aai.datagrooming.enableghost2fixon=false
aai.datagrooming.enablef=false
-aai.datagrooming.enableskipindexupdatefix=true
+aai.datagrooming.enableskipindexupdatefix=false
# used by the dataGrooming to set values
aai.datagrooming.timewindowminutesvalue=10500
# If thats not it, please check if the key-store file path makes sense
server.local.startpath=/opt/app/aai-graphadmin/resources/
-server.port=8449
+server.port={{ .Values.service.appPort }}
spring.kafka.producer.bootstrap-servers=${BOOTSTRAP_SERVERS}
spring.kafka.producer.properties.security.protocol=SASL_PLAINTEXT
aai.actuator.echo.enabled={{ .Values.actuator.echo.enabled }}
aai.graph.properties.path=${server.local.startpath}/etc/appprops/janusgraph-realtime.properties
-aai.basic-auth.enabled={{ .Values.global.config.basic.auth.enabled }}
-{{- range $index, $user := .Values.global.config.basic.auth.users }}
+aai.basic-auth.enabled={{ .Values.global.auth.enabled }}
+{{- range $index, $user := .Values.global.auth.users }}
aai.basic-auth.users[{{ $index }}].username={{ $user.username }}
aai.basic-auth.users[{{ $index }}].password={{ $user.password }}
{{- end }}
+++ /dev/null
-{{/*
-#
-# ============LICENSE_START=======================================================
-# org.onap.aai
-# ================================================================================
-# Copyright � 2018 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=========================================================
-# format : username: password[,rolename ...]
-# default username/password: AAI/AAI, MSO/MSO, ModelLoader/ModelLoader...
-*/ -}}
-AAI:OBF:1gfr1ev31gg7,admin
-MSO:OBF:1jzx1lz31k01,admin
-SDNC:OBF:1itr1i0l1i151isv,admin
-DCAE:OBF:1g8u1f9d1f991g8w,admin
-POLICY:OBF:1mk61i171ima1im41i0j1mko,admin
-ASDC:OBF:1f991j0u1j001f9d,admin
-ModelLoader:OBF:1qvu1v2h1sov1sar1wfw1j7j1wg21saj1sov1v1x1qxw,admin
-AaiUI:OBF:1gfr1p571unz1p4j1gg7,admin
-OOF:OBF:1img1ke71ily,admin
-aai@aai.onap.org:OBF:1fia1ju61l871lfe18xp18xr18xt1lc41l531jrk1fek,admin
-so@so.onap.org:OBF:1fia1ju61l871lfe18xp18xr18xt1lc41l531jrk1fek,admin
-sdnc@sdnc.onap.org:OBF:1fia1ju61l871lfe18xp18xr18xt1lc41l531jrk1fek,admin
-dcae@dcae.onap.org:OBF:1fia1ju61l871lfe18xp18xr18xt1lc41l531jrk1fek,admin
-policy@policy.onap.org:OBF:1fia1ju61l871lfe18xp18xr18xt1lc41l531jrk1fek,admin
-sdc@sdc.onap.org:OBF:1fia1ju61l871lfe18xp18xr18xt1lc41l531jrk1fek,admin
-oof@oof.onap.org:OBF:1fia1ju61l871lfe18xp18xr18xt1lc41l531jrk1fek,admin
-pomba@pomba.onap.org:OBF:1fia1ju61l871lfe18xp18xr18xt1lc41l531jrk1fek,admin
-vfc@vfc.onap.org:OBF:1fia1ju61l871lfe18xp18xr18xt1lc41l531jrk1fek,admin
-{{- define "aai.waitForSchemaCreation" -}}
-- name: wait-for-schema-creation
- image: "{{ include "repositoryGenerator.image.curl" . }}"
- imagePullPolicy: IfNotPresent
- command: ["/bin/sh", "-c"]
- args:
- - |
- URL="{{ required "URL is required" (.Values.schemaInitCheckURL | default "http://aai-graphadmin:8449/isSchemaInitialized") }}"
- AUTH="{{ printf "%s:%s" (index .Values.global.config.basic.auth.users 0).username (index .Values.global.config.basic.auth.users 0).password }}"
- while true; do
- RESPONSE=$(curl -u $AUTH -s $URL)
- if [ "$RESPONSE" = "true" ]; then
- echo "Request successful. Schema is initialized."
- exit 0
- else
- echo "Request unsuccessful. Schema is not yet initialized. Retrying in 3 seconds..."
- sleep 3
- fi
- done
- {{ include "common.containerSecurityContext" . | indent 2 | trim }}
-{{- end -}}
-
{{- define "aai.waitForSchemaService" -}}
- name: wait-for-schema-service
image: "{{ include "repositoryGenerator.image.curl" . }}"
args:
- |
URL="{{ required "URL is required" (.Values.schemaInitCheckURL | default "http://aai-schema-service:8452/aai/schema-service/util/echo") }}"
- AUTH="{{ printf "%s:%s" (index .Values.global.config.basic.auth.users 0).username (index .Values.global.config.basic.auth.users 0).password }}"
+ AUTH="{{ printf "%s:%s" (index .Values.global.auth.users 0).username (index .Values.global.auth.users 0).password }}"
while true; do
if curl --fail --header 'X-FromAppId: graphadmin' --header 'X-TransactionId: someTransaction' -u $AUTH -s $URL; then
echo "Request successful. Schema-service is available"
{{ tpl (.Files.Glob "resources/config/logback.xml").AsConfig . | indent 2 }}
{{ tpl (.Files.Glob "resources/config/localhost-access-logback.xml").AsConfig . | indent 2 }}
{{ tpl (.Files.Glob "resources/config/janusgraph-realtime.properties").AsConfig . | indent 2 }}
-{{ tpl (.Files.Glob "resources/config/realm.properties").AsConfig . | indent 2 }}
---
apiVersion: v1
kind: ConfigMap
terminationGracePeriodSeconds: {{ .Values.service.terminationGracePeriodSeconds }}
{{- if .Values.global.initContainers.enabled }}
initContainers:
- {{- if not .Values.createDbSchemaViaJob.enabled }}
{{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.waitForCassandraService ) | indent 8 | trim }}
+ {{- if not .Values.createDbSchemaViaJob.enabled }}
+ {{- include "aai.waitForSchemaService" . | nindent 8 }}
- name: {{ include "common.name" . }}-create-db-schema
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- mountPath: /opt/app/aai-graphadmin/resources/localhost-access-logback.xml
name: config
subPath: localhost-access-logback.xml
- - mountPath: /opt/app/aai-graphadmin/resources/etc/auth/realm.properties
- name: config
- subPath: realm.properties
- mountPath: /opt/app/aai-graphadmin/resources/application.properties
name: properties
subPath: application.properties
enabled: false
duplicates:
enabled: false
+ # Specifies if basic authorization is enabled
+ auth:
+ enabled: true
+ # users that can authenticate via basic auth
+ users:
+ - username: aai@aai.onap.org
+ password: demo123456!
+ - username: AAI
+ password: AAI
config:
# Specifies that the cluster connected to a dynamic
# cluster being spinned up by kubernetes deployment
cluster:
cassandra:
dynamic: true
- # Specifies if the basic authorization is enabled
- basic:
- auth:
- enabled: true
- users:
- - username: aai@aai.onap.org
- password: demo123456!
- - username: AAI
- password: AAI
# Notification event specific properties
notification:
eventType: AAI-EVENT
clients: SDNC,-1|MSO,-1|SO,-1|robot-ete,-1
# application image
-image: onap/aai-graphadmin:1.15.6
+image: onap/aai-graphadmin:1.16.0
pullPolicy: Always
restartPolicy: Always
flavor: small
-{{- define "aai.waitForSchemaCreation" -}}
+{{- define "aairesources.waitForSchemaCreation" -}}
- name: wait-for-schema-creation
image: "{{ include "repositoryGenerator.image.curl" . }}"
imagePullPolicy: IfNotPresent
{{- if .Values.global.jobs.migration.enabled }}
{{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_migration) | nindent 8 }}
{{- else if .Values.global.jobs.createSchema.enabled }}
- {{ include "aai.waitForSchemaCreation" . | nindent 6 }}
+ {{ include "aairesources.waitForSchemaCreation" . | nindent 6 }}
{{- end }}
containers:
- name: {{ include "common.name" . }}
Code Review / oom.git / commitdiff