Revert "[AAI][SPARKY] Automatically retrieve certs"
This reverts commit a9a41d84026f059aae70f9042c0b99af5b72e619.
aai-sparky-be with this patch fails often in the gate.
I expect this to be related to this patch as the stack trace contains
below error message:
java.io.IOException: keystore password was incorrect
Issue-ID: OOM-2683
Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
Change-Id: I53650671eae700ef553b2f9158744ab72d881820
diff --git a/kubernetes/aai/components/aai-sparky-be/templates/configmap.yaml b/kubernetes/aai/components/aai-sparky-be/templates/configmap.yaml
index fee07d8..162e96b 100644
--- a/kubernetes/aai/components/aai-sparky-be/templates/configmap.yaml
+++ b/kubernetes/aai/components/aai-sparky-be/templates/configmap.yaml
@@ -14,6 +14,25 @@
# limitations under the License.
*/}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: {{ include "common.fullname" . }}-prop
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ include "common.release" . }}
+ heritage: {{ .Release.Service }}
+data:
+{{ tpl (.Files.Glob "resources/config/application.properties").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/application-resources.properties").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/application-ssl.properties").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/application-oxm-default.properties").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/application-oxm-override.properties").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/application-oxm-schema-prod.properties").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/roles.config").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/users.config").AsConfig . | indent 2 }}
---
apiVersion: v1
kind: ConfigMap
@@ -26,7 +45,7 @@
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
-{{ tpl (.Files.Glob "resources/config/application/*").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
---
apiVersion: v1
kind: ConfigMap
diff --git a/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml b/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
index 51d577b..6e74526 100644
--- a/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
@@ -38,29 +38,7 @@
release: {{ include "common.release" . }}
name: {{ include "common.name" . }}
spec:
- initContainers: {{ include "common.certInitializer.initContainer" . | nindent 6 }}
- - command:
- - sh
- args:
- - -c
- - |
- echo "*** retrieve Truststore and Keystore password"
- export $(cat {{ .Values.certInitializer.credsPath }}/mycreds.prop \
- | xargs -0)
- echo "*** write them in portal part"
- cd /config-input
- for PFILE in `ls -1 .`
- do
- envsubst <${PFILE} >/config/${PFILE}
- done
- volumeMounts: {{ include "common.certInitializer.volumeMount" . | nindent 8 }}
- - mountPath: /config-input
- name: portal-config-input
- - mountPath: /config
- name: portal-config
- image: {{ include "repositoryGenerator.image.envsubst" . }}
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- name: {{ include "common.name" . }}-update-config
+ initContainers:
- command:
- /app/ready.py
args:
@@ -79,56 +57,68 @@
- name: {{ include "common.name" . }}
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- command:
- - sh
- args:
- - -c
- - |
- echo "*** retrieve Truststore and Keystore password"
- export $(cat {{ .Values.certInitializer.credsPath }}/mycreds.prop \
- | xargs -0)
- echo "*** actual launch of AAI Sparky BE"
- /opt/app/sparky/bin/start.sh
- volumeMounts: {{ include "common.certInitializer.volumeMount" . | nindent 8 }}
+
+ volumeMounts:
- mountPath: /etc/localtime
name: localtime
readOnly: true
+ - mountPath: /opt/app/sparky/config/auth/client-cert-onap.p12
+ name: {{ include "common.fullname" . }}-auth-config
+ subPath: client-cert-onap.p12
+
- mountPath: /opt/app/sparky/config/auth/csp-cookie-filter.properties
- name: auth-config
+ name: {{ include "common.fullname" . }}-auth-config
subPath: csp-cookie-filter.properties
+
+ - mountPath: /opt/app/sparky/config/auth/org.onap.aai.p12
+ name: {{ include "common.fullname" . }}-auth-config
+ subPath: org.onap.aai.p12
+
+ - mountPath: /opt/app/sparky/config/auth/truststoreONAPall.jks
+ name: aai-common-aai-auth-mount
+ subPath: truststoreONAPall.jks
+
- mountPath: /opt/app/sparky/config/portal/
- name: portal-config
+ name: {{ include "common.fullname" . }}-portal-config
+
- mountPath: /opt/app/sparky/config/portal/BOOT-INF/classes/
- name: portal-config-props
+ name: {{ include "common.fullname" . }}-portal-config-props
+
- mountPath: /var/log/onap
- name: logs
+ name: {{ include "common.fullname" . }}-logs
+
- mountPath: /opt/app/sparky/config/application.properties
- name: config
+ name: {{ include "common.fullname" . }}-properties
subPath: application.properties
+
- mountPath: /opt/app/sparky/config/application-resources.properties
- name: config
+ name: {{ include "common.fullname" . }}-properties
subPath: application-resources.properties
+
- mountPath: /opt/app/sparky/config/application-ssl.properties
- name: config
+ name: {{ include "common.fullname" . }}-properties
subPath: application-ssl.properties
+
- mountPath: /opt/app/sparky/config/application-oxm-default.properties
- name: config
+ name: {{ include "common.fullname" . }}-properties
subPath: application-oxm-default.properties
+
- mountPath: /opt/app/sparky/config/application-oxm-override.properties
- name: config
+ name: {{ include "common.fullname" . }}-properties
subPath: application-oxm-override.properties
+
- mountPath: /opt/app/sparky/config/application-oxm-schema-prod.properties
- name: config
+ name: {{ include "common.fullname" . }}-properties
subPath: application-oxm-schema-prod.properties
+
- mountPath: /opt/app/sparky/config/roles.config
- name: config
+ name: {{ include "common.fullname" . }}-properties
subPath: roles.config
+
- mountPath: /opt/app/sparky/config/users.config
- name: config
+ name: {{ include "common.fullname" . }}-properties
subPath: users.config
- - mountPath: /opt/app/sparky/config/logging/logback.xml
- name: config
- subPath: logback.xml
+
ports:
- containerPort: {{ .Values.service.internalPort }}
# disable liveness probe when breakpoints set in debugger
@@ -165,35 +155,45 @@
subPath: filebeat.yml
name: filebeat-conf
- mountPath: /var/log/onap
- name: logs
+ name: {{ include "common.fullname" . }}-logs
- mountPath: /usr/share/filebeat/data
name: aai-sparky-filebeat
resources:
{{ include "common.resources" . }}
- volumes: {{ include "common.certInitializer.volumes" . | nindent 6 }}
+ volumes:
- name: localtime
hostPath:
path: /etc/localtime
- - name: config
+
+ - name: {{ include "common.fullname" . }}-properties
+ configMap:
+ name: {{ include "common.fullname" . }}-prop
+
+ - name: {{ include "common.fullname" . }}-config
configMap:
name: {{ include "common.fullname" . }}
- - name: portal-config
- emptyDir:
- medium: Memory
- - name: portal-config-input
+
+ - name: {{ include "common.fullname" . }}-portal-config
configMap:
name: {{ include "common.fullname" . }}-portal
- - name: portal-config-props
+
+ - name: {{ include "common.fullname" . }}-portal-config-props
configMap:
name: {{ include "common.fullname" . }}-portal-props
- - name: auth-config
+
+ - name: {{ include "common.fullname" . }}-auth-config
secret:
secretName: {{ include "common.fullname" . }}
+
+ - name: aai-common-aai-auth-mount
+ secret:
+ secretName: aai-common-aai-auth
+
- name: filebeat-conf
configMap:
name: aai-filebeat
- - name: logs
+ - name: {{ include "common.fullname" . }}-logs
emptyDir: {}
- name: aai-sparky-filebeat
emptyDir: {}