diff options
| author |   Krzysztof Opasiak <k.opasiak@samsung.com> | 2020-10-27 16:52:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-10-27 16:52:14 +0000 |
| commit | efa126367af5424a234a211a1420e891f5ea2117 (patch) | |
| tree | a617d2b6ce63a87a5ac20ea73d1df2833935451a | |
| parent | d28143ce94fe663a7c58898db6a310d05765b39a (diff) | |
| parent | 7c3180eab9bad68db1dffb47750756fe9ca30bac (diff) | |
Merge "[SO] use v2 version for VNFs"
| -rwxr-xr-x | kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml | 2 | ||||
| -rwxr-xr-x | kubernetes/so/components/so-bpmn-infra/values.yaml | 21 |
2 files changed, 12 insertions, 11 deletions
diff --git a/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml b/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml index 4429bd9f46..6aa2356bed 100755 --- a/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml +++ b/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml @@ -92,7 +92,7 @@ mso: vnf: endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/VnfAdapter rest: - endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/rest/v1/vnfs + endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/rest/{{ .Values.vnf.api.version }}/vnfs volume-groups: rest: endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/rest/v1/volume-groups diff --git a/kubernetes/so/components/so-bpmn-infra/values.yaml b/kubernetes/so/components/so-bpmn-infra/values.yaml index b6f315aa3d..034e269d6a 100755 --- a/kubernetes/so/components/so-bpmn-infra/values.yaml +++ b/kubernetes/so/components/so-bpmn-infra/values.yaml @@ -56,8 +56,6 @@ secrets: # - 'my file 1' # - '{{ include "templateThatGeneratesFileName" . }}' - - ################################################################# # Application configuration defaults. ################################################################# @@ -102,6 +100,10 @@ so: sniro: endpoint: http://replaceme:28090/optimizationInstance/V1/create +vnf: + api: + version: v2 + replicaCount: 1 minReadySeconds: 10 containerPort: &containerPort 8081 @@ -129,7 +131,6 @@ soHelpers: apiEnforcement: org.onap.so.bpmnPerm containerPort: *containerPort - # Resource Limit flavor -By Default using small flavor: large # Segregation for Different environment (Small and Large) @@ -150,13 +151,13 @@ resources: cpu: 1000m unlimited: {} livenessProbe: - path: /manage/health - scheme: HTTP - initialDelaySeconds: 600 - periodSeconds: 60 - timeoutSeconds: 10 - successThreshold: 1 - failureThreshold: 3 + path: /manage/health + scheme: HTTP + initialDelaySeconds: 600 + periodSeconds: 60 + timeoutSeconds: 10 + successThreshold: 1 + failureThreshold: 3 ingress: enabled: false nodeSelector: {} |