diff options
| author |   Borislav Glozman <Borislav.Glozman@amdocs.com> | 2019-12-11 14:27:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-12-11 14:27:24 +0000 |
| commit | 0f15ec82c3ef94ac510350d43184299564a9fa85 (patch) | |
| tree | 169da49cea273d3074fa2f12b25a0c150a9e53ee | |
| parent | 73a2c25f2a9ea88e6bbce1175104ca46dd9a21d3 (diff) | |
| parent | 426a82c6e56c6d5048dd9e906f3be910cc51825c (diff) | |
Merge "Add ingress configuration for so-monitoring"
| -rw-r--r-- | kubernetes/so/charts/so-monitoring/templates/ingress.yaml | 1 | ||||
| -rw-r--r-- | kubernetes/so/charts/so-monitoring/values.yaml | 10 | ||||
| -rw-r--r-- | kubernetes/so/charts/so-vnfm-adapter/templates/ingress.yaml | 1 | ||||
| -rwxr-xr-x | kubernetes/so/charts/so-vnfm-adapter/values.yaml | 8 | ||||
| -rw-r--r-- | kubernetes/so/templates/ingress.yaml | 1 | ||||
| -rwxr-xr-x | kubernetes/so/values.yaml | 9 |
6 files changed, 27 insertions, 3 deletions
diff --git a/kubernetes/so/charts/so-monitoring/templates/ingress.yaml b/kubernetes/so/charts/so-monitoring/templates/ingress.yaml new file mode 100644 index 0000000000..8f87c68f1e --- /dev/null +++ b/kubernetes/so/charts/so-monitoring/templates/ingress.yaml @@ -0,0 +1 @@ +{{ include "common.ingress" . }} diff --git a/kubernetes/so/charts/so-monitoring/values.yaml b/kubernetes/so/charts/so-monitoring/values.yaml index 587dbea7bf..240ca1511d 100644 --- a/kubernetes/so/charts/so-monitoring/values.yaml +++ b/kubernetes/so/charts/so-monitoring/values.yaml @@ -81,7 +81,13 @@ livenessProbe: successThreshold: 1 failureThreshold: 3 ingress: - enabled: false + enabled: false + service: + - baseaddr: "somonitoring" + name: "so-monitoring" + port: 9091 + config: + ssl: "none" nodeSelector: {} tolerations: [] -affinity: {} +affinity: {}
\ No newline at end of file diff --git a/kubernetes/so/charts/so-vnfm-adapter/templates/ingress.yaml b/kubernetes/so/charts/so-vnfm-adapter/templates/ingress.yaml new file mode 100644 index 0000000000..8f87c68f1e --- /dev/null +++ b/kubernetes/so/charts/so-vnfm-adapter/templates/ingress.yaml @@ -0,0 +1 @@ +{{ include "common.ingress" . }} diff --git a/kubernetes/so/charts/so-vnfm-adapter/values.yaml b/kubernetes/so/charts/so-vnfm-adapter/values.yaml index 67523bc27f..78333767f6 100755 --- a/kubernetes/so/charts/so-vnfm-adapter/values.yaml +++ b/kubernetes/so/charts/so-vnfm-adapter/values.yaml @@ -72,6 +72,12 @@ livenessProbe: failureThreshold: 3 ingress: enabled: false + service: + - baseaddr: "sovnfmadapter" + name: "so-vnfm-adapter" + port: 9092 + config: + ssl: "redirect" nodeSelector: {} tolerations: [] -affinity: {} +affinity: {}
\ No newline at end of file diff --git a/kubernetes/so/templates/ingress.yaml b/kubernetes/so/templates/ingress.yaml new file mode 100644 index 0000000000..8f87c68f1e --- /dev/null +++ b/kubernetes/so/templates/ingress.yaml @@ -0,0 +1 @@ +{{ include "common.ingress" . }} diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml index b4bf248dfe..9d5ff4283e 100755 --- a/kubernetes/so/values.yaml +++ b/kubernetes/so/values.yaml @@ -105,3 +105,12 @@ mariadb-galera: persistence: mountSubPath: so/mariadb-galera/data enabled: true + +ingress: + enabled: false + service: + - baseaddr: "so" + name: "so" + port: 8080 + config: + ssl: "none"
\ No newline at end of file |