From d24825b061cc84cde2397c71c128be72500d20c7 Mon Sep 17 00:00:00 2001
From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Tue, 3 Nov 2020 15:52:44 +0000
Subject: Revert "[SO] helm chart for cnf-adapter"

This reverts commit a2145f7fa5a4bfadf6782333a879e75730da4f8e.

Reason for revert: it seems to have weird consequences when bumping so version

Issue-ID: SO-3164
Change-Id: Ibf869be9e9dcba915a738605af6d4f823742fbea
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
---
 .../resources/config/overrides/override.yaml       |  2 +-
 .../so/components/so-appc-orchestrator/values.yaml | 26 +++++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'kubernetes/so/components/so-appc-orchestrator')

diff --git a/kubernetes/so/components/so-appc-orchestrator/resources/config/overrides/override.yaml b/kubernetes/so/components/so-appc-orchestrator/resources/config/overrides/override.yaml
index 69178fd6c7..661ed64b0e 100644
--- a/kubernetes/so/components/so-appc-orchestrator/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-appc-orchestrator/resources/config/overrides/override.yaml
@@ -22,7 +22,7 @@ server:
 mso:
   logPath: ./logs/soappcorch
   auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.auth.rest.aafEncrypted "value2" .Values.mso.auth )}}
-  msoKey: {{ .Values.mso.msoKey }}
+  msoKey: {{ .Values.global.app.msoKey }}
   config:
     {{ if .Values.global.security.aaf.enabled }}
     cadi: {{ include "so.cadi.keys" . | nindent 8}}
diff --git a/kubernetes/so/components/so-appc-orchestrator/values.yaml b/kubernetes/so/components/so-appc-orchestrator/values.yaml
index e63838d3b1..7570116fd5 100644
--- a/kubernetes/so/components/so-appc-orchestrator/values.yaml
+++ b/kubernetes/so/components/so-appc-orchestrator/values.yaml
@@ -30,7 +30,8 @@ global:
   security:
     aaf:
       enabled: false
-
+  app:
+    msoKey: 07a7159d3bf51a0e53be7a8f89699be7
 #################################################################
 # Secrets metaconfig
 #################################################################
@@ -73,7 +74,6 @@ db:
   adminName: so_admin
   adminPassword: so_Admin123
   # adminCredsExternalSecret: some secret
-
 server:
   actuator:
     username: mso_admin
@@ -87,8 +87,8 @@ service:
   name: so-appc-orchestrator
   type: ClusterIP
   ports:
-    - port: *containerPort
-      name: http
+  - port: *containerPort
+    name: http
 updateStrategy:
   type: RollingUpdate
   maxUnavailable: 1
@@ -96,6 +96,7 @@ updateStrategy:
 # Resource Limit flavor -By Default using small
 flavor: small
 
+
 #################################################################
 # soHelper part
 #################################################################
@@ -127,14 +128,14 @@ resources:
       cpu: 1000m
   unlimited: {}
 livenessProbe:
-  path: /manage/health
-  port: 8083
-  scheme: HTTP
-  initialDelaySeconds: 600
-  periodSeconds: 60
-  timeoutSeconds: 10
-  successThreshold: 1
-  failureThreshold: 3
+    path: /manage/health
+    port: 8083
+    scheme: HTTP
+    initialDelaySeconds: 600
+    periodSeconds: 60
+    timeoutSeconds: 10
+    successThreshold: 1
+    failureThreshold: 3
 ingress:
   enabled: false
 nodeSelector: {}
@@ -148,7 +149,6 @@ auth:
 mso:
   auth: BEA8637716A7EB617DF472BA6552D22F68C1CB17B0D094D77DDA562F4ADAAC4457CAB848E1A4
   basicUser: poBpmn
-  msoKey: 07a7159d3bf51a0e53be7a8f89699be7
 
 appc:
   client:
-- 
cgit 1.2.3-korg