summaryrefslogtreecommitdiffstats
path: root/kubernetes/onap
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-09-17 12:19:36 +0000
committerGerrit Code Review <gerrit@onap.org>2020-09-17 12:19:36 +0000
commit0b14ba4a20a879ef6b94ae5db64fa08354d2f648 (patch)
tree633312190991cace32681659fd79cf79b4929e2a /kubernetes/onap
parent4bb27938dbb6641827ef8f09b8beae278d400129 (diff)
parent818ee5da4b1a207475dfee9956a1d9cf777e5347 (diff)
Merge "Add A1 Policy Management Service helm charts"
Diffstat (limited to 'kubernetes/onap')
-rwxr-xr-xkubernetes/onap/requirements.yaml5
-rw-r--r--kubernetes/onap/resources/environments/public-cloud.yaml8
-rw-r--r--kubernetes/onap/resources/overrides/onap-all.yaml4
-rwxr-xr-xkubernetes/onap/values.yaml3
4 files changed, 19 insertions, 1 deletions
diff --git a/kubernetes/onap/requirements.yaml b/kubernetes/onap/requirements.yaml
index 9385adea9a..f2d1aaf3ec 100755
--- a/kubernetes/onap/requirements.yaml
+++ b/kubernetes/onap/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2019 Amdocs, Bell Canada
+# Copyright (c) 2020 Nordix Foundation, Modifications
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -152,3 +153,7 @@ dependencies:
version: ~6.x-0
repository: '@local'
condition: modeling.enabled
+ - name: a1policymanagement
+ version: ~6.x-0
+ repository: '@local'
+ condition: a1policymanagement.enabled
diff --git a/kubernetes/onap/resources/environments/public-cloud.yaml b/kubernetes/onap/resources/environments/public-cloud.yaml
index 08329d8b43..4a910987a9 100644
--- a/kubernetes/onap/resources/environments/public-cloud.yaml
+++ b/kubernetes/onap/resources/environments/public-cloud.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Copyright (c) 2020 Nordix Foundation, Modifications
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -174,3 +175,10 @@ mariadb-galera:
readiness:
initialDelaySeconds: 120
+a1policymanagement:
+ liveness:
+ initialDelaySeconds: 60
+ periodSeconds: 10
+ readiness:
+ initialDelaySeconds: 60
+ periodSeconds: 10
diff --git a/kubernetes/onap/resources/overrides/onap-all.yaml b/kubernetes/onap/resources/overrides/onap-all.yaml
index 86f898d18c..bfa0cdf8b8 100644
--- a/kubernetes/onap/resources/overrides/onap-all.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all.yaml
@@ -1,5 +1,5 @@
# Copyright © 2019 Amdocs, Bell Canada
-#
+# Copyright (c) 2020 Nordix Foundation, Modifications
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
@@ -79,3 +79,5 @@ vnfsdk:
enabled: true
modeling:
enabled: true
+a1policymanagement:
+ enabled: true \ No newline at end of file
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index 9928e93445..2b18288ea3 100755
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -1,4 +1,5 @@
# Copyright © 2019 Amdocs, Bell Canada
+# Copyright (c) 2020 Nordix Foundation, Modifications
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -307,3 +308,5 @@ vnfsdk:
enabled: false
modeling:
enabled: false
+a1policymanagement:
+ enabled: false