# limitations under the License.
apiVersion: v1
-description: Champ microservice
-name: champ
+description: ONAP AAI Champ microservice
+name: aai-champ
version: 2.0.0
<entry key="graph.name" value="aaigraph.dev"/>
<entry key="storage.backend" value="hbase"/>
- <entry key="storage.hostname" value="hbase.{{.Release.Namespace}}"/>
+ <entry key="storage.hostname" value="aai-hbase.{{.Release.Namespace}}"/>
<!-- Hbase Config -->
<entry key="storage.hbase.ext.hbase.zookeeper.property.clientPort" value="2181"/>
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ include "common.fullname" . }}-configmap
+ name: {{ include "common.fullname" . }}
namespace: {{ include "common.namespace" . }}
data:
{{ tpl (.Files.Glob "resources/config/appconfig/*").AsConfig . | indent 2 }}
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ include "common.fullname" . }}-dynamic-configmap
+ name: {{ include "common.fullname" . }}-dynamic
namespace: {{ include "common.namespace" . }}
data:
{{ tpl (.Files.Glob "resources/config/dynamic/conf/*").AsConfig . | indent 2 }}
value: "/opt/app/champ-service/appconfig"
- name: GRAPHIMPL
value: "janus-deps"
+ - name: KEY_STORE_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: {{ template "common.fullname" . }}-pass
+ key: KEY_STORE_PASSWORD
+ - name: KEY_MANAGER_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: {{ template "common.fullname" . }}-pass
+ key: KEY_MANAGER_PASSWORD
- name: SERVICE_BEANS
value: "/opt/app/champ-service/dynamic/conf"
volumeMounts:
path: /etc/localtime
- name: {{ include "common.fullname" . }}-config
configMap:
- name: {{ include "common.fullname" . }}-configmap
+ name: {{ include "common.fullname" . }}
items:
- key: champ-api.properties
path: champ-api.properties
- name: {{ include "common.fullname" . }}-secrets
secret:
- secretName: {{ include "common.fullname" . }}-champ-secrets
+ secretName: {{ include "common.fullname" . }}-champ
- name: {{ include "common.fullname" . }}-dynamic-config
configMap:
- name: {{ include "common.fullname" . }}-dynamic-configmap
+ name: {{ include "common.fullname" . }}-dynamic
items:
- key: champ-beans.xml
path: champ-beans.xml
apiVersion: v1
kind: Secret
metadata:
- name: {{ include "common.fullname" . }}-champ-secrets
+ name: {{ include "common.fullname" . }}-champ
namespace: {{ include "common.namespace" . }}
type: Opaque
data:
{{ tpl (.Files.Glob "resources/config/appconfig/auth/*").AsSecrets . | indent 2 }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+ name: {{ include "common.fullname" . }}-pass
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+type: Opaque
+data:
+ KEY_STORE_PASSWORD: {{ .Values.config.keyStorePassword | b64enc | quote }}
+ KEY_MANAGER_PASSWORD: {{ .Values.config.keyManagerPassword | b64enc | quote }}
+
#################################################################
# application image
-image: onap/champ:1.2.0
+image: onap/champ:1.2-STAGING-latest
+
+# application configuration
+config:
+ keyStorePassword: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+ keyManagerPassword: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
# default number of instances
replicaCount: 1
service:
type: NodePort
name: champ
- externalPort: 78
internalPort: 9522
nodePort: 78
apiVersion: v1
description: Gizmo service
-name: gizmo
-version: 2.0.0
\ No newline at end of file
+name: aai-gizmo
+version: 2.0.0
">
<bean id="champDao" class="org.onap.crud.dao.champ.ChampDao">
- <constructor-arg name="champUrl" value="https://{{.Release.Name}}-champ.{{.Release.Namespace}}:9522/services/champ-service/v1/"/>
+ <constructor-arg name="champUrl" value="https://{{.Release.Name}}-aai-champ.{{.Release.Namespace}}:9522/services/champ-service/v1/"/>
<constructor-arg name="certPassword" value="OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10"/>
</bean>
<constructor-arg name="graphDataService" ref="graphDataService" />
</bean>
-</beans>
\ No newline at end of file
+</beans>
"interval": "15s",
"timeout": "1s"
},
+ {
+ "id": "vfc-nokiav2vnfmdriver.{{ .Values.nsPrefix }}",
+ "name": "VFC nokiav2vnfmdriver Health Check",
+ "tcp": "vfc-nokiav2vnfmdriver.{{ .Values.nsPrefix }}:8089",
+ "interval": "15s",
+ "timeout": "1s"
+ },
{
"id": "vfc-nslcm.{{ .Values.nsPrefix }}",
"name": "VFC nslcm Health Check",
config:
routeLabels: "visualRange:1"
kubeMasterUrl: https://kubernetes.default:443
- discoveryUrl: http://{{.Release.Name}}-msb-discovery.{{include "common.namespace" .}}:10081
+ discoveryUrl: http://msb-discovery.{{include "common.namespace" .}}:10081
# default number of instances
replicaCount: 1
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
- name: CONSUL_IP
- value: {{.Release.Name}}-msb-consul.{{ include "common.namespace" . }}
+ value: msb-consul.{{ include "common.namespace" . }}
volumeMounts:
- mountPath: /etc/localtime
name: localtime
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
- name: CONSUL_IP
- value: {{.Release.Name}}-msb-consul.{{ include "common.namespace" . }}
+ value: msb-consul.{{ include "common.namespace" . }}
- name: SDCLIENT_IP
- value: {{.Release.Name}}-msb-discovery.{{ include "common.namespace" . }}
+ value: msb-discovery.{{ include "common.namespace" . }}
- name: ROUTE_LABELS
value: {{ .Values.config.routeLabels }}
volumeMounts:
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
- name: CONSUL_IP
- value: {{.Release.Name}}-msb-consul.{{ include "common.namespace" . }}
+ value: msb-consul.{{ include "common.namespace" . }}
- name: SDCLIENT_IP
- value: {{.Release.Name}}-msb-discovery.{{ include "common.namespace" . }}
+ value: msb-discovery.{{ include "common.namespace" . }}
- name: ROUTE_LABELS
value: {{ .Values.config.routeLabels }}
volumeMounts:
app: vfc-nokiavnfmdriver
type: NodePort
#{{ end }}
+#{{ if not .Values.disableVfcVfcNokiav2vnfmdriver }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+ labels:
+ app: vfc-nokiav2vnfmdriver
+ name: vfc-nokiav2vnfmdriver
+ namespace: "{{ .Values.nsPrefix }}"
+ annotations:
+ msb.onap.org/service-info: '[
+ {
+ "serviceName": "NokiaSVNFM",
+ "version": "v1",
+ "url": "/api/NokiaSVNFM/v1",
+ "protocol": "REST",
+ "port": "{{.Values.nokiav2vnfmdriver.port}}",
+ "visualRange":"1"
+ }
+ ]'
+spec:
+ ports:
+ - name: vfc-nokiav2vnfmdriver
+ port: {{.Values.nokiav2vnfmdriver.port}}
+ nodePort: {{.Values.nokiav2vnfmdriver.nodePort}}
+ selector:
+ app: vfc-nokiav2vnfmdriver
+ type: NodePort
+#{{ end }}
#{{ if not .Values.disableVfcVfcHwvnfmdriver }}
---
apiVersion: v1
selector:
app: vfc-catalog
type: NodePort
-#{{ end }}
\ No newline at end of file
+#{{ 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 not .Values.disableVfcNokiav2VnfmDriver }}
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+ name: vfc-nokiav2vnfmdriver
+ namespace: "{{ .Values.nsPrefix }}"
+spec:
+ replicas: {{ .Values.nokiav2vnfmdriver.replicas }}
+ selector:
+ matchLabels:
+ app: vfc-nokiav2vnfmdriver
+ template:
+ metadata:
+ labels:
+ app: vfc-nokiav2vnfmdriver
+ name: vfc-nokiav2vnfmdriver
+ spec:
+ hostname: vfc-nokiav2vnfmdriver
+ containers:
+ - args:
+ image: {{.Values.nokiav2vnfmdriver.image}}
+ name: "vfc-nokiav2vnfmdriver"
+ env:
+ - name: MSB_ADDR
+ value: {{ tpl .Values.msbaddr . }}
+ ports:
+ - containerPort: {{ .Values.nokiav2vnfmdriver.port }}
+ readinessProbe:
+ tcpSocket:
+ port: {{ .Values.nokiav2vnfmdriver.port }}
+ initialDelaySeconds: 5
+ periodSeconds: 10
+ imagePullPolicy: "{{ .Values.pullPolicy }}"
+ imagePullSecrets:
+ - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
port: 8486
nodePort: 30412
replicas: 1
+nokiav2vnfmdriver:
+ image: nexus3.onap.org:10001/onap/vfc/nfvo/svnfm/nokiav2:1.1.0-STAGING-latest
+ port: 8089
+ nodePort: 30413
+ replicas: 1
jujudriver:
image: nexus3.onap.org:10001/onap/vfc/jujudriver:v1.0.0
port: 8483
Code Review / oom.git / commitdiff