path: application.properties
- key: logback.xml
path: logback.xml
+ - key: ONAP_RootCA.cer
+ path: ONAP_RootCA.cer
- name: {{ include "common.fullname" . }}-blueprints
persistentVolumeClaim:
claimName: {{ .Release.Name }}-cds-blueprints
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/multicloud/openstack-fcaps:1.3.4
+image: onap/multicloud/openstack-fcaps:1.4.1
pullPolicy: Always
#Istio sidecar injection policy
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/multicloud/openstack-pike:1.3.4
+image: onap/multicloud/openstack-pike:1.4.1
pullPolicy: Always
#Istio sidecar injection policy
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/multicloud/openstack-starlingx:1.3.4
+image: onap/multicloud/openstack-starlingx:1.4.1
pullPolicy: Always
#Istio sidecar injection policy
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/multicloud/vio:1.3.1
+image: onap/multicloud/vio:1.4.1
pullPolicy: Always
#Istio sidecar injection policy
annotations:
sidecar.istio.io/inject: "{{.Values.istioSidecar}}"
spec:
+ initContainers:
+ - command: ["sh", "-c", "chown -R 100:101 /data"]
+ image: "{{ .Values.global.ubuntuInitRepository }}/{{ .Values.global.ubuntuInitImage }}"
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ name: {{ include "common.name" . }}-init
+ volumeMounts:
+ - mountPath: /data
+ name: artifact-data
containers:
- env:
- name: MSB_ADDR
configMap:
name: {{ include "common.fullname" . }}-log-configmap
- name: artifact-data
+ {{- if .Values.persistence.enabled }}
+ persistentVolumeClaim:
+ claimName: {{ include "common.fullname" . }}
+ {{- else }}
emptyDir: {}
+ {{- end }}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
restartPolicy: Always
--- /dev/null
+{{/*
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# 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.
+*/}}
+
+{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) -}}
+kind: PersistentVolume
+apiVersion: v1
+metadata:
+ name: {{ include "common.fullname" . }}
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+ release: "{{ .Release.Name }}"
+ heritage: "{{ .Release.Service }}"
+ name: {{ include "common.fullname" . }}
+spec:
+ capacity:
+ storage: {{ .Values.persistence.size}}
+ accessModes:
+ - {{ .Values.persistence.accessMode }}
+ persistentVolumeReclaimPolicy: {{ .Values.persistence.volumeReclaimPolicy }}
+ hostPath:
+ path: {{ default .Values.persistence.mountPath }}/{{ .Release.Name }}/{{ .Values.persistence.mountSubPath }}
+{{- end -}}
--- /dev/null
+{{/*
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# 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.
+*/}}
+
+{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) -}}
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+ name: {{ include "common.fullname" .}}
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+ release: "{{ .Release.Name }}"
+ heritage: "{{ .Release.Service }}"
+{{- if .Values.persistence.annotations }}
+ annotations:
+{{ toYaml .Values.persistence.annotations | indent 4 }}
+{{- end }}
+spec:
+ selector:
+ matchLabels:
+ app: {{ include "common.name" . }}
+ accessModes:
+ - {{ .Values.persistence.accessMode }}
+ resources:
+ requests:
+ storage: {{ .Values.persistence.size }}
+{{- end -}}
#################################################################
global:
nodePortPrefix: 302
+ ubuntuInitRepository: oomk8s
+ ubuntuInitImage: ubuntu-init:1.0.0
#################################################################
# Application configuration defaults.
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/multicloud/openstack-windriver:1.3.4
+image: onap/multicloud/openstack-windriver:1.4.1
pullPolicy: Always
#Istio sidecar injection policy
ingress:
enabled: false
+persistence:
+ enabled: true
+ mountPath: /dockerdata-nfs
+ mountSubPath: multicloud-windriver/data
+ volumeReclaimPolicy: Retain
+ accessMode: ReadWriteOnce
+ size: 5Gi
+
# Resource Limit flavor -By Default using small
flavor: small
# Segregation for Different environment (Small and Large)
nodePortPrefix: 302
loggingRepository: docker.elastic.co
loggingImage: beats/filebeat:5.5.0
- artifactImage: onap/multicloud/framework-artifactbroker:1.4.0
+ artifactImage: onap/multicloud/framework-artifactbroker:1.4.1
prometheus:
enabled: false
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/multicloud/framework:1.4.0
+image: onap/multicloud/framework:1.4.1
pullPolicy: Always
#Istio sidecar injection policy
commonConfigPrefix: onap-oof-has
image:
readiness: oomk8s/readiness-check:2.0.0
- optf_has: onap/optf-has:1.3.2
+ optf_has: onap/optf-has:1.3.3
filebeat: docker.elastic.co/beats/filebeat:5.5.0
pullPolicy: Always
jvmOpts: -server -Xms1024m -Xmx2048m
aaf:
- enabled: "true"
+ enabled: "false"
keystore:
password: Pol1cy_0nap
password: demo123456!
nexus:
- nexus: admin
+ user: admin
password: admin123
port: 8081
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/portal-app:2.5.0
+image: onap/portal-app:2.6.0
pullPolicy: Always
# default number of instances
update fn_app set app_url = 'http://{{.Values.config.dmaapBcHostName}}:{{.Values.config.dmaapBcPort}}/ECOMPDBCAPP/dbc#/dmaap', app_rest_endpoint = 'http://dmaap-bc:8989/ECOMPDBCAPP/api/v2' where app_name = 'DMaaP Bus Ctrl';
--sdc-be => 8443:30204, 8080:30205
--sdc-fe => 8181:30206, 9443:30207
-update fn_app set app_url = 'http://{{.Values.config.sdcFeHostName}}:{{.Values.config.sdcFePort}}/sdc1/portal', app_rest_endpoint = 'http://sdc-be:8080/api/v3' where app_name = 'SDC';
+update fn_app set app_url = 'https://{{.Values.config.sdcFeHostName}}:{{.Values.config.sdcFePort}}/sdc1/portal', app_rest_endpoint = 'https://sdc-be:8443/api/v3' where app_name = 'SDC';
--pap => 8443:30219
update fn_app set app_url = 'https://{{.Values.config.papHostName}}:{{.Values.config.papPort}}/onap/policy', app_rest_endpoint = 'https://pap:8443/onap/api/v3' where app_name = 'Policy';
--vid => 8080:30200
# application image
repository: nexus3.onap.org:10001
-image: onap/portal-db:2.5.0
+image: onap/portal-db:2.6.0
pullPolicy: Always
readinessImage: readiness-check:2.0.0
mariadbRootPassword: Aa123456
#The directory where sql files are found in the projects gerrit repo.
sqlSourceDirectory: portal/deliveries
- # sdc frontend assignment for port 8181
- sdcFePort: "30206"
+ # sdc frontend assignment for port 9443
+ sdcFePort: "30207"
# application's front end hostname. Must be resolvable on the client side environment
sdcFeHostName: "sdc.api.fe.simpledemo.onap.org"
# policy pap ui assignment for port 8443
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- /start-apache-tomcat.sh
+ - -b
+ - "{{ .Values.global.env.tomcatDir }}"
ports:
- containerPort: {{ .Values.service.internalPort }}
{{- if eq .Values.liveness.enabled true }}
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/portal-sdk:2.5.0
+image: onap/portal-sdk:2.6.0
pullPolicy: Always
# flag to enable debugging - application support required
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/portal-wms:2.5.0
+image: onap/portal-wms:2.6.0
pullPolicy: Always
# flag to enable debugging - application support required
livenessProbe:
httpGet:
path: /sdc2/rest/version
- port: {{ .Values.service.internalPort2 }}
+ port: {{ .Values.service.internalPort }}
+ scheme: HTTPS
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/sdc-backend:1.5.1
-backendInitImage: onap/sdc-backend-init:1.5.1
+image: onap/sdc-backend:1.5.2
+backendInitImage: onap/sdc-backend-init:1.5.2
pullPolicy: Always
# flag to enable debugging - application support required
cpu: 20m
memory: 2Gi
unlimited: {}
-
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/sdc-cassandra:1.5.1
-cassandraInitImage: onap/sdc-cassandra-init:1.5.1
+image: onap/sdc-cassandra:1.5.2
+cassandraInitImage: onap/sdc-cassandra-init:1.5.2
pullPolicy: Always
{{ if eq .Values.liveness.enabled true }}
livenessProbe:
tcpSocket:
- port: {{ .Values.service.internalPort }}
+ port: {{ .Values.service.internalPort2 }}
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
{{ end }}
readinessProbe:
httpGet:
path: /dcae/conf/composition
- port: {{ .Values.service.internalPort }}
+ port: {{ .Values.service.internalPort2 }}
+ scheme: HTTPS
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
fieldPath: status.podIP
volumeMounts:
- name: {{ include "common.fullname" . }}-environments
- mountPath: /var/opt/dcae-be/chef-solo/environments/
+ mountPath: /root/chef-solo/environments/
- name: {{ include "common.fullname" . }}-localtime
mountPath: /etc/localtime
readOnly: true
- name: {{ include "common.fullname" . }}-logs
- mountPath: /var/log/onap
+ mountPath: /var/lib/jetty/logs
- name: {{ include "common.fullname" . }}-logback
mountPath: /tmp/logback.xml
subPath: logback.xml
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- name: {{ include "common.fullname" . }}-environments
- mountPath: /var/opt/dcae-tools/chef-solo/environments
+ mountPath: /root/chef-solo/environments
env:
- name: ENVNAME
value: {{ .Values.global.env.name }}
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/dcae-be:1.3.1
+image: onap/dcae-be:1.3.2
pullPolicy: Always
-backendInitImage: onap/dcae-tools:1.3.1
+backendInitImage: onap/dcae-tools:1.3.2
# flag to enable debugging - application support required
debugEnabled: false
{{ if eq .Values.liveness.enabled true }}
livenessProbe:
tcpSocket:
- port: {{ .Values.service.internalPort }}
+ port: {{ .Values.service.internalPort2 }}
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
{{ end }}
readinessProbe:
httpGet:
path: /dcae/healthCheckOld
- port: {{ .Values.service.internalPort }}
+ port: {{ .Values.service.internalPort2 }}
+ scheme: HTTPS
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
fieldPath: status.podIP
volumeMounts:
- name: {{ include "common.fullname" . }}-environments
- mountPath: /var/opt/dcae-dt/chef-solo/environments/
+ mountPath: /root/chef-solo/environments/
- name: {{ include "common.fullname" . }}-localtime
mountPath: /etc/localtime
readOnly: true
- name: {{ include "common.fullname" . }}-logs
- mountPath: /var/log/onap
+ mountPath: /var/lib/jetty/logs
- name: {{ include "common.fullname" . }}-logback
mountPath: /tmp/logback.xml
subPath: logback.xml
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/dcae-dt:1.3.1
+image: onap/dcae-dt:1.3.2
pullPolicy: IfNotPresent
config:
javaOptions: -XX:MaxPermSize=256m -Xmx1024m -Dconfig.home=config -Dlog.home=/var/lib/jetty/logs/ -Dlogging.config=config/dcae-dt/logback-spring.xml
{{ if eq .Values.liveness.enabled true }}
livenessProbe:
tcpSocket:
- port: {{ .Values.service.internalPort }}
+ port: {{ .Values.service.internalPort2 }}
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
{{ end }}
readinessProbe:
httpGet:
path: /dcaed/healthCheck
- port: {{ .Values.service.internalPort }}
+ port: {{ .Values.service.internalPort2 }}
+ scheme: HTTPS
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
fieldPath: status.podIP
volumeMounts:
- name: {{ include "common.fullname" . }}-environments
- mountPath: /var/opt/dcae-fe/chef-solo/environments/
+ mountPath: /root/chef-solo/environments/
- name: {{ include "common.fullname" . }}-localtime
mountPath: /etc/localtime
readOnly: true
- name: {{ include "common.fullname" . }}-logs
- mountPath: /var/log/onap
+ mountPath: /var/lib/jetty/logs
- name: {{ include "common.fullname" . }}-logback
mountPath: /tmp/logback.xml
subPath: logback.xml
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/dcae-fe:1.3.1
+image: onap/dcae-fe:1.3.2
pullPolicy: Always
config:
javaOptions: -XX:MaxPermSize=256m -Xmx1024m -Dconfig.home=config -Dlog.home=/var/lib/jetty/logs/ -Dlogging.config=config/dcae-fe/logback-spring.xml
{{ if eq .Values.liveness.enabled true }}
livenessProbe:
tcpSocket:
- port: {{ .Values.service.internalPort }}
+ port: {{ .Values.service.internalPort2 }}
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
{{ end }}
fieldPath: status.podIP
volumeMounts:
- name: {{ include "common.fullname" . }}-environments
- mountPath: /var/opt/dcae-be/chef-solo/environments/
+ mountPath: /root/chef-solo/environments/
- name: {{ include "common.fullname" . }}-localtime
mountPath: /etc/localtime
readOnly: true
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/sdc-elasticsearch:1.5.1
-elasticInitImage: onap/sdc-init-elasticsearch:1.5.1
+image: onap/sdc-elasticsearch:1.5.2
+elasticInitImage: onap/sdc-init-elasticsearch:1.5.2
pullPolicy: Always
# flag to enable debugging - application support required
{{ if eq .Values.liveness.enabled true }}
livenessProbe:
tcpSocket:
- port: {{ .Values.service.internalPort }}
+ port: {{ .Values.service.internalPort2 }}
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
{{ end }}
readinessProbe:
tcpSocket:
- port: {{ .Values.service.internalPort }}
+ port: {{ .Values.service.internalPort2 }}
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/sdc-frontend:1.5.1
+image: onap/sdc-frontend:1.5.2
pullPolicy: Always
config:
javaOptions: "-Xmx256m -Xms256m"
plugins:
- dcae_discovery_url: "http://sdc-dcae-fe:8183/dcaed/#/home"
- dcae_source_url: "http://sdc.dcae.plugin.simpledemo.onap.org:30263/dcaed/#/home"
- dcae_dt_discovery_url: "http://sdc-dcae-dt:8186/dcae/#/dcae/home"
- dcae_dt_source_url: "http://sdc.dcae.plugin.simpledemo.onap.org:30265/dcae/#/dcae/home"
+ dcae_discovery_url: "https://sdc-dcae-fe:9444/dcaed/#/home"
+ dcae_source_url: "https://sdc.dcae.plugin.simpledemo.onap.org:30264/dcaed/#/home"
+ dcae_dt_discovery_url: "https://sdc-dcae-dt:9446/dcae/#/dcae/home"
+ dcae_dt_source_url: "https://sdc.dcae.plugin.simpledemo.onap.org:30266/dcae/#/dcae/home"
workflow_discovery_url: "http://sdc-wfd-fe:8080/workflows"
workflow_source_url: "https://sdc.workflow.plugin.simpledemo.onap.org:30431/workflows/"
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/sdc-kibana:1.5.1
+image: onap/sdc-kibana:1.5.2
pullPolicy: Always
config:
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/sdc-onboard-backend:1.5.1
-onboardingInitImage: onap/sdc-onboard-cassandra-init:1.5.1
+image: onap/sdc-onboard-backend:1.5.2
+onboardingInitImage: onap/sdc-onboard-cassandra-init:1.5.2
pullPolicy: Always
# flag to enable debugging - application support required
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/workflow-backend:1.4.1
-configInitImage: onap/workflow-init:1.4.1
+image: onap/workflow-backend:1.5.1
+configInitImage: onap/workflow-init:1.5.1
pullPolicy: Always
# flag to enable debugging - application support required
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/workflow-frontend:1.4.1
+image: onap/workflow-frontend:1.5.1
pullPolicy: Always
# flag to enable debugging - application support required
"chef_type": "environment",
"default_attributes": {
- "disableHttp": false,
+ "disableHttp": true,
"CS_VIP": "{{.Values.global.cassandra.serviceName}}.{{include "common.namespace" .}}",
"BE_VIP": "sdc-be.{{include "common.namespace" .}}",
"ONBOARDING_BE_VIP": "sdc-onboarding-be.{{include "common.namespace" .}}",
flavor: small
repository: nexus3.onap.org:10001
-image: onap/vfc/catalog:1.3.2
+image: onap/vfc/catalog:1.3.4
pullPolicy: Always
#Istio sidecar injection policy
flavor: small
repository: nexus3.onap.org:10001
-image: onap/vfc/gvnfmdriver:1.3.3
+image: onap/vfc/gvnfmdriver:1.3.5
pullPolicy: Always
#Istio sidecar injection policy
value: "{{ .Values.global.config.dbUser }}:{{ .Values.global.config.mariadbRootPassword }}"
- name: REDIS_ADDR
value: "{{ .Values.global.config.redisServiceName }}:{{ .Values.global.config.redisPort }}"
+ - name: REG_TO_MSB_WHEN_START
+ value: "{{ .Values.global.config.reg_to_msb_when_start }}"
volumeMounts:
- name: {{ include "common.fullname" . }}-localtime
mountPath: /etc/localtime
flavor: small
repository: nexus3.onap.org:10001
-image: onap/vfc/nslcm:1.3.2
+image: onap/vfc/nslcm:1.3.4
pullPolicy: Always
#Istio sidecar injection policy
flavor: small
repository: nexus3.onap.org:10001
-image: onap/vfc/db:1.3.0
+image: onap/vfc/db:1.3.1
pullPolicy: Always
# flag to enable debugging - application support required
flavor: small
repository: nexus3.onap.org:10001
-image: onap/vfc/vnflcm:1.3.2
+image: onap/vfc/vnflcm:1.3.4
pullPolicy: Always
#Istio sidecar injection policy
flavor: small
repository: nexus3.onap.org:10001
-image: onap/vfc/vnfmgr:1.3.3
+image: onap/vfc/vnfmgr:1.3.4
pullPolicy: Always
#Istio sidecar injection policy
flavor: small
repository: nexus3.onap.org:10001
-image: onap/vfc/vnfres:1.3.2
+image: onap/vfc/vnfres:1.3.4
pullPolicy: Always
#Istio sidecar injection policy
mariadbRootPassword: secretpassword
redisServiceName: vfc-redis
redisPort: 6379
+ reg_to_msb_when_start: True
persistence:
mountPath: /dockerdata-nfs
value: "{{ .Values.config.asdcclientrestauth }}"
- name: ASDC_CLIENT_REST_PORT
value: "{{ .Values.config.asdcclientrestport }}"
+ - name: ASDC_CLIENT_REST_PROTOCOL
+ value: "https"
- name: VID_AAI_URL
value: https://aai.{{ include "common.namespace" . }}:{{ .Values.config.vidaaiport }}
- name: VID_ECOMP_SHARED_CONTEXT_REST_URL
config:
vidmysqlpassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
asdcclientrestauth: "Basic dmlkOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
- asdcclientrestport: "8080"
+ asdcclientrestport: "8443"
vidaaiport: "8443"
onapport: "30225"
onapportrest: "8443"