diff options
Diffstat (limited to 'kubernetes/pomba/charts/pomba-contextaggregator')
-rw-r--r-- | kubernetes/pomba/charts/pomba-contextaggregator/Chart.yaml | 2 | ||||
-rwxr-xr-x | kubernetes/pomba/charts/pomba-contextaggregator/requirements.yaml | 2 | ||||
-rwxr-xr-x | kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties (renamed from kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/networkdiscovery.properties) | 0 | ||||
-rwxr-xr-x | kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdnc.properties | 28 | ||||
-rwxr-xr-x | kubernetes/pomba/charts/pomba-contextaggregator/templates/deployment.yaml | 2 |
5 files changed, 3 insertions, 31 deletions
diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/Chart.yaml b/kubernetes/pomba/charts/pomba-contextaggregator/Chart.yaml index 0f41ac3193..28bd0ec88a 100644 --- a/kubernetes/pomba/charts/pomba-contextaggregator/Chart.yaml +++ b/kubernetes/pomba/charts/pomba-contextaggregator/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP POMBA Context Aggregator name: pomba-contextaggregator -version: 2.0.0 +version: 3.0.0 diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/requirements.yaml b/kubernetes/pomba/charts/pomba-contextaggregator/requirements.yaml index 1e8f788318..896eaf4baa 100755 --- a/kubernetes/pomba/charts/pomba-contextaggregator/requirements.yaml +++ b/kubernetes/pomba/charts/pomba-contextaggregator/requirements.yaml @@ -14,5 +14,5 @@ dependencies: - name: common - version: ~2.0.0 + version: ~3.0.0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/networkdiscovery.properties b/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties index aa80aed310..aa80aed310 100755 --- a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/networkdiscovery.properties +++ b/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdnc.properties b/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdnc.properties deleted file mode 100755 index f06d335213..0000000000 --- a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdnc.properties +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright © 2018 Amdocs -# -# 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 -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -server.host={{ .Values.config.sdncCtxBuilderHost }} -basicauth.username={{ .Values.config.sdncCtxBuilderUsername }} -basicauth.password={{ .Values.config.sdncCtxBuilderPassword }} -server.port={{ .Values.config.ctxBuilderExternalPort }} -server.protocol=http -trust.store.path=/auth/tomcat_keystore -key.store.path=/auth/aai-client-cert.p12 -key.store.password=70c87528c88dcd9f9c2558d30e817868 -key.store.type=PKCS12 -key.manager.factory.algorithm=SunX509 -security.protocol=TLS -connection.timeout.ms=15000 -read.timeout.ms=10000 -base.uri=/sdnccontextbuilder/service/context - diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/templates/deployment.yaml b/kubernetes/pomba/charts/pomba-contextaggregator/templates/deployment.yaml index 4dffd6e68b..44268db46e 100755 --- a/kubernetes/pomba/charts/pomba-contextaggregator/templates/deployment.yaml +++ b/kubernetes/pomba/charts/pomba-contextaggregator/templates/deployment.yaml @@ -64,7 +64,7 @@ spec: name: {{ include "common.fullname" . }}-config-builders readOnly: true resources: -{{ toYaml .Values.resources | indent 12 }} +{{ include "common.resources" . | indent 12 }} {{- if .Values.nodeSelector }} nodeSelector: {{- toYaml .Values.nodeSelector | indent 10 }} |