[SO] Cleanup of SO charts

Remove AAF and TLS related chart entries
Use OOM templates for deployment and service definitions
Remove so-appc-orchestrator, as it is not supported anymore

Issue-ID: OOM-3106

Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Change-Id: I6256aa0fbbe172752cc3d8f83edde0880de7f629

1 files changed, 31 insertions, 23 deletions

diff --git a/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml b/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml
index 170cfdd0d7..98edcebb29 100755
--- a/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml
+++ b/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml
@@ -50,26 +50,34 @@ containerPort: &containerPort 9092
 logPath: ./logs/etsi-sol003-adapter/
 app: etsi-sol003-adapter
 service:
-    type: NodePort
-    internalPort: *containerPort
-    externalPort: *containerPort
-    nodePort: "06"
-    portName: http
+  type: NodePort
+  annotations:
+    service.alpha.kubernetes.io/tolerate-unready-endpoints: 'true'
+    msb.onap.org/service-info: |
+      {{ if .Values.global.msbEnabled -}}[
+        {
+          "serviceName": "{{ include "common.servicename" . }}",
+          "version": "v1",
+          "url": "/so/vnfm-adapter/v1",
+          "protocol": "REST",
+          "port": "{{.Values.containerPort}}",
+          "visualRange":"1"
+        }
+      ]{{ end }}
+  ports:
+    - name: http
+      port: *containerPort
+      nodePort: "06"
+
 updateStrategy:
-    type: RollingUpdate
-    maxUnavailable: 1
-    maxSurge: 1
+  type: RollingUpdate
+  maxUnavailable: 1
+  maxSurge: 1
 
 #################################################################
 # soHelpers part
 #################################################################
 soHelpers:
-  nameOverride: so-etsi-sol003-cert-init
-  certInitializer:
-    nameOverride: so-etsi-sol003-cert-init
-    credsPath: /opt/app/osaaf/local
-  cadi:
-    apiEnforcement: org.onap.so.vnfmAdapterPerm
   containerPort: *containerPort
 
 # Resource Limit flavor -By Default using small
@@ -92,18 +100,18 @@ resources:
       cpu: 1000m
   unlimited: {}
 livenessProbe:
-    port: 9092
-    initialDelaySeconds: 600
-    periodSeconds: 60
-    timeoutSeconds: 10
-    successThreshold: 1
-    failureThreshold: 3
+  port: 9092
+  initialDelaySeconds: 600
+  periodSeconds: 60
+  timeoutSeconds: 10
+  successThreshold: 1
+  failureThreshold: 3
 ingress:
   enabled: false
   service:
-      - baseaddr: "so-etsi-sol003-adapter-api"
-        name: "so-etsi-sol003-adapter"
-        port: 9092
+  - baseaddr: "so-etsi-sol003-adapter-api"
+    name: "so-etsi-sol003-adapter"
+    port: 9092
   config:
     ssl: "redirect"
 nodeSelector: {}