Code Review / oom.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Merge "[AAI] Remove unused AAF proxies"
[oom.git] / kubernetes / aai / components / aai-resources / templates / deployment.yaml
diff --git a/kubernetes/aai/components/aai-resources/templates/deployment.yaml b/kubernetes/aai/components/aai-resources/templates/deployment.yaml
index 765ccdf..6fbbf1c 100644 (file)
--- a/kubernetes/aai/components/aai-resources/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-resources/templates/deployment.yaml
@@ -72,13 +72,6 @@ spec:
       {{- end }}
     spec:
       hostname: aai-resources
-    {{- if .Values.global.initContainers.enabled }}
-      {{- if .Values.global.installSidecarSecurity }}
-      hostAliases:
-      - ip: {{ .Values.global.aaf.serverIp }}
-        hostnames:
-        - {{ .Values.global.aaf.serverHostname }}
-      {{- end }}
       initContainers:
       - command:
       {{- if .Values.global.jobs.migration.enabled }}
@@ -86,23 +79,24 @@ spec:
         args:
         - --job-name
         - {{ include "common.release" . }}-aai-graphadmin-migration
-      {{- else if .Values.global.jobs.createSchema.enabled  }}
+      {{- else }}
+        {{- if .Values.global.jobs.createSchema.enabled  }}
         - /app/ready.py
         args:
         - --job-name
         - {{ include "common.release" . }}-aai-graphadmin-create-db-schema
-      {{- else }}
+        {{- else }}
         - /app/ready.py
         args:
         - --container-name
-        {{- if .Values.global.cassandra.localCluster }}
+          {{- if .Values.global.cassandra.localCluster }}
         - aai-cassandra
-        {{- else }}
+          {{- else }}
         - cassandra
-        {{- end }}
+          {{- end }}
         - --container-name
         - aai-schema-service
-      {{- end }}
+        {{- end }}
         env:
         - name: NAMESPACE
           valueFrom:
@@ -112,14 +106,7 @@ spec:
         image: {{ include "repositoryGenerator.image.readiness" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-readiness
-      {{- if .Values.global.installSidecarSecurity }}
-      - name: {{ .Values.global.tproxyConfig.name }}
-        image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.global.tproxyConfig.image }}
-        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        securityContext:
-          privileged: true
       {{- end }}
-    {{- end }}
       containers:
       - name: {{ include "common.name" . }}
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
@@ -155,11 +142,6 @@ spec:
         - mountPath: /opt/app/aai-resources/resources/etc/auth/realm.properties
           name: {{ include "common.fullname" . }}-config
           subPath: realm.properties
-        {{- if .Values.global.installSidecarSecurity }}
-        - mountPath: /opt/app/aai-resources/resources/etc/auth/aai_policy.json
-          name: {{ include "common.fullname" . }}-aai-policy
-          subPath: aai_policy.json
-        {{- end }}
         - mountPath: /opt/app/aai-resources/resources/aaf/org.onap.aai.keyfile
           name: {{ include "common.fullname" . }}-aaf-certs
           subPath: org.onap.aai.keyfile
@@ -233,84 +215,6 @@ spec:
         - mountPath: /usr/share/filebeat/data
           name: {{ include "common.fullname" . }}-filebeat
         resources: {{ include "common.resources" . | nindent 12 }}
-    {{- 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.sidecar.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
-        - name: {{ include "common.fullname" . }}-rproxy-auth-config
-          mountPath: /opt/app/rproxy/config/auth/org.onap.aai.p12
-          subPath: org.onap.aai.p12
-        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.sidecar.keyStorePassword }}
-        - name: TRUST_STORE_PASSWORD
-          value: {{ .Values.sidecar.trustStorePassword }}
-        - 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/fproxy_truststore
-          subPath: fproxy_truststore
-        - 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: aai-common-aai-auth-mount
         secret:
@@ -342,35 +246,6 @@ spec:
           - key: {{ . }}
             path: {{ . }}
           {{- end }}
-    {{- if .Values.global.installSidecarSecurity }}
-      - name: {{ include "common.fullname" . }}-aai-policy
-        configMap:
-          name: {{ include "common.fullname" . }}-aai-policy-configmap
-      - 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 }}
       restartPolicy: {{ .Values.restartPolicy }}
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"
Introduces the ONAP Platform OOM (ONAP Operations Manager) to efficiently Deploy, Manage, Operate the ONAP platform and its components (e.g. MSO, DCAE, SDC, etc.) and infrastructure (VMs, Containers).