diff options
Diffstat (limited to 'kubernetes/onap')
| -rw-r--r-- | kubernetes/onap/Chart.yaml | 1 | ||||
| -rwxr-xr-x | kubernetes/onap/requirements.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/onap/resources/environments/public-cloud.yaml | 19 | ||||
| -rw-r--r-- | kubernetes/onap/resources/overrides/environment.yaml | 17 | ||||
| -rw-r--r-- | kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml | 21 | ||||
| -rw-r--r-- | kubernetes/onap/resources/overrides/onap-all.yaml | 2 | ||||
| -rwxr-xr-x | kubernetes/onap/values.yaml | 2 |
7 files changed, 64 insertions, 2 deletions
diff --git a/kubernetes/onap/Chart.yaml b/kubernetes/onap/Chart.yaml index fa2ed65617..640efa6719 100644 --- a/kubernetes/onap/Chart.yaml +++ b/kubernetes/onap/Chart.yaml @@ -21,3 +21,4 @@ home: https://www.onap.org/ sources: - https://gerrit.onap.org/r/#/admin/projects/ icon: https://wiki.onap.org/download/thumbnails/1015829/onap_704x271%20copy.png?version=1&modificationDate=1488326334000&api=v2 +kubeVersion: ">=1.11.5-0" diff --git a/kubernetes/onap/requirements.yaml b/kubernetes/onap/requirements.yaml index 1d1dd8b7a5..8b186c01d6 100755 --- a/kubernetes/onap/requirements.yaml +++ b/kubernetes/onap/requirements.yaml @@ -33,6 +33,10 @@ dependencies: version: ~5.x-0 repository: '@local' condition: cassandra.enabled + - name: cds + version: ~5.x-0 + repository: '@local' + condition: cds.enabled - name: clamp version: ~5.x-0 repository: '@local' diff --git a/kubernetes/onap/resources/environments/public-cloud.yaml b/kubernetes/onap/resources/environments/public-cloud.yaml index 2d4360c579..3062e4e3fa 100644 --- a/kubernetes/onap/resources/environments/public-cloud.yaml +++ b/kubernetes/onap/resources/environments/public-cloud.yaml @@ -95,11 +95,24 @@ portal: readiness: initialDelaySeconds: 60 sdc: + sdc-fe: + liveness: + initialDelaySeconds: 120 + periodSeconds: 60 + timeoutSeconds: 15 + readiness: + initialDelaySeconds: 120 + periodSeconds: 60 + timeoutSeconds: 15 sdc-be: liveness: initialDelaySeconds: 120 + periodSeconds: 60 + timeoutSeconds: 15 readiness: initialDelaySeconds: 120 + periodSeconds: 60 + timeoutSeconds: 15 sdc-cs: liveness: initialDelaySeconds: 120 @@ -107,14 +120,18 @@ sdc: initialDelaySeconds: 120 sdc-es: liveness: - initialDelaySeconds: 60 + initialDelaySeconds: 120 readiness: initialDelaySeconds: 120 sdc-onboarding-be: liveness: initialDelaySeconds: 120 + periodSeconds: 60 + timeoutSeconds: 15 readiness: initialDelaySeconds: 120 + periodSeconds: 60 + timeoutSeconds: 15 sdnc: liveness: initialDelaySeconds: 60 diff --git a/kubernetes/onap/resources/overrides/environment.yaml b/kubernetes/onap/resources/overrides/environment.yaml index 75ce8e529b..2788e244e2 100644 --- a/kubernetes/onap/resources/overrides/environment.yaml +++ b/kubernetes/onap/resources/overrides/environment.yaml @@ -157,11 +157,24 @@ portal: readiness: periodSeconds: 60 sdc: + sdc-fe: + liveness: + initialDelaySeconds: 120 + periodSeconds: 60 + timeoutSeconds: 15 + readiness: + initialDelaySeconds: 120 + periodSeconds: 60 + timeoutSeconds: 15 sdc-be: liveness: initialDelaySeconds: 120 + periodSeconds: 60 + timeoutSeconds: 15 readiness: initialDelaySeconds: 120 + periodSeconds: 60 + timeoutSeconds: 15 sdc-cs: liveness: initialDelaySeconds: 120 @@ -177,8 +190,12 @@ sdc: sdc-onboarding-be: liveness: initialDelaySeconds: 120 + periodSeconds: 60 + timeoutSeconds: 15 readiness: initialDelaySeconds: 120 + periodSeconds: 60 + timeoutSeconds: 15 sdnc: liveness: initialDelaySeconds: 60 diff --git a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml index ee27269564..7ef1e02714 100644 --- a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml +++ b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml @@ -26,6 +26,8 @@ aai: enabled: true appc: enabled: true +cds: + enabled: true clamp: enabled: true cli: @@ -66,6 +68,16 @@ sdnc: enabled: true so: enabled: true + so-monitoring: + enabled: true + ingress: + enabled: true + service: + - path: "/so-monitoring" + name: "so-monitoring" + port: 9091 + annotations: + nginx.ingress.kubernetes.io/ssl-redirect: "false" uui: enabled: true vfc: @@ -73,8 +85,15 @@ vfc: vid: enabled: true ingress: - enabled: true + enabled: true + service: + - path: "/vid" + name: "vid-http" + port: 8080 + annotations: + nginx.ingress.kubernetes.io/ssl-redirect: "false" vnfsdk: enabled: true nginx-ingress: enabled: true + diff --git a/kubernetes/onap/resources/overrides/onap-all.yaml b/kubernetes/onap/resources/overrides/onap-all.yaml index 04fbc97f54..c93f2c44f7 100644 --- a/kubernetes/onap/resources/overrides/onap-all.yaml +++ b/kubernetes/onap/resources/overrides/onap-all.yaml @@ -26,6 +26,8 @@ aai: enabled: true appc: enabled: true +cds: + enabled: true clamp: enabled: true cli: diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml index c0095049b5..672ae2ef9e 100755 --- a/kubernetes/onap/values.yaml +++ b/kubernetes/onap/values.yaml @@ -77,6 +77,8 @@ appc: openStackEncryptedPassword: admin cassandra: enabled: false +cds: + enabled: false clamp: enabled: false cli: |