diff options
| author |   Fiachra Corcoran <fiachra.corcoran@est.tech> | 2022-11-26 06:05:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2022-11-26 06:05:01 +0000 |
| commit | 2a3ccd13bfa627ff6284d96dd1a61890ca630918 (patch) | |
| tree | e7084762a1f8d60050c7899660e705ae2b6d1895 /kubernetes/aai | |
| parent | 43815726c3cf6259004c7a6343f710f049c348ee (diff) | |
| parent | 9a96ffdf8bc639f01e23649dd4e0864f7f276951 (diff) | |
Merge "[AAI] OOM AAI MODEL LOADER Fixed BabelClient" into jakarta
Diffstat (limited to 'kubernetes/aai')
| -rw-r--r-- | kubernetes/aai/components/aai-modelloader/resources/config/model-loader.properties | 11 | ||||
| -rw-r--r-- | kubernetes/aai/components/aai-modelloader/values.yaml | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/kubernetes/aai/components/aai-modelloader/resources/config/model-loader.properties b/kubernetes/aai/components/aai-modelloader/resources/config/model-loader.properties index 09eb397860..ab5dd95b21 100644 --- a/kubernetes/aai/components/aai-modelloader/resources/config/model-loader.properties +++ b/kubernetes/aai/components/aai-modelloader/resources/config/model-loader.properties @@ -41,8 +41,10 @@ ml.distribution.MSG_BUS_ADDRESSES=message-router.{{.Release.Namespace}} ml.aai.BASE_URL=https://aai.{{.Release.Namespace}}:8443 ml.aai.KEYSTORE_FILE=aai-os-cert.p12 ml.aai.KEYSTORE_PASSWORD=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o +ml.aai.USE_HTTPS= true {{ else }} -ml.aai.BASE_URL=http://aai.{{.Release.Namespace}}:8080 +ml.aai.BASE_URL=http://aai.{{.Release.Namespace}}:80 +ml.aai.USE_HTTPS= false {{ end }} ml.aai.MODEL_URL=/aai/v*/service-design-and-creation/models/model/ ml.aai.NAMED_QUERY_URL=/aai/v*/service-design-and-creation/named-queries/named-query/ @@ -59,4 +61,11 @@ ml.babel.KEYSTORE_FILE=aaf/local/{{ .Values.certInitializer.fqi_namespace }}.p12 ml.babel.KEYSTORE_PASSWORD=${KEYSTORE_PASSWORD} ml.babel.TRUSTSTORE_FILE=aaf/local/{{ .Values.certInitializer.fqi_namespace }}.trust.jks ml.babel.TRUSTSTORE_PASSWORD=${TRUSTSTORE_PASSWORD} +ml.babel.USE_HTTPS= true +{{ else }} +ml.babel.KEYSTORE_FILE= +ml.babel.KEYSTORE_PASSWORD= +ml.babel.TRUSTSTORE_FILE= +ml.babel.TRUSTSTORE_PASSWORD= +ml.babel.USE_HTTPS= false {{ end }} diff --git a/kubernetes/aai/components/aai-modelloader/values.yaml b/kubernetes/aai/components/aai-modelloader/values.yaml index e956ebac15..7fdcf04ae3 100644 --- a/kubernetes/aai/components/aai-modelloader/values.yaml +++ b/kubernetes/aai/components/aai-modelloader/values.yaml @@ -56,7 +56,7 @@ certInitializer: chown -R {{ .Values.user_id }}:{{ .Values.group_id }} {{ .Values.credsPath }} # application image -image: onap/model-loader:1.9.4 +image: onap/model-loader:1.9.5 pullPolicy: Always restartPolicy: Always flavor: small |