[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

6 files changed, 0 insertions, 108 deletions

diff --git a/kubernetes/so/components/soHelpers/Chart.yaml b/kubernetes/so/components/soHelpers/Chart.yaml
index bf300e3f3b..caada54b79 100755
--- a/kubernetes/so/components/soHelpers/Chart.yaml
+++ b/kubernetes/so/components/soHelpers/Chart.yaml
@@ -25,6 +25,3 @@ dependencies:
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
-  - name: certInitializer
-    version: ~12.x-0
-    repository: '@local'
diff --git a/kubernetes/so/components/soHelpers/templates/_cadiValues.tpl b/kubernetes/so/components/soHelpers/templates/_cadiValues.tpl
deleted file mode 100644
index 7e04706d4a..0000000000
--- a/kubernetes/so/components/soHelpers/templates/_cadiValues.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{- define "so.cadi.keys" -}}
-{{-   $dot := default . .dot -}}
-{{-   $initRoot := default $dot.Values.soHelpers .initRoot -}}
-cadiLoglevel: {{ $initRoot.cadi.logLevel }}
-cadiKeyFile: {{ $initRoot.certInitializer.credsPath }}/{{ $initRoot.certInitializer.fqi_namespace }}.keyfile
-cadiTrustStore: {{ $initRoot.certInitializer.credsPath }}/truststoreONAPall.jks
-cadiTruststorePassword: ${TRUSTSTORE_PASSWORD}
-cadiLatitude: {{ $initRoot.cadi.latitude }}
-cadiLongitude: {{ $initRoot.cadi.longitude }}
-aafEnv: {{ $initRoot.cadi.aafEnv }}
-aafApiVersion: {{ $initRoot.cadi.aafApiVersion }}
-aafRootNs: {{ $initRoot.cadi.aafRootNs }}
-aafId: {{ $initRoot.cadi.aafId }}
-aafPassword: {{ $initRoot.cadi.aafPassword }}
-aafLocateUrl: {{ $initRoot.cadi.aafLocateUrl }}
-aafUrl: {{ $initRoot.cadi.aafUrl }}
-apiEnforcement: {{ $initRoot.cadi.apiEnforcement }}
-{{- if ($initRoot.cadi.noAuthn) }}
-noAuthn: {{ $initRoot.cadi.noAuthn }}
-{{- end }}
-{{- end }}
diff --git a/kubernetes/so/components/soHelpers/templates/_certificates.tpl b/kubernetes/so/components/soHelpers/templates/_certificates.tpl
deleted file mode 100644
index cda61b2cfa..0000000000
--- a/kubernetes/so/components/soHelpers/templates/_certificates.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-{{- define "so.certificate.container_importer" -}}
-{{-   $dot := default . .dot -}}
-{{-   $initRoot := default $dot.Values.soHelpers .initRoot -}}
-{{- $subchartDot := fromJson (include "common.subChartDot" (dict "dot" $dot "initRoot" $initRoot)) }}
-{{ include "common.certInitializer.initContainer" $subchartDot }}
-{{- end -}}
-
-{{- define "so.certificate.volumes" -}}
-{{-   $dot := default . .dot -}}
-{{-   $initRoot := default $dot.Values.soHelpers .initRoot -}}
-{{- $subchartDot := fromJson (include "common.subChartDot" (dict "dot" $dot "initRoot" $initRoot)) }}
-{{ include "common.certInitializer.volumes" $subchartDot }}
-{{- end -}}
-
-{{- define "so.certificate.volumeMount" -}}
-{{-   $dot := default . .dot -}}
-{{-   $initRoot := default $dot.Values.soHelpers .initRoot -}}
-{{- $subchartDot := fromJson (include "common.subChartDot" (dict "dot" $dot "initRoot" $initRoot)) }}
-{{ include "common.certInitializer.volumeMount" $subchartDot }}
-{{- end -}}
-
-{{- define "so.certificates.env" -}}
-{{-   $dot := default . .dot -}}
-{{-   $initRoot := default $dot.Values.soHelpers .initRoot -}}
-{{- $subchartDot := fromJson (include "common.subChartDot" (dict "dot" $dot "initRoot" $initRoot)) }}
-{{-   if $dot.Values.global.aafEnabled }}
-- name: TRUSTSTORE
-  value: {{ $subchartDot.Values.certInitializer.credsPath }}/truststoreONAPall.jks
-{{-     if $dot.Values.global.security.aaf.enabled }}
-- name: KEYSTORE
-  value: {{ $subchartDot.Values.certInitializer.credsPath }}/{{ $subchartDot.Values.certInitializer.fqi_namespace }}.p12
-{{-     end }}
-{{-   end }}
-{{- end -}}
diff --git a/kubernetes/so/components/soHelpers/templates/_livenessProbe.tpl b/kubernetes/so/components/soHelpers/templates/_livenessProbe.tpl
index cde94742c6..e596b806ed 100644
--- a/kubernetes/so/components/soHelpers/templates/_livenessProbe.tpl
+++ b/kubernetes/so/components/soHelpers/templates/_livenessProbe.tpl
@@ -7,11 +7,6 @@ livenessProbe:
     path: {{ $subchartDot.Values.livenessProbe.path }}
     port: {{ $subchartDot.Values.containerPort }}
     scheme: {{  $subchartDot.Values.livenessProbe.scheme }}
