[AAI] Remove unused AAF proxies

Some AAI components have the ability of using AAF proxies for
authentication. As AAF is deprecated and these proxies seems not to be
used by anybody, let's remove them.

Issue-ID: OOM-2663
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: Ie78740eb452f1b28f031a97fe272f86acce1f8be

4 files changed, 14 insertions, 222 deletions

diff --git a/kubernetes/aai/components/aai-babel/templates/configmap.yaml b/kubernetes/aai/components/aai-babel/templates/configmap.yaml
index cdd2a4fefe..baee38c0e2 100644
--- a/kubernetes/aai/components/aai-babel/templates/configmap.yaml
+++ b/kubernetes/aai/components/aai-babel/templates/configmap.yaml
@@ -1,6 +1,7 @@
 {{/*
 # Copyright © 2018 Amdocs, AT&T
 # Modifications Copyright © 2018 Bell Canada
+# Modifications Copyright (c) 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -27,46 +28,3 @@ metadata:
     heritage: {{ .Release.Service }}
 data:
 {{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
-
-{{ if .Values.global.installSidecarSecurity }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.fullname" . }}-fproxy-config
-  namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/fproxy/config/*").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.fullname" . }}-fproxy-log-config
-  namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/fproxy/config/logback-spring.xml").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.fullname" . }}-rproxy-config
-  namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/rproxy/config/*").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.fullname" . }}-rproxy-log-config
-  namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/rproxy/config/logback-spring.xml").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.fullname" . }}-rproxy-uri-auth-config
-  namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/rproxy/config/auth/uri-authorization.json").AsConfig . | indent 2 }}
-{{ end }}
\ No newline at end of file
diff --git a/kubernetes/aai/components/aai-babel/templates/deployment.yaml b/kubernetes/aai/components/aai-babel/templates/deployment.yaml
index e75815ecb6..9fe386a3c6 100644
--- a/kubernetes/aai/components/aai-babel/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-babel/templates/deployment.yaml
@@ -1,7 +1,7 @@
 {{/*
 # Copyright © 2018 Amdocs, AT&T
 # Modifications Copyright © 2018 Bell Canada
-# Modifications Copyright © 2020 Orange
+# Modifications Copyright © 2020,2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -37,19 +37,6 @@ spec:
         app: {{ include "common.name" . }}
         release: {{ include "common.release" . }}
     spec:
-    {{ if .Values.global.installSidecarSecurity }}
-      hostAliases:
-      - ip: {{ .Values.global.aaf.serverIp }}
-        hostnames:
-        - {{ .Values.global.aaf.serverHostname }}
-
-      initContainers:
-        - name: {{ .Values.global.tproxyConfig.name }}
-          image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.global.tproxyConfig.image }}
-          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-          securityContext:
-            privileged: true
-    {{ end }}
       containers:
         - name: {{ include "common.name" . }}
           image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
@@ -127,79 +114,6 @@ spec:
           - mountPath: /usr/share/filebeat/data
             name: aai-filebeat
 
-    {{ if .Values.global.installSidecarSecurity }}
-        - name: {{ .Values.global.rproxy.name }}
-          image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.global.rproxy.image }}
-          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-          env:
-          - name: CONFIG_HOME
-            value: "/opt/app/rproxy/config"
-          - name: KEY_STORE_PASSWORD
-            value: {{ .Values.config.keyStorePassword }}
-          - name: spring_profiles_active
-            value: {{ .Values.global.rproxy.activeSpringProfiles }}
-          volumeMounts:
-          - name: {{ include "common.fullname" . }}-rproxy-config
-            mountPath: /opt/app/rproxy/config/forward-proxy.properties
-            subPath: forward-proxy.properties
-          - name: {{ include "common.fullname" . }}-rproxy-config
-            mountPath: /opt/app/rproxy/config/primary-service.properties
-            subPath: primary-service.properties
-          - name: {{ include "common.fullname" . }}-rproxy-config
-            mountPath: /opt/app/rproxy/config/reverse-proxy.properties
-            subPath: reverse-proxy.properties
-          - name: {{ include "common.fullname" . }}-rproxy-config
-            mountPath: /opt/app/rproxy/config/cadi.properties
-            subPath: cadi.properties
-          - name: {{ include "common.fullname" . }}-rproxy-log-config
-            mountPath: /opt/app/rproxy/config/logback-spring.xml
-            subPath: logback-spring.xml
-          - name: {{ include "common.fullname" . }}-rproxy-uri-auth-config
-            mountPath: /opt/app/rproxy/config/auth/uri-authorization.json
-            subPath: uri-authorization.json
-          - name: {{ include "common.fullname" . }}-rproxy-auth-config
-            mountPath: /opt/app/rproxy/config/auth/tomcat_keystore
-            subPath: tomcat_keystore
-          - name: {{ include "common.fullname" . }}-rproxy-auth-config
-            mountPath: /opt/app/rproxy/config/auth/client-cert.p12
-            subPath: client-cert.p12
-          - name: {{ include "common.fullname" . }}-rproxy-auth-config
-            mountPath: /opt/app/rproxy/config/auth/aaf_truststore.jks
-            subPath: aaf_truststore.jks
-          - name: {{ include "common.fullname" . }}-rproxy-security-config
-            mountPath: /opt/app/rproxy/config/security/keyfile
-            subPath: keyfile
-
-          ports:
-          - containerPort: {{ .Values.global.rproxy.port }}
-
-        - name: {{ .Values.global.fproxy.name }}
-          image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.global.fproxy.image }}
-          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-          env:
-          - name: CONFIG_HOME
-            value: "/opt/app/fproxy/config"
-          - name: KEY_STORE_PASSWORD
-            value: {{ .Values.config.keyStorePassword }}
-          - name: spring_profiles_active
-            value: {{ .Values.global.fproxy.activeSpringProfiles }}
-          volumeMounts:
-          - name: {{ include "common.fullname" . }}-fproxy-config
-            mountPath: /opt/app/fproxy/config/fproxy.properties
-            subPath: fproxy.properties
-          - name: {{ include "common.fullname" . }}-fproxy-log-config
-            mountPath: /opt/app/fproxy/config/logback-spring.xml
-            subPath: logback-spring.xml
-          - name: {{ include "common.fullname" . }}-fproxy-auth-config
-            mountPath: /opt/app/fproxy/config/auth/tomcat_keystore
-            subPath: tomcat_keystore
-          - name: {{ include "common.fullname" . }}-fproxy-auth-config
-            mountPath: /opt/app/fproxy/config/auth/client-cert.p12
-            subPath: client-cert.p12
-          ports:
-          - containerPort: {{ .Values.global.fproxy.port }}
-    {{ end }}
-
       volumes:
         - name: localtime
           hostPath:
@@ -226,32 +140,6 @@ spec:
           emptyDir: {}
         - name: aai-filebeat
           emptyDir: {}
-    {{ if .Values.global.installSidecarSecurity }}
-        - name: {{ include "common.fullname" . }}-rproxy-config
-          configMap:
-            name: {{ include "common.fullname" . }}-rproxy-config
-        - name: {{ include "common.fullname" . }}-rproxy-log-config
-          configMap:
-            name: {{ include "common.fullname" . }}-rproxy-log-config
-        - name: {{ include "common.fullname" . }}-rproxy-uri-auth-config
-          configMap:
-            name: {{ include "common.fullname" . }}-rproxy-uri-auth-config
-        - name: {{ include "common.fullname" . }}-rproxy-auth-config
-          secret:
-            secretName: {{ include "common.fullname" . }}-rproxy-auth-config
-        - name: {{ include "common.fullname" . }}-rproxy-security-config
-          secret:
-            secretName: {{ include "common.fullname" . }}-rproxy-security-config
-        - name: {{ include "common.fullname" . }}-fproxy-config
-          configMap:
-            name: {{ include "common.fullname" . }}-fproxy-config
-        - name: {{ include "common.fullname" . }}-fproxy-log-config
-          configMap:
-            name: {{ include "common.fullname" . }}-fproxy-log-config
-        - name: {{ include "common.fullname" . }}-fproxy-auth-config
-          secret:
-            secretName: {{ include "common.fullname" . }}-fproxy-auth-config
-    {{ end }}
 
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/aai/components/aai-babel/templates/secrets.yaml b/kubernetes/aai/components/aai-babel/templates/secrets.yaml
index 630ce83b31..b81ffa05b9 100644
--- a/kubernetes/aai/components/aai-babel/templates/secrets.yaml
+++ b/kubernetes/aai/components/aai-babel/templates/secrets.yaml
@@ -1,6 +1,7 @@
 {{/*
 # Copyright © 2018 Amdocs, AT&T
 # Modifications Copyright © 2018 Bell Canada
+# Modifications Copyright (c) 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -43,48 +44,3 @@ type: Opaque
 data:
   KEY_STORE_PASSWORD: {{ .Values.config.keyStorePassword | b64enc | quote }}
   KEY_MANAGER_PASSWORD: {{ .Values.config.keyManagerPassword | b64enc | quote }}
-
-{{ if .Values.global.installSidecarSecurity }}
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "common.fullname" . }}-fproxy-auth-config
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ include "common.release" . }}
-    heritage: {{ .Release.Service }}
-type: Opaque
-data:
-{{ tpl (.Files.Glob "resources/fproxy/config/auth/*").AsSecrets . | indent 2 }}
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "common.fullname" . }}-rproxy-auth-config
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ include "common.release" . }}
-    heritage: {{ .Release.Service }}
-type: Opaque
-data:
-{{ tpl (.Files.Glob "resources/rproxy/config/auth/*").AsSecrets . | indent 2 }}
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "common.fullname" . }}-rproxy-security-config
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ include "common.release" . }}
-    heritage: {{ .Release.Service }}
-type: Opaque
-data:
-{{ tpl (.Files.Glob "resources/rproxy/config/security/*").AsSecrets . | indent 2 }}
-{{ end }}
\ No newline at end of file
diff --git a/kubernetes/aai/components/aai-babel/templates/service.yaml b/kubernetes/aai/components/aai-babel/templates/service.yaml
index fb7295581c..db54ce14f2 100644
--- a/kubernetes/aai/components/aai-babel/templates/service.yaml
+++ b/kubernetes/aai/components/aai-babel/templates/service.yaml
@@ -1,6 +1,7 @@
 {{/*
 # Copyright © 2018 Amdocs, AT&T
 # Modifications Copyright © 2018 Bell Canada
+# Modifications Copyright (c) 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -28,27 +29,16 @@ metadata:
 spec:
   type: {{ .Values.service.type }}
   ports:
-  {{ if .Values.global.installSidecarSecurity }}
-      {{if eq .Values.service.type "NodePort" -}}
-      - port: {{ .Values.global.rproxy.port }}
-        nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
-        name: {{ .Values.service.portName }}
-      {{- else -}}
-      - port: {{ .Values.service.externalPort }}
-        targetPort: {{ .Values.global.rproxy.port }}
-        name: {{ .Values.service.portName }}
-      {{- end}}
-  {{ else }}
-      {{if eq .Values.service.type "NodePort" -}}
-      - port: {{ .Values.service.internalPort }}
-        nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
-        name: {{ .Values.service.portName }}
-      {{- else -}}
-      - port: {{ .Values.service.externalPort }}
-        targetPort: {{ .Values.service.internalPort }}
-        name: {{ .Values.service.portName }}
-      {{- end}}
-  {{ end }}
+    {{- if eq .Values.service.type "NodePort" }}
+    - port: {{ .Values.service.internalPort }}
+      nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
+      name: {{ .Values.service.portName }}
+    {{- else }}
+    - port: {{ .Values.service.externalPort }}
+      targetPort: {{ .Values.service.internalPort }}
+      name: {{ .Values.service.portName }}
+    {{- end }}
+
   selector:
     app: {{ include "common.name" . }}
     release: {{ include "common.release" . }}