aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorKrzysztof Opasiak <k.opasiak@samsung.com>2021-03-30 12:15:02 +0000
committerGerrit Code Review <gerrit@onap.org>2021-03-30 12:15:02 +0000
commitde01b934bed73b5bb64b9bd7e49d0cb823adff3a (patch)
tree6662acea2e3f92b5b8f09ffba6663d1ed8cdaaea /kubernetes
parenta40d54f828ea9d062ddf83d724cd69427c0a2fcd (diff)
parent1eff56bc344b368a44d26e742220075334a3e675 (diff)
Merge "[SO] Change sub component names"
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/robot/resources/config/eteshare/config/robot_properties.py5
-rw-r--r--kubernetes/so/components/so-admin-cockpit/Chart.yaml (renamed from kubernetes/so/components/so-monitoring/Chart.yaml)2
-rwxr-xr-xkubernetes/so/components/so-admin-cockpit/requirements.yaml (renamed from kubernetes/so/components/so-monitoring/requirements.yaml)0
-rw-r--r--kubernetes/so/components/so-admin-cockpit/resources/config/overrides/override.yaml (renamed from kubernetes/so/components/so-monitoring/resources/config/overrides/override.yaml)4
-rw-r--r--kubernetes/so/components/so-admin-cockpit/templates/configmap.yaml (renamed from kubernetes/so/components/so-monitoring/templates/configmap.yaml)4
-rw-r--r--kubernetes/so/components/so-admin-cockpit/templates/deployment.yaml (renamed from kubernetes/so/components/so-monitoring/templates/deployment.yaml)10
-rw-r--r--kubernetes/so/components/so-admin-cockpit/templates/ingress.yaml (renamed from kubernetes/so/components/so-monitoring/templates/ingress.yaml)0
-rw-r--r--kubernetes/so/components/so-admin-cockpit/templates/secret.yaml (renamed from kubernetes/so/components/so-monitoring/templates/secret.yaml)0
-rw-r--r--kubernetes/so/components/so-admin-cockpit/templates/service.yaml (renamed from kubernetes/so/components/so-monitoring/templates/service.yaml)0
-rw-r--r--kubernetes/so/components/so-admin-cockpit/values.yaml (renamed from kubernetes/so/components/so-monitoring/values.yaml)23
-rwxr-xr-xkubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml4
-rwxr-xr-xkubernetes/so/components/so-bpmn-infra/values.yaml2
-rw-r--r--kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml2
-rw-r--r--kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml2
-rwxr-xr-xkubernetes/so/components/so-etsi-sol003-adapter/Chart.yaml (renamed from kubernetes/so/components/so-vnfm-adapter/Chart.yaml)4
-rwxr-xr-xkubernetes/so/components/so-etsi-sol003-adapter/requirements.yaml (renamed from kubernetes/so/components/so-vnfm-adapter/requirements.yaml)0
-rwxr-xr-xkubernetes/so/components/so-etsi-sol003-adapter/resources/config/overrides/override.yaml (renamed from kubernetes/so/components/so-vnfm-adapter/resources/config/overrides/override.yaml)4
-rwxr-xr-xkubernetes/so/components/so-etsi-sol003-adapter/templates/configmap.yaml (renamed from kubernetes/so/components/so-vnfm-adapter/templates/configmap.yaml)0
-rwxr-xr-xkubernetes/so/components/so-etsi-sol003-adapter/templates/deployment.yaml (renamed from kubernetes/so/components/so-vnfm-adapter/templates/deployment.yaml)0
-rw-r--r--kubernetes/so/components/so-etsi-sol003-adapter/templates/ingress.yaml (renamed from kubernetes/so/components/so-vnfm-adapter/templates/ingress.yaml)0
-rw-r--r--kubernetes/so/components/so-etsi-sol003-adapter/templates/secret.yaml (renamed from kubernetes/so/components/so-vnfm-adapter/templates/secret.yaml)0
-rwxr-xr-xkubernetes/so/components/so-etsi-sol003-adapter/templates/service.yaml (renamed from kubernetes/so/components/so-vnfm-adapter/templates/service.yaml)0
-rwxr-xr-xkubernetes/so/components/so-etsi-sol003-adapter/values.yaml (renamed from kubernetes/so/components/so-vnfm-adapter/values.yaml)16
-rwxr-xr-xkubernetes/so/requirements.yaml16
-rwxr-xr-xkubernetes/so/values.yaml4
25 files changed, 51 insertions, 51 deletions
diff --git a/kubernetes/robot/resources/config/eteshare/config/robot_properties.py b/kubernetes/robot/resources/config/eteshare/config/robot_properties.py
index 674a416dc2..50f43c8674 100644
--- a/kubernetes/robot/resources/config/eteshare/config/robot_properties.py
+++ b/kubernetes/robot/resources/config/eteshare/config/robot_properties.py
@@ -110,7 +110,7 @@ GLOBAL_INJECTED_SO_OPENSTACK_IP_ADDR = '{{include "robot.ingress.svchost" (dict
GLOBAL_INJECTED_SO_REQDB_IP_ADDR = '{{include "robot.ingress.svchost" (dict "root" . "hostname" "so-request-db-adapter") }}'
GLOBAL_INJECTED_SO_SDNC_IP_ADDR = '{{include "robot.ingress.svchost" (dict "root" . "hostname" "so-sdnc-adapter") }}'
GLOBAL_INJECTED_SO_VFC_IP_ADDR = '{{include "robot.ingress.svchost" (dict "root" . "hostname" "so-vfc-adapter") }}'
-GLOBAL_INJECTED_SO_VNFM_IP_ADDR = '{{include "robot.ingress.svchost" (dict "root" . "hostname" "so-vnfm-adapter") }}'
+GLOBAL_INJECTED_SO_VNFM_IP_ADDR = '{{include "robot.ingress.svchost" (dict "root" . "hostname" "so-etsi-sol003-adapter") }}'
GLOBAL_INJECTED_SO_NSSMF_IP_ADDR = '{{include "robot.ingress.svchost" (dict "root" . "hostname" "so-nssmf-adapter") }}'
GLOBAL_INJECTED_UBUNTU_1404_IMAGE = '{{ .Values.ubuntu14Image }}'
GLOBAL_INJECTED_UBUNTU_1604_IMAGE = '{{ .Values.ubuntu16Image }}'
@@ -255,7 +255,7 @@ GLOBAL_SO_OPENSTACK_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" .
GLOBAL_SO_REQDB_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "so-request-db-adapter" "port" 8083) }}'
GLOBAL_SO_SDNC_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "so-sdnc-adapter" "port" 8086) }}'
GLOBAL_SO_VFC_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "so-vfc-adapter" "port" 8084) }}'
-GLOBAL_SO_VNFM_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "so-vnfm-adapter" "port" 9092) }}'
+GLOBAL_SO_VNFM_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "so-etsi-sol003-adapter" "port" 9092) }}'
GLOBAL_SO_NSSMF_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "so-nssmf-adapter" "port" 8088) }}'
GLOBAL_SO_USERNAME = '{{ .Values.soUsername }}'
GLOBAL_SO_CATDB_USERNAME = '{{ .Values.soCatdbUsername }}'
@@ -365,4 +365,3 @@ GLOBAL_CCSDK_CDS_USERNAME = 'ccsdkapps'
GLOBAL_CCSDK_CDS_PASSWORD = 'ccsdkapps'
GLOBAL_CCSDK_CDS_AUTHENTICATION = [GLOBAL_CCSDK_CDS_USERNAME, GLOBAL_CCSDK_CDS_PASSWORD]
GLOBAL_CDS_AUTH = "Y2NzZGthcHBzOmNjc2RrYXBwcw=="
-
diff --git a/kubernetes/so/components/so-monitoring/Chart.yaml b/kubernetes/so/components/so-admin-cockpit/Chart.yaml
index 93e8bcc388..2bebdfd49a 100644
--- a/kubernetes/so/components/so-monitoring/Chart.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/Chart.yaml
@@ -18,5 +18,5 @@
# @author: gareth.roper@ericsson.com
apiVersion: v1
description: A Helm chart for ONAP Service Orchestration Monitoring
-name: so-monitoring
+name: so-admin-cockpit
version: 8.0.0
diff --git a/kubernetes/so/components/so-monitoring/requirements.yaml b/kubernetes/so/components/so-admin-cockpit/requirements.yaml
index 730d75ae80..730d75ae80 100755
--- a/kubernetes/so/components/so-monitoring/requirements.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/requirements.yaml
diff --git a/kubernetes/so/components/so-monitoring/resources/config/overrides/override.yaml b/kubernetes/so/components/so-admin-cockpit/resources/config/overrides/override.yaml
index cf54fa43f8..e1bac69fe3 100644
--- a/kubernetes/so/components/so-monitoring/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/resources/config/overrides/override.yaml
@@ -30,6 +30,6 @@ spring:
security:
usercredentials:
-
- username: ${SO_MONITORING_USERNAME}
- password: ${SO_MONITORING_PASSWORD}
+ username: ${SO_COCKPIT_USERNAME}
+ password: ${SO_COCKPIT_PASSWORD}
role: GUI-Client
diff --git a/kubernetes/so/components/so-monitoring/templates/configmap.yaml b/kubernetes/so/components/so-admin-cockpit/templates/configmap.yaml
index fb52e598ca..95839f230b 100644
--- a/kubernetes/so/components/so-monitoring/templates/configmap.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/templates/configmap.yaml
@@ -24,7 +24,7 @@ data:
APP: {{ index .Values.app }}
kind: ConfigMap
metadata:
- name: {{ include "common.fullname" . }}-configmap
+ name: {{ include "common.fullname" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -35,7 +35,7 @@ metadata:
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ include "common.fullname" . }}-app-configmap
+ name: {{ include "common.fullname" . }}-app
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
diff --git a/kubernetes/so/components/so-monitoring/templates/deployment.yaml b/kubernetes/so/components/so-admin-cockpit/templates/deployment.yaml
index ca108ac5cd..9de1b50c8c 100644
--- a/kubernetes/so/components/so-monitoring/templates/deployment.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/templates/deployment.yaml
@@ -63,7 +63,7 @@ spec:
args:
- -c
- |
- export SO_MONITORING_PASSWORD=`htpasswd -bnBC 10 "" $SO_MON_PASS | tr -d ':\n' | sed 's/\$2y/\$2a/'`
+ export SO_COCKPIT_PASSWORD=`htpasswd -bnBC 10 "" $SO_COCKPIT_PASS | tr -d ':\n' | sed 's/\$2y/\$2a/'`
{{- if .Values.global.aafEnabled }}
export $(grep '^c' {{ .Values.soHelpers.certInitializer.credsPath }}/org.onap.so.cred.props | xargs -0)
export $(cat {{ .Values.soHelpers.certInitializer.credsPath }}/mycreds.prop | xargs -0)
@@ -86,14 +86,14 @@ spec:
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-admin-creds" "key" "login") | indent 10 }}
- name: DB_ADMIN_PASSWORD
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-admin-creds" "key" "password") | indent 10 }}
- - name: SO_MONITORING_USERNAME
+ - name: SO_COCKPIT_USERNAME
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "app-user-creds" "key" "login") | indent 10 }}
- - name: SO_MON_PASS
+ - name: SO_COCKPIT_PASS
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "app-user-creds" "key" "password") | indent 10 }}
envFrom:
- configMapRef:
- name: {{ include "common.fullname" . }}-configmap
+ name: {{ include "common.fullname" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts: {{ include "so.certificate.volumeMount" . | nindent 8 }}
- name: logs
@@ -123,6 +123,6 @@ spec:
emptyDir: {}
- name: config
configMap:
- name: {{ include "common.fullname" . }}-app-configmap
+ name: {{ include "common.fullname" . }}-app
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/so/components/so-monitoring/templates/ingress.yaml b/kubernetes/so/components/so-admin-cockpit/templates/ingress.yaml
index 8f87c68f1e..8f87c68f1e 100644
--- a/kubernetes/so/components/so-monitoring/templates/ingress.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/templates/ingress.yaml
diff --git a/kubernetes/so/components/so-monitoring/templates/secret.yaml b/kubernetes/so/components/so-admin-cockpit/templates/secret.yaml
index 34932b713d..34932b713d 100644
--- a/kubernetes/so/components/so-monitoring/templates/secret.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/templates/secret.yaml
diff --git a/kubernetes/so/components/so-monitoring/templates/service.yaml b/kubernetes/so/components/so-admin-cockpit/templates/service.yaml
index c4439784ca..c4439784ca 100644
--- a/kubernetes/so/components/so-monitoring/templates/service.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/templates/service.yaml
diff --git a/kubernetes/so/components/so-monitoring/values.yaml b/kubernetes/so/components/so-admin-cockpit/values.yaml
index a4bf6c370b..d59189b98b 100644
--- a/kubernetes/so/components/so-monitoring/values.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/values.yaml
@@ -2,6 +2,7 @@
# Copyright (C) 2018 Ericsson. All rights reserved.
# Copyright (C) 2020 Huawei
# Modifications Copyright © 2020 Nokia
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -59,9 +60,9 @@ secrets:
passwordPolicy: required
- uid: app-user-creds
type: basicAuth
- externalSecret: '{{ tpl (default "" .Values.server.monitoring.soMonitoringCredsExternalSecret) . }}'
- login: '{{ .Values.server.monitoring.username }}'
- password: '{{ .Values.server.monitoring.password }}'
+ externalSecret: '{{ tpl (default "" .Values.server.cockpit.soMonitoringCredsExternalSecret) . }}'
+ login: '{{ .Values.server.cockpit.username }}'
+ password: '{{ .Values.server.cockpit.password }}'
#secretsFilePaths: |
# - 'my file 1'
@@ -71,7 +72,7 @@ secrets:
# Application configuration defaults.
#################################################################
repository: nexus3.onap.org:10001
-image: onap/so/so-monitoring:1.7.11
+image: onap/so/so-admin-cockpit:1.8.2
pullPolicy: Always
db:
@@ -86,22 +87,22 @@ replicaCount: 1
minReadySeconds: 10
containerPort: &containerPort 9091
logPath: app/logs/
-app: so-monitoring
+app: so-admin-cockpit
#################################################################
# soHelpers part
#################################################################
soHelpers:
- nameOverride: so-monitoring-cert-init
+ nameOverride: so-cockpit-cert-init
certInitializer:
- nameOverride: so-monitoring-cert-init
+ nameOverride: so-cockpit-cert-init
credsPath: /opt/app/osaaf/local
cadi:
apiEnforcement: org.onap.so.monitoringPerm
containerPort: *containerPort
server:
- monitoring:
+ cockpit:
username: demo
# password: demo123456!
# soMonitoringCredsExternalSecret: some secret
@@ -112,7 +113,7 @@ service:
nodePort: 24
internalPort: *containerPort
externalPort: *containerPort
- portName: so-monitor-port
+ portName: http
updateStrategy:
type: RollingUpdate
maxUnavailable: 1
@@ -150,8 +151,8 @@ livenessProbe:
ingress:
enabled: false
service:
- - baseaddr: "somonitoring"
- name: "so-monitoring"
+ - baseaddr: "soadmincockpit"
+ name: "so-admin-cockpit"
port: 9091
config:
ssl: "none"
diff --git a/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml b/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
index b4bd316c03..7ab960c9fc 100755
--- a/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
@@ -386,8 +386,8 @@ spring:
so:
vnfm:
adapter:
- url: http://so-vnfm-adapter.{{ include "common.namespace" . }}:9092/so/vnfm-adapter/v1/
- auth: {{ .Values.so.vnfm.adapter.auth }}
+ url: http://so-etsi-sol003-adapter.{{ include "common.namespace" . }}:9092/so/vnfm-adapter/v1
+ auth: {{ .Values.so.sol003.adapter.auth }}
org:
onap:
so:
diff --git a/kubernetes/so/components/so-bpmn-infra/values.yaml b/kubernetes/so/components/so-bpmn-infra/values.yaml
index 685afef1ef..c7ec266f7c 100755
--- a/kubernetes/so/components/so-bpmn-infra/values.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/values.yaml
@@ -96,7 +96,7 @@ mso:
oof:
auth: test:testpwd
so:
- vnfm:
+ sol003:
adapter:
auth: Basic dm5mbTpwYXNzd29yZDEk
sniro:
diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml
index 20a4284c67..5fc28e2cc2 100644
--- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml
@@ -49,7 +49,7 @@ mso:
so:
adapters:
sol003-adapter:
- url: http://so-vnfm-adapter.{{ include "common.namespace" . }}:9092/so/vnfm-adapter/v1
+ url: http://so-etsi-sol003-adapter.{{ include "common.namespace" . }}:9092/so/vnfm-adapter/v1
auth: {{ .Values.so.sol003.adapter.auth }}
etsi-catalog-manager:
base:
diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
index a7fad4de18..363ce40cae 100644
--- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
+++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
@@ -55,7 +55,7 @@ secrets:
#################################################################
# Application configuration defaults.
#################################################################
-image: onap/so/so-etsi-nfvo-ns-lcm:1.7.11
+image: onap/so/so-etsi-nfvo-ns-lcm:1.8.2
pullPolicy: Always
aai:
diff --git a/kubernetes/so/components/so-vnfm-adapter/Chart.yaml b/kubernetes/so/components/so-etsi-sol003-adapter/Chart.yaml
index 07d56e8b4f..68519b2eeb 100755
--- a/kubernetes/so/components/so-vnfm-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-etsi-sol003-adapter/Chart.yaml
@@ -12,6 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
apiVersion: v1
-description: ONAP SO VNFM Adapter
-name: so-vnfm-adapter
+description: ONAP SO ETSI SOL003 Adapter
+name: so-etsi-sol003-adapter
version: 8.0.0
diff --git a/kubernetes/so/components/so-vnfm-adapter/requirements.yaml b/kubernetes/so/components/so-etsi-sol003-adapter/requirements.yaml
index f8b1d7445e..f8b1d7445e 100755
--- a/kubernetes/so/components/so-vnfm-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-etsi-sol003-adapter/requirements.yaml
diff --git a/kubernetes/so/components/so-vnfm-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-etsi-sol003-adapter/resources/config/overrides/override.yaml
index d780a76876..e6a1d7c06e 100755
--- a/kubernetes/so/components/so-vnfm-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-etsi-sol003-adapter/resources/config/overrides/override.yaml
@@ -33,7 +33,7 @@ server:
mso:
key: {{ .Values.mso.key }}
site-name: localSite
- logPath: ./logs/vnfm-adapter
+ logPath: ./logs/etsi-sol003-adapter
config:
cadi: {{ include "so.cadi.keys" . | nindent 8}}
msb-ip: msb-iag
@@ -44,7 +44,7 @@ sdc:
key: {{ .Values.sdc.key }}
endpoint: https://sdc-be.{{ include "common.namespace" . }}:8443
vnfmadapter:
- endpoint: http://so-vnfm-adapter.{{ include "common.namespace" . }}:9092
+ endpoint: http://so-etsi-sol003-adapter.{{ include "common.namespace" . }}:9092
etsi-catalog-manager:
vnfpkgm:
{{- if .Values.global.msbEnabled }}
diff --git a/kubernetes/so/components/so-vnfm-adapter/templates/configmap.yaml b/kubernetes/so/components/so-etsi-sol003-adapter/templates/configmap.yaml
index 6331656fce..6331656fce 100755
--- a/kubernetes/so/components/so-vnfm-adapter/templates/configmap.yaml
+++ b/kubernetes/so/components/so-etsi-sol003-adapter/templates/configmap.yaml
diff --git a/kubernetes/so/components/so-vnfm-adapter/templates/deployment.yaml b/kubernetes/so/components/so-etsi-sol003-adapter/templates/deployment.yaml
index 29ebd97229..29ebd97229 100755
--- a/kubernetes/so/components/so-vnfm-adapter/templates/deployment.yaml
+++ b/kubernetes/so/components/so-etsi-sol003-adapter/templates/deployment.yaml
diff --git a/kubernetes/so/components/so-vnfm-adapter/templates/ingress.yaml b/kubernetes/so/components/so-etsi-sol003-adapter/templates/ingress.yaml
index 8f87c68f1e..8f87c68f1e 100644
--- a/kubernetes/so/components/so-vnfm-adapter/templates/ingress.yaml
+++ b/kubernetes/so/components/so-etsi-sol003-adapter/templates/ingress.yaml
diff --git a/kubernetes/so/components/so-vnfm-adapter/templates/secret.yaml b/kubernetes/so/components/so-etsi-sol003-adapter/templates/secret.yaml
index 34932b713d..34932b713d 100644
--- a/kubernetes/so/components/so-vnfm-adapter/templates/secret.yaml
+++ b/kubernetes/so/components/so-etsi-sol003-adapter/templates/secret.yaml
diff --git a/kubernetes/so/components/so-vnfm-adapter/templates/service.yaml b/kubernetes/so/components/so-etsi-sol003-adapter/templates/service.yaml
index 5772a89a97..5772a89a97 100755
--- a/kubernetes/so/components/so-vnfm-adapter/templates/service.yaml
+++ b/kubernetes/so/components/so-etsi-sol003-adapter/templates/service.yaml
diff --git a/kubernetes/so/components/so-vnfm-adapter/values.yaml b/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml
index b9e6ea38d4..b8a7776da6 100755
--- a/kubernetes/so/components/so-vnfm-adapter/values.yaml
+++ b/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml
@@ -28,7 +28,7 @@ global:
#################################################################
# Application configuration defaults.
#################################################################
-image: onap/so/vnfm-adapter:1.7.11
+image: onap/so/so-etsi-sol003-adapter:1.8.2
pullPolicy: Always
aaf:
@@ -47,14 +47,14 @@ sdc:
replicaCount: 1
minReadySeconds: 10
containerPort: &containerPort 9092
-logPath: ./logs/vnfm-adapter/
-app: vnfm-adapter
+logPath: ./logs/etsi-sol003-adapter/
+app: etsi-sol003-adapter
service:
type: NodePort
internalPort: *containerPort
externalPort: *containerPort
nodePort: "06"
- portName: so-vnfm-port
+ portName: http
updateStrategy:
type: RollingUpdate
maxUnavailable: 1
@@ -64,9 +64,9 @@ updateStrategy:
# soHelpers part
#################################################################
soHelpers:
- nameOverride: so-vnfm-cert-init
+ nameOverride: so-etsi-sol003-cert-init
certInitializer:
- nameOverride: so-vnfm-cert-init
+ nameOverride: so-etsi-sol003-cert-init
credsPath: /opt/app/osaaf/local
cadi:
apiEnforcement: org.onap.so.vnfmAdapterPerm
@@ -101,8 +101,8 @@ livenessProbe:
ingress:
enabled: false
service:
- - baseaddr: "sovnfmadapter"
- name: "so-vnfm-adapter"
+ - baseaddr: "soetsisol003adapter"
+ name: "so-etsi-sol003-adapter"
port: 9092
config:
ssl: "redirect"
diff --git a/kubernetes/so/requirements.yaml b/kubernetes/so/requirements.yaml
index 3e394b6839..989cf7d11a 100755
--- a/kubernetes/so/requirements.yaml
+++ b/kubernetes/so/requirements.yaml
@@ -31,6 +31,10 @@ dependencies:
- name: soHelpers
version: ~8.x-0
repository: 'file://components/soHelpers'
+ - name: so-admin-cockpit
+ version: ~8.x-0
+ repository: 'file://components/so-admin-cockpit'
+ condition: so-admin-cockpit.enabled
- name: so-appc-orchestrator
version: ~8.x-0
repository: 'file://components/so-appc-orchestrator'
@@ -50,13 +54,13 @@ dependencies:
version: ~8.x-0
repository: 'file://components/so-etsi-nfvo-ns-lcm'
condition: so-etsi-nfvo-ns-lcm.enabled
+ - name: so-etsi-sol003-adapter
+ version: ~8.x-0
+ repository: 'file://components/so-etsi-sol003-adapter'
+ condition: so-etsi-sol003-adapter.enabled
- name: so-mariadb
version: ~8.x-0
repository: 'file://components/so-mariadb'
- - name: so-monitoring
- version: ~8.x-0
- repository: 'file://components/so-monitoring'
- condition: so-monitoring.enabled
- name: so-nssmf-adapter
version: ~8.x-0
repository: 'file://components/so-nssmf-adapter'
@@ -87,7 +91,3 @@ dependencies:
version: ~8.x-0
repository: 'file://components/so-vfc-adapter'
condition: so-vfc-adapter.enabled
- - name: so-vnfm-adapter
- version: ~8.x-0
- repository: 'file://components/so-vnfm-adapter'
- condition: so-vnfm-adapter.enabled
diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index 3ab08212e4..d1d3873ced 100755
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -325,7 +325,7 @@ so-mariadb:
userCredsExternalSecret: *dbUserCredsSecretName
adminCredsExternalSecret: *dbAdminCredsSecretName
-so-monitoring:
+so-admin-cockpit:
enabled: true
db:
<<: *dbSecrets
@@ -376,5 +376,5 @@ so-vfc-adapter:
db:
<<: *dbSecrets
-so-vnfm-adapter:
+so-etsi-sol003-adapter:
enabled: true