-    {{- if $subchartDot.Values.global.security.aaf.enabled }}
-    httpHeaders:
-    - name: Authorization
-      value: {{ $subchartDot.Values.global.aaf.auth.header }}
-    {{- end }}
   initialDelaySeconds: {{ $subchartDot.Values.livenessProbe.initialDelaySeconds }}
   periodSeconds: {{ $subchartDot.Values.livenessProbe.periodSeconds }}
   timeoutSeconds: {{ $subchartDot.Values.livenessProbe.timeoutSeconds }}
diff --git a/kubernetes/so/components/soHelpers/templates/_profileProperty.tpl b/kubernetes/so/components/soHelpers/templates/_profileProperty.tpl
deleted file mode 100644
index 56910ebebd..0000000000
--- a/kubernetes/so/components/soHelpers/templates/_profileProperty.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-{{- define "so.helpers.profileProperty" -}}
-  {{ if .condition }}{{ .value1 }}{{ else }}{{ .value2 }}{{ end }}
-{{- end -}}
diff --git a/kubernetes/so/components/soHelpers/values.yaml b/kubernetes/so/components/soHelpers/values.yaml
index 2417d2553c..ec3fef2d81 100755
--- a/kubernetes/so/components/soHelpers/values.yaml
+++ b/kubernetes/so/components/soHelpers/values.yaml
@@ -16,39 +16,11 @@
 # Global configuration defaults.
 #################################################################
 global:
-  aafAgentImage: onap/aaf/aaf_agent:2.1.20
   msbEnabled: true
-  security:
-    aaf:
-      enabled: false
   app:
     msoKey: 07a7159d3bf51a0e53be7a8f89699be7
 
 #################################################################
-# AAF part
-#################################################################
-certInitializer:
-  aafDeployFqi: deployer@people.osaaf.org
-  aafDeployPass: demo123456!
-  # aafDeployCredsExternalSecret: some secret
-  fqdn: so
-  fqi: so@so.onap.org
-  public_fqdn: so.onap.org
-  fqi_namespace: org.onap.so
-  cadi_longitude: '0.0'
-  cadi_latitude: '0.0'
-  app_ns: org.osaaf.aaf
-  credsPath: /opt/app/osaaf/local
-  aaf_add_config: |
-    echo "cadi_truststore_password=$cadi_truststore_password" > {{ .Values.credsPath }}/mycreds.prop
-    echo "cadi_keystore_password_p12=$cadi_keystore_password_p12" >> {{ .Values.credsPath }}/mycreds.prop
-    echo "TRUSTSTORE_PASSWORD={{ .Values.truststorePassword }}" >> {{ .Values.credsPath }}/mycreds.prop
-
-aafConfig:
-  permission_user: 1000
-  permission_group: 999
-
-#################################################################
 # Application configuration defaults.
 #################################################################
 
@@ -60,17 +32,3 @@ livenessProbe:
   timeoutSeconds: 10
   successThreshold: 1
   failureThreshold: 3
-
-cadi:
-  logLevel: DEBUG
-  latitude: 38.4329
-  longitude: -90.43248
-  aafEnv: IST
-  aafApiVersion: 2.1
-  aafRootNs: org.onap.so
-  aafLocateUrl: https://aaf-locate.onap:8095
-  aafUrl: https://aaf-locate.onap:8095/locate/org.osaaf.aaf.service:2.1
-  aafId: so@so.onap.org
-  aafPassword: enc:EME-arXn2lx8PO0f2kEtyK7VVGtAGWavXorFoxRmPO9
-  apiEnforcement: org.onap.so.apihPerm
-  noAuthn: /manage/health