Merge "[AAI] OOM AAI MODEL LOADER Fixed BabelClient"
authorAndreas Geissler <andreas-geissler@telekom.de>
Mon, 24 Oct 2022 06:28:58 +0000 (06:28 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 24 Oct 2022 06:28:58 +0000 (06:28 +0000)
103 files changed:
kubernetes/a1policymanagement/resources/config/application.yaml
kubernetes/a1policymanagement/resources/config/application_configuration.json
kubernetes/a1policymanagement/templates/statefulset.yaml
kubernetes/a1policymanagement/values.yaml
kubernetes/aaf/components/aaf-cm/values.yaml
kubernetes/aaf/components/aaf-fs/values.yaml
kubernetes/aaf/components/aaf-gui/values.yaml
kubernetes/aaf/components/aaf-locate/values.yaml
kubernetes/aaf/components/aaf-oauth/values.yaml
kubernetes/aaf/components/aaf-service/values.yaml
kubernetes/aai/components/aai-babel/values.yaml
kubernetes/aai/components/aai-sparky-be/values.yaml
kubernetes/aai/values.yaml
kubernetes/appc/values.yaml
kubernetes/cds/components/cds-blueprints-processor/values.yaml
kubernetes/cds/components/cds-ui/values.yaml
kubernetes/cli/values.yaml
kubernetes/consul/values.yaml
kubernetes/cps/components/cps-core/resources/config/application-helm.yml
kubernetes/cps/components/cps-core/templates/deployment.yaml
kubernetes/cps/components/cps-core/values.yaml
kubernetes/cps/components/cps-temporal/values.yaml
kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
kubernetes/cps/templates/cps-kafka-topic.yaml
kubernetes/cps/templates/cps-kafka-user.yaml
kubernetes/cps/values.yaml
kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/ingress.yaml [new file with mode: 0644]
kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/templates/ingress.yaml [new file with mode: 0644]
kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml
kubernetes/dcaegen2-services/components/dcae-restconf-collector/templates/ingress.yaml [new file with mode: 0644]
kubernetes/dcaegen2-services/components/dcae-restconf-collector/values.yaml
kubernetes/dcaegen2-services/components/dcae-ves-collector/templates/ingress.yaml [new file with mode: 0644]
kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
kubernetes/dcaemod/components/dcaemod-designtool/values.yaml
kubernetes/dcaemod/components/dcaemod-distributor-api/values.yaml
kubernetes/dcaemod/components/dcaemod-genprocessor/values.yaml
kubernetes/dcaemod/components/dcaemod-onboarding-api/values.yaml
kubernetes/dmaap/components/dmaap-bc/values.yaml
kubernetes/dmaap/components/dmaap-dr-node/values.yaml
kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
kubernetes/dmaap/components/message-router/values.yaml
kubernetes/log/components/log-elasticsearch/values.yaml
kubernetes/log/components/log-kibana/values.yaml
kubernetes/log/components/log-logstash/values.yaml
kubernetes/msb/components/msb-consul/values.yaml
kubernetes/msb/components/msb-discovery/values.yaml
kubernetes/msb/components/msb-eag/values.yaml
kubernetes/msb/components/msb-iag/values.yaml
kubernetes/nbi/templates/deployment.yaml
kubernetes/nbi/templates/service.yaml
kubernetes/nbi/values.yaml
kubernetes/oof/components/oof-has/components/oof-has-api/values.yaml
kubernetes/oof/values.yaml
kubernetes/policy/components/policy-apex-pdp/values.yaml
kubernetes/policy/components/policy-api/values.yaml
kubernetes/policy/components/policy-clamp-ac-http-ppnt/resources/config/HttpParticipantParameters.yaml
kubernetes/policy/components/policy-clamp-ac-http-ppnt/values.yaml
kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml
kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml
kubernetes/policy/components/policy-clamp-ac-pf-ppnt/resources/config/PolicyParticipantParameters.yaml
kubernetes/policy/components/policy-clamp-ac-pf-ppnt/values.yaml
kubernetes/policy/components/policy-clamp-be/values.yaml [deleted file]
kubernetes/policy/components/policy-clamp-runtime-acm/values.yaml
kubernetes/policy/components/policy-distribution/values.yaml
kubernetes/policy/components/policy-drools-pdp/values.yaml
kubernetes/policy/components/policy-gui/values.yaml
kubernetes/policy/components/policy-pap/values.yaml
kubernetes/policy/components/policy-xacml-pdp/values.yaml
kubernetes/policy/values.yaml
kubernetes/portal/components/portal-app/values.yaml
kubernetes/portal/components/portal-sdk/values.yaml
kubernetes/robot/resources/config/eteshare/config/robot_properties.py
kubernetes/robot/values.yaml
kubernetes/sdc/components/sdc-be/values.yaml
kubernetes/sdc/components/sdc-fe/values.yaml
kubernetes/sdc/components/sdc-wfd-be/values.yaml
kubernetes/sdc/components/sdc-wfd-fe/values.yaml
kubernetes/sdnc/values.yaml
kubernetes/so/components/so-admin-cockpit/resources/config/overrides/override.yaml
kubernetes/so/components/so-admin-cockpit/values.yaml
kubernetes/so/components/so-appc-orchestrator/resources/config/overrides/override.yaml
kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
kubernetes/so/components/so-catalog-db-adapter/resources/config/overrides/override.yaml
kubernetes/so/components/so-cnf-adapter/resources/config/overrides/override.yaml
kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml
kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
kubernetes/so/components/so-etsi-sol003-adapter/resources/config/overrides/override.yaml
kubernetes/so/components/so-etsi-sol003-adapter/values.yaml
kubernetes/so/components/so-etsi-sol005-adapter/resources/config/overrides/override.yaml
kubernetes/so/components/so-nssmf-adapter/resources/config/overrides/override.yaml
kubernetes/so/components/so-oof-adapter/resources/config/overrides/override.yaml
kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml
kubernetes/so/components/so-request-db-adapter/resources/config/overrides/override.yaml
kubernetes/so/components/so-sdc-controller/resources/config/overrides/override.yaml
kubernetes/so/components/so-sdnc-adapter/resources/config/overrides/override.yaml
kubernetes/so/components/so-ve-vnfm-adapter/resources/config/overrides/override.yaml
kubernetes/so/resources/config/overrides/override.yaml
kubernetes/so/values.yaml
kubernetes/uui/components/uui-server/values.yaml
kubernetes/uui/values.yaml
kubernetes/vid/values.yaml
kubernetes/vnfsdk/values.yaml

index 37754ca..05fddb2 100644 (file)
@@ -52,6 +52,7 @@ server:
   port: 8433
   http-port: 8081
   ssl:
+    enabled: {{ (eq "true" (include "common.needTLS" .)) | ternary true false }}
     key-store-type: PKCS12
     key-store-password: ${KEYSTORE_PASSWORD}
     key-store: {{ .Values.certInitializer.credsPath }}/{{ .Values.certInitializer.fqi_namespace }}.p12
index 6b8ebfb..757ee04 100644 (file)
@@ -3,7 +3,7 @@
     "controller": [
       {
         "name": "controller1",
-        "baseUrl": "{{ .Values.sdncLink }}",
+        "baseUrl": "{{ (eq "true" (include "common.needTLS" .)) | ternary .Values.sdncLink .Values.sdncLinkHttp }}",
         "userName": "${A1CONTROLLER_USER}",
         "password": "${A1CONTROLLER_PASSWORD}"
       }
index 0114b30..89d131e 100644 (file)
@@ -39,8 +39,10 @@ spec:
         args:
         - -c
         - |
+          {{- if (include "common.needTLS" .) }}
           export $(cat {{ .Values.certInitializer.credsPath }}/mycreds.prop\
             | xargs -0)
+          {{- end }}
           cd /config-input
           for PFILE in `ls -1`
           do
index 17fa320..71d8852 100644 (file)
@@ -86,6 +86,7 @@ a1controller:
   password: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
 
 sdncLink: https://sdnc.onap:8443
+sdncLinkHttp: http://sdnc.onap:8282
 # The information about A1-Mediator/RICs can be added here.
 # The A1 policy management service supports both STD & OSC versions.
 # Alternatively, the A1 simulator from ORAN-SC can also be used. It provides STD  & OSC versions for A1 termination.
index 964b5c1..a8159dc 100644 (file)
@@ -69,7 +69,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "aafcm"
+    - baseaddr: "aaf-cm-api"
       name: "aaf-cm"
       port: 8150
   config:
index e911a10..a0e9fe9 100644 (file)
@@ -70,7 +70,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "aaffs"
+    - baseaddr: "aaf-fs-api"
       name: "aaf-fs"
       port: 8096
   config:
index e239e61..fd416b6 100644 (file)
@@ -70,7 +70,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "aafgui"
+    - baseaddr: "aaf-ui"
       name: "aaf-gui"
       port: 8200
   config:
index 0a3e4d4..86a9321 100644 (file)
@@ -67,7 +67,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "aaflocate"
+    - baseaddr: "aaf-locate-api"
       name: "aaf-locate"
       port: 8095
   config:
index 2e9b6d4..a103fb2 100644 (file)
@@ -70,7 +70,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "aafoauth"
+    - baseaddr: "aaf-oauth-api"
       name: "aaf-oauth"
       port: 8140
   config:
index 8d8da0d..a6f3c5d 100644 (file)
@@ -69,7 +69,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "aafservice"
+    - baseaddr: "aaf-service-api"
       name: "aaf-service"
       port: 8100
   config:
index 29a5104..347f6c9 100644 (file)
@@ -93,7 +93,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "aaibabel"
+    - baseaddr: "aai-babel-api"
       name: "aai-babel"
       port: 9516
   config:
index 5c540c9..b4cea4c 100644 (file)
@@ -120,7 +120,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "aaisparkybe"
+    - baseaddr: "aai-sparkybe-api"
       name: "aai-sparky-be"
       port: 8000
   config:
index 94f2bea..247c58b 100644 (file)
@@ -396,9 +396,10 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "aai.api"
+    - baseaddr: "aai-api"
       name: "aai"
       port: 8443
+      plain_port: 80
       config:
        ssl: "redirect"
 
index f59a64f..d224030 100644 (file)
@@ -344,9 +344,10 @@ persistence:
 ingress:
   enabled: false
   service:
-    - baseaddr: "appc.api"
+    - baseaddr: "appc-api"
       name: "appc"
       port: 8443
+      plain_port: 1830
   config:
     ssl: "redirect"
 
index 7ed3e85..4b478e2 100755 (executable)
@@ -237,7 +237,7 @@ cluster:
 ingress:
   enabled: false
   service:
-    - baseaddr: "blueprintsprocessorhttp"
+    - baseaddr: "cds-blueprintsprocessor-api"
       name: "cds-blueprints-processor-http"
       port: 8080
       config:
index 14fc014..1c8c60a 100644 (file)
@@ -102,7 +102,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "cdsui"
+    - baseaddr: "cds-ui"
       name: "cds-ui"
       port: 3000
       config:
index 58c649c..db36661 100644 (file)
@@ -99,10 +99,10 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "cli.api"
+    - baseaddr: "cli-api"
       name: "cli"
       port: 443
-    - baseaddr: "cli2.api"
+    - baseaddr: "cli2-api"
       name: cli
       port: 9443
   config:
index e2aa181..9036606 100644 (file)
@@ -61,7 +61,7 @@ service: {}
 ingress:
   enabled: false
   service:
-    - baseaddr: "consul.api"
+    - baseaddr: "consul-api"
       name: "consul-server"
       port: 8800
   config:
index e295a37..f9bb230 100644 (file)
@@ -48,10 +48,11 @@ logging:
     org:
       springframework: {{ .Values.logging.level }}
 
-dmi:
-  auth:
-    username: ${DMI_USERNAME}
-    password: ${DMI_PASSWORD}
+ncmp:
+  dmi:
+    auth:
+      username: ${DMI_USERNAME}
+      password: ${DMI_PASSWORD}
 
 {{- if .Values.config.useStrimziKafka }}
 spring.kafka.bootstrap-servers: {{ include "common.release" . }}-{{ .Values.config.kafkaBootstrap }}:9092
index a247f14..1b482f4 100644 (file)
@@ -97,6 +97,24 @@ spec:
         env:
           - name: SPRING_PROFILES_ACTIVE
             value: {{ .Values.config.spring.profile }}
+          - name: DB_USERNAME
+            {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "pg-user-creds" "key" "login") | indent 12 }}
+          - name: DB_PASSWORD
+            {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "pg-user-creds" "key" "password") | indent 12 }}
+          - name: LIQUIBASE_LABELS
+            value: {{ .Values.config.liquibaseLabels }}
+          - name: CPS_USERNAME
+            {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "app-user-creds" "key" "login") | indent 12 }}
+          - name: CPS_PASSWORD
+            {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "app-user-creds" "key" "password") | indent 12 }}
+          - name: DMI_USERNAME
+            {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "dmi-plugin-user-creds" "key" "login") | indent 12 }}
+          - name: DMI_PASSWORD
+            {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "dmi-plugin-user-creds" "key" "password") | indent 12 }}
+          {{- if .Values.config.useStrimziKafka }}
+          - name: JAASLOGIN
+            {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "cps-kafka-user" "key" "sasl.jaas.config") | indent 12 }}
+          {{- end }}
         resources: {{ include "common.resources" . | nindent 10 }}
         {{- if .Values.nodeSelector }}
         nodeSelector: {{ toYaml .Values.nodeSelector | nindent 12 }}
index 5a10b2f..5f85122 100644 (file)
@@ -75,7 +75,7 @@ global:
     container:
       name: postgres
 
-image: onap/cps-and-ncmp:3.0.1
+image: onap/cps-and-ncmp:3.1.4
 containerPort: &svc_port 8080
 managementPort: &mgt_port 8081
 
@@ -154,7 +154,7 @@ startup:
 ingress:
   enabled: true
   service:
-    - baseaddr: "cps-core"
+    - baseaddr: "cps-core-api"
       path: "/"
       name: "cps-core"
       port: *svc_port
@@ -208,7 +208,7 @@ config:
     notification.data-updated.filters.enabled-dataspaces: ""
     notification.async.enabled: false
     notification.async.executor.core-pool-size: 2
-    notification.async.executor.max-pool-size: 1
+    notification.async.executor.max-pool-size: 10
     notification.async.executor.queue-capacity: 500
     notification.async.executor.wait-for-tasks-to-complete-on-shutdown: true
     notification.async.executor.thread-name-prefix: Async-
index a92791e..3ff7d02 100644 (file)
@@ -48,7 +48,7 @@ secrets:
         value: '{{ .Values.config.someConfig }}'
         policy: generate
 
-image: onap/cps-temporal:1.1.0
+image: onap/cps-temporal:1.2.0
 containerPort: &svc_port 8080
 managementPort: &mgt_port 8081
 
@@ -122,7 +122,7 @@ readiness:
 ingress:
   enabled: true
   service:
-    - baseaddr: "cps-temporal"
+    - baseaddr: "cps-temporal-api"
       path: "/"
       name: "cps-temporal"
       port: *svc_port
index 0edb648..143bd67 100644 (file)
@@ -47,7 +47,7 @@ global:
     virtualhost:
       baseurl: "simpledemo.onap.org"
 
-image: onap/ncmp-dmi-plugin:1.1.0
+image: onap/ncmp-dmi-plugin:1.2.1
 containerPort: &svc_port 8080
 managementPort: &mgt_port 8081
 
@@ -120,7 +120,7 @@ readiness:
 ingress:
   enabled: true
   service:
-    - baseaddr: "ncmp-dmi-plugin"
+    - baseaddr: "cps-ncmp-dmi-plugin-api"
       path: "/"
       name: *svc_name
       port: *svc_port
index 1a23ddf..b4ecfcd 100644 (file)
@@ -25,4 +25,24 @@ spec:
   config:
     retention.ms: {{ .Values.config.dataUpdatedTopic.retentionMs }}
     segment.bytes: {{ .Values.config.dataUpdatedTopic.segmentBytes }}
+---
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: {{ .Values.config.ncmpEventsTopic.name }}
+  labels:
+    strimzi.io/cluster: {{ include "common.release" . }}-strimzi
+spec:
+  config:
+    retention.ms: {{ .Values.config.ncmpEventsTopic.retentionMs }}
+---
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: {{ .Values.config.ncmpAsyncM2MTopic.name }}
+  labels:
+    strimzi.io/cluster: {{ include "common.release" . }}-strimzi
+spec:
+  config:
+    retention.ms: {{ .Values.config.ncmpAsyncM2MTopic.retentionMs }}
 {{- end }}
\ No newline at end of file
index b3136d7..fafc8c3 100644 (file)
@@ -38,4 +38,20 @@ spec:
         type: topic
         name: {{ .Values.config.dataUpdatedTopic.name }}
       operation: Write
+    - resource:
+        type: group
+        name: {{ .Values.config.ncmpEventsTopic.consumer.groupId }}
+      operation: All
+    - resource:
+        type: topic
+        name: {{ .Values.config.ncmpEventsTopic.name }}
+      operation: All
+    - resource:
+        type: group
+        name: {{ .Values.config.ncmpAsyncM2MTopic.consumer.groupId }}
+      operation: All
+    - resource:
+        type: topic
+        name: {{ .Values.config.ncmpAsyncM2MTopic.name }}
+      operation: All
 {{- end }}
\ No newline at end of file
index 700ad38..f3e6198 100755 (executable)
@@ -55,6 +55,16 @@ config:
     segmentBytes: 1073741824
     consumer:
       groupId: cps-temporal-group
+  ncmpEventsTopic:
+    name: ncmp-events
+    retentionMs: 7200000
+    consumer:
+      groupId: ncmp-group
+  ncmpAsyncM2MTopic:
+    name: ncmp-async-m2m
+    retentionMs: 600000
+    consumer:
+      groupId: ncmp-group
 
 # Enable all CPS components by default
 cps-core:
diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/ingress.yaml b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/ingress.yaml
new file mode 100644 (file)
index 0000000..79df5ce
--- /dev/null
@@ -0,0 +1,17 @@
+{{/*
+# Copyright (C) 2022 Deutsche Telekom AG
+#
+# 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.
+*/}}
+
+{{ include "common.ingress" . }}
index d9f91cf..5b0eea6 100644 (file)
@@ -120,6 +120,16 @@ service:
       plain_port: 8100
       port_protocol: http
 
+ingress:
+  enabled: false
+  service:
+    - baseaddr: "dcae-datafile-collector-api"
+      name: "datafile-collector"
+      port: 8443
+      plain_port: 8100
+  config:
+    ssl: "redirect"
+
 # Data Router Publisher Credentials
 drPubscriberCreds:
   username: username
diff --git a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/templates/ingress.yaml b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/templates/ingress.yaml
new file mode 100644 (file)
index 0000000..df12117
--- /dev/null
@@ -0,0 +1,17 @@
+{{/*
+# Copyright (C) 2022 Deutsche Telekom AG
+#
+# 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.
+*/}}
+
+{{ include "common.ingress" . }}
\ No newline at end of file
index 067ddb2..9beef81 100644 (file)
@@ -118,6 +118,15 @@ service:
       port_protocol: http
       nodePort: 22
 
+ingress:
+  enabled: false
+  service:
+    - baseaddr: "dcae-hv-ves-collector-api"
+      name: "dcae-hv-ves-collector"
+      port: 6061
+  config:
+    ssl: "redirect"
+
 #strimzi kafka config
 hvVesKafkaUser: dcae-hv-ves-kafka-user
 
diff --git a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/templates/ingress.yaml b/kubernetes/dcaegen2-services/components/dcae-restconf-collector/templates/ingress.yaml
new file mode 100644 (file)
index 0000000..df12117
--- /dev/null
@@ -0,0 +1,17 @@
+{{/*
+# Copyright (C) 2022 Deutsche Telekom AG
+#
+# 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.
+*/}}
+
+{{ include "common.ingress" . }}
\ No newline at end of file
index 701fa4e..1a3cffa 100644 (file)
@@ -97,6 +97,16 @@ service:
       nodePort: 16
       useNodePortExt: true
 
+ingress:
+  enabled: false
+  service:
+    - baseaddr: "dcae-restconf-collector-api"
+      name: "dcae-restconf-collector"
+      port: 8443
+      plain_port: 8080
+  config:
+    ssl: "redirect"
+
 # AAF Credentials
 controllerCreds:
   username: access
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-collector/templates/ingress.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-collector/templates/ingress.yaml
new file mode 100644 (file)
index 0000000..df12117
--- /dev/null
@@ -0,0 +1,17 @@
+{{/*
+# Copyright (C) 2022 Deutsche Telekom AG
+#
+# 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.
+*/}}
+
+{{ include "common.ingress" . }}
\ No newline at end of file
index c9fb051..746853c 100644 (file)
@@ -107,6 +107,16 @@ service:
       nodePort: 17
       useNodePortExt: true
 
+ingress:
+  enabled: false
+  service:
+    - baseaddr: "dcae-ves-collector-api"
+      name: "dcae-ves-collector"
+      port: 8443
+      plain_port: 8080
+  config:
+    ssl: "redirect"
+
 # application environments
 applicationEnv:
   CBS_CLIENT_CONFIG_PATH: '/app-config-input/application_config.yaml'
index 86aad57..b05639b 100644 (file)
@@ -44,11 +44,11 @@ ingress:
     enabled: true
     enabledOverride: true
     service:
-    - baseaddr: "dcaemod"
+    - baseaddr: "dcaemod-nifi-ui"
       path: "/nifi"
       name: "dcaemod-designtool"
       port: 8080
-    - baseaddr: "dcaemod"
+    - baseaddr: "dcaemod-nifi-api"
       path: "/nifi-api"
       name: "dcaemod-designtool"
       port: 8080
index 12c0204..68fcf14 100644 (file)
@@ -44,7 +44,7 @@ ingress:
     enabled: true
     enabledOverride: true
     service:
-    - baseaddr: "dcaemod"
+    - baseaddr: "dcaemod-distributor-api"
       path: "/distributor"
       name: dcaemod-distributor-api
       port: 8080
index 81c5888..2dafdc9 100644 (file)
@@ -44,7 +44,7 @@ ingress:
   enabled: true
   enabledOverride: true
   service:
-  - baseaddr: "dcaemod"
+  - baseaddr: "dcaemod-genprocessor-api"
     path: "/nifi-jars"
     name: dcaemod-genprocessor
     port: 8080
index 2aefedb..70067e5 100644 (file)
@@ -50,7 +50,7 @@ ingress:
   enabled: true
   enabledOverride: true
   service:
-  - baseaddr: "dcaemod"
+  - baseaddr: "dcaemod-onboarding-api"
     path: "/onboarding"
     name: dcaemod-onboarding-api
     port: 8080
index 538820d..911fee8 100644 (file)
@@ -138,9 +138,10 @@ postgres:
 ingress:
   enabled: false
   service:
-    - baseaddr: "dmaapbc"
+    - baseaddr: "dmaap-bc-api"
       name: "dmaap-bc"
       port: 8443
+      plain_port: 8080
   config:
     ssl: "redirect"
 
index 3382068..6da3cda 100644 (file)
@@ -105,9 +105,10 @@ secrets: {}
 ingress:
   enabled: false
   service:
-    - baseaddr: "dmaapdrnode"
+    - baseaddr: "dmaap-dr-node-api"
       name: "dmaap-dr-node"
       port: 8443
+      plain_port: 8080
   config:
     ssl: "redirect"
 
index 4a68f67..59b0765 100644 (file)
@@ -79,9 +79,10 @@ persistence:
 ingress:
   enabled: false
   service:
-    - baseaddr: "dmaapdrprov"
+    - baseaddr: "dmaap-dr-prov-api"
       name: "dmaap-dr-prov"
       port: 8443
+      plain_port: 8080
   config:
     ssl: "redirect"
 
index 63c62ca..f9904e6 100644 (file)
@@ -154,9 +154,10 @@ prometheus:
 ingress:
   enabled: false
   service:
-    - baseaddr: "mr.api"
+    - baseaddr: "dmaap-mr-api"
       name: "message-router"
       port: 3905
+      plain_port: 3904
   config:
     ssl: "redirect"
 
index 7919a09..74cf4ed 100644 (file)
@@ -90,7 +90,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "loges"
+    - baseaddr: "log-es-api"
       name: "log-es"
       port: 9200
   config:
index 767ea6a..276bfea 100644 (file)
@@ -73,7 +73,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "kibana.api"
+    - baseaddr: "log-kibana-ui"
       name: "log-kibana"
       port: 5601
   config:
index 7a0674c..0ffb32a 100644 (file)
@@ -72,10 +72,10 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "logls"
+    - baseaddr: "log-ls-api"
       name: "log-ls"
       port: 5044
-    - baseaddr: "loglshttp"
+    - baseaddr: "log-ls-http-api"
       name: "log-ls"
       port: 9600
   config:
index 258d49e..01f2466 100644 (file)
@@ -57,7 +57,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "msbconsul"
+    - baseaddr: "msb-consul-api"
       name: "msb-consul"
       port: 8500
   config:
index 2d18d14..678dde7 100644 (file)
@@ -57,7 +57,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "msb.api.discovery"
+    - baseaddr: "msb-discovery-api"
       name: "msb-discovery"
       port: 10081
   config:
index 45f93ed..1c3f313 100644 (file)
@@ -97,9 +97,10 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "msbeag"
+    - baseaddr: "msb-eag-ui"
       name: "msb-eag"
       port: 443
+      plain_port: 80
   config:
     ssl: "redirect"
 
index 602177b..4bb772d 100644 (file)
@@ -97,9 +97,10 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "msbiag"
+    - baseaddr: "msb-iag-ui"
       name: "msb-iag"
       port: 443
+      plain_port: 80
   config:
     ssl: "redirect"
 
index b9ed35b..6a246a6 100644 (file)
 
 apiVersion: apps/v1
 kind: Deployment
-metadata:
-  name: {{ include "common.fullname" . }}
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ include "common.release" . }}
-    heritage: {{ .Release.Service }}
+metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
 spec:
-  selector:
-    matchLabels:
-      app: {{ include "common.name" . }}
+  selector: {{- include "common.selectors" . | nindent 4 }}
   replicas: {{ .Values.replicaCount }}
   template:
-    metadata:
-      labels:
-        app: {{ include "common.name" . }}
-        release: {{ include "common.release" . }}
-      name: {{ include "common.fullname" . }}
+    metadata: {{- include "common.templateMetadata" . | nindent 6 }}
     spec:
 {{- if .Values.global.aafEnabled }}
       initContainers: {{ include "common.certInitializer.initContainer" . | nindent 6 }}
@@ -45,8 +32,7 @@ spec:
         - name: {{ include "common.name" . }}
           image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-          ports:
-            - containerPort: {{ .Values.service.internalPort }}
+          ports: {{ include "common.containerPorts" . | nindent 12 }}
           # disable liveness probe when breakpoints set in debugger
           # so K8s doesn't restart unresponsive container
           {{- if .Values.global.aafEnabled }}
@@ -68,17 +54,17 @@ spec:
           {{ if .Values.liveness.enabled }}
           livenessProbe:
             httpGet:
-              port: {{ .Values.liveness.port }}
+              port: {{ if (include "common.needTLS" .) }}{{ .Values.service.internalPort }}{{ else }}{{ .Values.service.internalPlainPort }}{{ end }}
               path: {{ .Values.liveness.path }}
-              scheme: HTTPS
+              scheme: {{ if (include "common.needTLS" .) }}HTTPS{{ else }}HTTP{{ end }}
             initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
             periodSeconds: {{ .Values.liveness.periodSeconds }}
           {{ end }}
           readinessProbe:
             httpGet:
-              port: {{ .Values.readiness.port }}
+              port: {{ if (include "common.needTLS" .) }}{{ .Values.service.internalPort }}{{ else }}{{ .Values.service.internalPlainPort }}{{ end }}
               path: {{ .Values.readiness.path }}
-              scheme: HTTPS
+              scheme: {{ if (include "common.needTLS" .) }}HTTPS{{ else }}HTTP{{ end }}
             initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
             periodSeconds: {{ .Values.readiness.periodSeconds }}
           env:
@@ -105,15 +91,15 @@ spec:
             - name: ONAP_K8SCLOUDOWNER
               value: {{ .Values.config.k8sCloudOwner }}
             - name: NBI_URL
-              value: "https://nbi.{{ include "common.namespace" . }}:8443/nbi/api/v4"
+              value: "{{ if (include "common.needTLS" .) }}https{{ else }}http{{ end }}://nbi.{{ include "common.namespace" . }}:{{ if (include "common.needTLS" .) }}{{ .Values.service.internalPort }}{{ else }}{{ .Values.service.internalPlainPort }}{{ end }}/nbi/api/v4"
             - name: SDC_HOST
-              value: "https://sdc-be.{{ include "common.namespace" . }}:8443"
+              value: "{{ if (include "common.needTLS" .) }}https{{ else }}http{{ end }}://sdc-be.{{ include "common.namespace" . }}:{{ if (include "common.needTLS" .) }}8443{{ else }}8080{{ end }}"
             - name: SDC_HEADER_ECOMPINSTANCEID
               value: {{ .Values.config.ecompInstanceId }}
             - name: SDC_HEADER_AUTHORIZATION
               value: {{ .Values.sdc_authorization }}
             - name: AAI_HOST
-              value: "https://aai.{{ include "common.namespace" . }}:8443"
+              value: "{{ if (include "common.needTLS" .) }}https{{ else }}http{{ end }}://aai.{{ include "common.namespace" . }}:{{ if (include "common.needTLS" .) }}8443{{ else }}80{{ end }}"
             - name: AAI_HEADER_AUTHORIZATION
               value: {{ .Values.aai_authorization }}
             - name: SO_HOST
@@ -123,11 +109,11 @@ spec:
               value: {{ .Values.so_authorization }}
             {{- end }}
             - name: DMAAP_HOST
-              value: "https://message-router.{{ include "common.namespace" . }}:3905"
+              value: "{{ if (include "common.needTLS" .) }}https{{ else }}http{{ end }}://message-router.{{ include "common.namespace" . }}:{{ if (include "common.needTLS" .) }}3905{{ else }}3904{{ end }}"
             - name: LOGGING_LEVEL_ORG_ONAP_NBI
               value: {{ .Values.config.loglevel }}
             - name: MSB_ENABLED
-              value: "true"
+              value: "{{ .Values.global.msbEnabled }}"
             - name: MSB_DISCOVERY_HOST
               value: "msb-discovery.{{ include "common.namespace" . }}"
             - name: MSB_DISCOVERY_PORT
index 4d5359c..11fae18 100644 (file)
 # limitations under the License.
 */}}
 
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "common.servicename" . }}
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ include "common.release" . }}
-    heritage: {{ .Release.Service }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    {{if eq .Values.service.type "NodePort" -}}
-    - port: {{ .Values.service.internalPort }}
-      nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
-      name: {{ .Values.service.portName }}-{{ .Values.service.internalPort }}
-    {{- else -}}
-    - port: {{ .Values.service.externalPort }}
-      targetPort: {{ .Values.service.internalPort }}
-      name: {{ .Values.service.portName }}
-    {{- end}}
-  selector:
-    app: {{ include "common.name" . }}
-    release: {{ include "common.release" . }}
+{{ include "common.service" . }}
\ No newline at end of file
index 9b69a43..dc32367 100644 (file)
@@ -25,6 +25,7 @@ global:
     internalPort: 3306
     nameOverride: mariadb-galera
   aafEnabled: true
+  msbEnabled: true
 
 #################################################################
 # AAF part
@@ -134,7 +135,6 @@ affinity: {}
 # probe configuration parameters
 liveness:
   path: /nbi/api/v4/status
-  port: 8443
   initialDelaySeconds: 180
   periodSeconds: 30
   # necessary to disable liveness probe when setting breakpoints
@@ -143,7 +143,6 @@ liveness:
 
 readiness:
   path: /nbi/api/v4/status
-  port: 8443
   initialDelaySeconds: 185
   periodSeconds: 30
 
@@ -151,15 +150,21 @@ service:
   type: NodePort
   portName: api
   name: nbi
-  nodePort: 74
   internalPort: 8443
+  internalPlainPort: 8080
+  ports:
+    - name: http
+      port: 8443
+      plain_port: 8080
+      nodePort: '74'
 
 ingress:
   enabled: false
   service:
-    - baseaddr: "nbi.api"
+    - baseaddr: "nbi-api"
       name: "nbi"
       port: 8443
+      plain_port: 8080
   config:
     ssl: "redirect"
 # Resource Limit flavor -By Default using small
index d0d81c5..e4e843a 100755 (executable)
@@ -106,7 +106,7 @@ certInitializer:
 ingress:
   enabled: false
   service:
-    - baseaddr: "oof-has-api.onap"
+    - baseaddr: "oof-has-api"
       name: "oof-has-api"
       port: 8091
   config:
index 0673cf2..5d66828 100644 (file)
@@ -166,7 +166,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "oofosdf"
+    - baseaddr: "oof-osdf-api"
       name: "oof-osdf"
       port: 8698
   config:
index 09206dc..e366c44 100755 (executable)
@@ -57,7 +57,7 @@ secrets:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-apex-pdp:2.8.0
+image: onap/policy-apex-pdp:2.8.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
index d77929d..ec80ba8 100755 (executable)
@@ -79,7 +79,7 @@ certInitializer:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-api:2.7.0
+image: onap/policy-api:2.7.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
index c853249..51d4b47 100644 (file)
 #  ============LICENSE_END=========================================================
 
 spring:
+  autoconfigure:
+    exclude: >
+      org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,
+      org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration,
+      org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
   security:
     user:
       name: ${RESTSERVER_USER}
index 697ce6e..668d911 100644 (file)
@@ -78,7 +78,7 @@ certInitializer:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-clamp-ac-http-ppnt:6.3.0
+image: onap/policy-clamp-ac-http-ppnt:6.3.1
 pullPolicy: Always
 
 # application configuration
index 6fc53e2..bbe905b 100644 (file)
 #  ============LICENSE_END=========================================================
 
 spring:
+  autoconfigure:
+    exclude: >
+      org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,
+      org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration,
+      org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
   security:
     user:
       name: ${RESTSERVER_USER}
index b8f6b9f..3d2eeee 100644 (file)
@@ -79,7 +79,7 @@ certInitializer:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-clamp-ac-k8s-ppnt:6.3.0
+image: onap/policy-clamp-ac-k8s-ppnt:6.3.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
index fc00606..f24e0ff 100644 (file)
 #  ============LICENSE_END=========================================================
 
 spring:
+  autoconfigure:
+    exclude: >
+      org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,
+      org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration,
+      org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
   security:
     user:
       name: ${RESTSERVER_USER}
index 9d000f1..cf20bd1 100644 (file)
@@ -90,7 +90,7 @@ certInitializer:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-clamp-ac-pf-ppnt:6.3.0
+image: onap/policy-clamp-ac-pf-ppnt:6.3.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/policy/components/policy-clamp-be/values.yaml b/kubernetes/policy/components/policy-clamp-be/values.yaml
deleted file mode 100644 (file)
index 3442cdd..0000000
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright Â© 2017 Amdocs, Bell Canada
-# Modifications Copyright Â© 2018-2021 AT&T
-# Modifications Copyright Â© 2022 Nordix Foundation
-#
-# 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.
-
-#################################################################
-# Global configuration defaults.
-#################################################################
-global: # global defaults
-  nodePortPrefix: 302
-  persistence: {}
-  centralizedLoggingEnabled: true
-  #AAF service
-  aafEnabled: true
-
-#################################################################
-# AAF part
-#################################################################
-certInitializer:
-  permission_user: 1000
-  permission_group: 999
-  keystoreFile: 'org.onap.clamp.p12'
-  truststoreFile: 'org.onap.clamp.trust.jks'
-  keyFile: 'org.onap.clamp.keyfile'
-  truststoreFileONAP: 'truststoreONAPall.jks'
-  nameOverride: clamp-backend-cert-initializer
-  aafDeployFqi: deployer@people.osaaf.org
-  aafDeployPass: demo123456!
-  fqdn: clamp
-  fqi: clamp@clamp.onap.org
-  public_fqdn: clamp.onap.org
-  cadi_longitude: '-72.0'
-  cadi_latitude: '38.0'
-  app_ns: org.osaaf.aaf
-  credsPath: /opt/app/osaaf/local
-  aaf_add_config: >
-    /opt/app/aaf_config/bin/agent.sh local showpass {{.Values.fqi}} {{ .Values.fqdn }} > {{ .Values.credsPath }}/mycreds.prop;
-    cd {{ .Values.credsPath }};
-    chmod a+rx *;
-
-secrets:
-  - uid: db-creds
-    type: basicAuth
-    externalSecret: '{{ tpl (default "" .Values.db.credsExternalSecret) . }}'
-    login: '{{ .Values.db.user }}'
-    password: '{{ .Values.db.password }}'
-    passwordPolicy: required
-  - uid: sdc-creds
-    type: password
-    externalSecret: '{{ tpl (default "" .Values.sdc.sdcClientExternalSecret) . }}'
-    password: '{{ .Values.sdc.clientPassword }}'
-    passwordPolicy: required
-  - uid: runtime-be-secret
-    type: basicAuth
-    externalSecret: '{{ tpl (default "" .Values.config.appUserExternalSecret) . }}'
-    login: '{{ .Values.config.policyAppUserName }}'
-    password: '{{ .Values.config.policyAppUserPassword }}'
-    passwordPolicy: required
-
-flavor: small
-
-# application image
-image: onap/policy-clamp-backend:6.3.0
-pullPolicy: Always
-
-# flag to enable debugging - application support required
-debugEnabled: false
-
-# log configuration
-log:
-  path: /var/log/onap
-
-#################################################################
-# Application configuration defaults.
-#################################################################
-
-#####dummy values for db user and password to pass lint!!!#######
-sdc:
-  clientPassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
-
-db:
-  user: policy_user
-  password: policy_user
-  image: mariadb:10.5.8
-  service:
-    name: policy-mariadb
-    internalPort: 3306
-
-config:
-  policyAppUserName: runtimeUser
-  policyAppUserPassword: none
-  log:
-    logstashServiceName: log-ls
-    logstashPort: 5044
-  mysqlPassword: strong_pitchou
-  dataRootDir: /dockerdata-nfs
-
-# default number of instances
-replicaCount: 1
-
-nodeSelector: {}
-
-affinity: {}
-
-# probe configuration parameters
-liveness:
-  initialDelaySeconds: 120
-  periodSeconds: 10
-  timeoutSeconds: 3
-  # necessary to disable liveness probe when setting breakpoints
-  # in debugger so K8s doesn't restart unresponsive container
-  enabled: true
-
-readiness:
-  initialDelaySeconds: 10
-  periodSeconds: 10
-  timeoutSeconds: 3
-
-service:
-  type: ClusterIP
-  name: policy-clamp-be
-  portName: policy-clamp-be
-  internalPort: 8443
-  externalPort: 8443
-
-ingress:
-  enabled: false
-
-#resources: {}
-# We usually recommend not to specify default resources and to leave this as a conscious
-# choice for the user. This also increases chances charts run on environments with little
-# resources, such as Minikube. If you do want to specify resources, uncomment the following
-# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-#
-# Example:
-# Configure resource requests and limits
-# ref: http://kubernetes.io/docs/user-guide/compute-resources/
-# Minimum memory for development is 2 CPU cores and 4GB memory
-# Minimum memory for production is 4 CPU cores and 8GB memory
-resources:
-  small:
-    limits:
-      cpu: 1
-      memory: 1Gi
-    requests:
-      cpu: 1m
-      memory: 1Gi
-  large:
-    limits:
-      cpu: 1
-      memory: 3Gi
-    requests:
-      cpu: 10m
-      memory: 3Gi
-  unlimited: {}
-
-#Pods Service Account
-serviceAccount:
-  nameOverride: policy-clamp-be
-  roles:
-    - read
index 87b613a..7c7d079 100644 (file)
@@ -85,7 +85,7 @@ certInitializer:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-clamp-runtime-acm:6.3.0
+image: onap/policy-clamp-runtime-acm:6.3.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
index 11b47a6..22c8fc4 100755 (executable)
@@ -67,7 +67,7 @@ global:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-distribution:2.8.0
+image: onap/policy-distribution:2.8.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
index 72f22bc..7b55612 100755 (executable)
@@ -41,7 +41,7 @@ secrets:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-pdpd-cl:1.11.0
+image: onap/policy-pdpd-cl:1.11.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
index 8761df7..330d1fc 100644 (file)
@@ -75,7 +75,7 @@ subChartsOnly:
 flavor: small
 
 # application image
-image: onap/policy-gui:2.3.0
+image: onap/policy-gui:2.3.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -127,7 +127,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "policygui.api"
+    - baseaddr: "policy-ui"
       name: "policygui"
       port: 2443
   config:
index cc66af9..1d1561c 100755 (executable)
@@ -100,7 +100,7 @@ certInitializer:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-pap:2.7.0
+image: onap/policy-pap:2.7.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
index c29e030..691e9ce 100755 (executable)
@@ -83,7 +83,7 @@ certInitializer:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-xacml-pdp:2.7.0
+image: onap/policy-xacml-pdp:2.7.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
index 1b9955b..b329727 100755 (executable)
@@ -170,7 +170,7 @@ mariadb:
   image: mariadb:10.5.8
 
 dbmigrator:
-  image: onap/policy-db-migrator:2.5.0
+  image: onap/policy-db-migrator:2.5.1
   schema: policyadmin
   policy_home: "/opt/app/policy"
 
index 039f560..483a7f3 100644 (file)
@@ -141,9 +141,10 @@ messageRouter:
 ingress:
   enabled: false
   service:
-    - baseaddr: portal.api
+    - baseaddr: portal-ui
       name: "portal-app"
       port: 8443
+      plain_port: 8080
   config:
     ssl: "redirect"
 
index 617ed10..1bc6b44 100644 (file)
@@ -136,7 +136,7 @@ messageRouter:
 ingress:
   enabled: false
   service:
-    - baseaddr: portal-sdk
+    - baseaddr: portal-sdk-api
       name: "portal-sdk"
       port: 8443
   config:
index 3c5f9ce..8365c68 100644 (file)
@@ -152,11 +152,11 @@ GLOBAL_SDC_USERNAME = '{{ .Values.sdcUsername }}'
 GLOBAL_SDC_PASSWORD = '{{ .Values.sdcPassword }}'
 GLOBAL_SDC_AUTHENTICATION = [GLOBAL_SDC_USERNAME, GLOBAL_SDC_PASSWORD]
 # clamp info - everything is from the private oam network (also called onap private network)
-GLOBAL_CLAMP_SERVER_PROTOCOL = "https"
+GLOBAL_CLAMP_SERVER_PROTOCOL = 'http{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}'
 GLOBAL_CLAMP_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "policy-gui" "port" 2443) }}'
 # nbi info - everything is from the private oam network (also called onap private network)
-GLOBAL_NBI_SERVER_PROTOCOL = "https"
-GLOBAL_NBI_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "nbi" "port" 8443) }}'
+GLOBAL_NBI_SERVER_PROTOCOL = 'http{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}'
+GLOBAL_NBI_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "nbi" "port" ( ternary 8443 8080 (eq "true" (include "common.needTLS" . )))) }}'
 # cli info - everything is from the private oam network (also called onap private network)
 GLOBAL_CLI_SERVER_PROTOCOL = "https"
 GLOBAL_CLI_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "cli" "port" 443) }}'
@@ -176,10 +176,10 @@ GLOBAL_DCAE_AUTHENTICATION = [GLOBAL_DCAE_USERNAME, GLOBAL_DCAE_PASSWORD]
 GLOBAL_DCAE_HVVES_SERVER_NAME = '{{include "robot.ingress.svchost" (dict "root" . "hostname" "dcae-hv-ves-collector") }}'
 GLOBAL_DCAE_HVVES_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "dcae-hv-ves-collector" "port" 6061) }}'
 # data router info - everything is from the private oam network (also called onap private network)
-GLOBAL_DMAAP_DR_PROV_SERVER_PROTOCOL = "https"
+GLOBAL_DMAAP_DR_PROV_SERVER_PROTOCOL = 'http{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}'
 GLOBAL_DMAAP_DR_PROV_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "dmaap-dr-prov" "port" 443) }}'
-GLOBAL_DMAAP_DR_NODE_SERVER_PROTOCOL = "https"
-GLOBAL_DMAAP_DR_NODE_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "dmapp-dr-node" "port" 8443) }}'
+GLOBAL_DMAAP_DR_NODE_SERVER_PROTOCOL = 'http{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}'
+GLOBAL_DMAAP_DR_NODE_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "dmapp-dr-node" "port" ( ternary 8443 8080 (eq "true" (include "common.needTLS" . )))) }}'
 # dmaap message router info
 GLOBAL_DMAAP_MESSAGE_ROUTER_SERVER_NAME = '{{include "robot.ingress.svchost" (dict "root" . "hostname" "message-router") }}'
 GLOBAL_DMAAP_MESSAGE_ROUTER_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "message-router" "port" 3904) }}'
@@ -216,14 +216,14 @@ GLOBAL_POMBA_ELASTICSEARCH_PORT = '{{include "robot.ingress.port" (dict "root" .
 GLOBAL_POMBA_CONTEXTAGGREGATOR_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "pomba-contextaggregator" "port" 9529) }}'
 
 # microservice bus info - everything is from the private oam network (also called onap private network)
-GLOBAL_MSB_SERVER_PROTOCOL = "https"
-GLOBAL_MSB_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "clamp" "port" 443) }}'
+GLOBAL_MSB_SERVER_PROTOCOL = 'http{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}'
+GLOBAL_MSB_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "msb-iag" "port" ( ternary 443 80 (eq "true" (include "common.needTLS" . )))) }}'
 # message router info - everything is from the private oam network (also called onap private network)
 GLOBAL_MR_SERVER_PROTOCOL = "http"
 GLOBAL_MR_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "message-router" "port" 3904) }}'
 # bus controller info
-GLOBAL_BC_SERVER_PROTOCOL = "https"
-GLOBAL_BC_HTTPS_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "dmaap-bc" "port" 8443) }}'
+GLOBAL_BC_SERVER_PROTOCOL = 'http{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}'
+GLOBAL_BC_HTTPS_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "dmaap-bc" "port" ( ternary 8443 8080 (eq "true" (include "common.needTLS" . )))) }}'
 GLOBAL_BC_USERNAME = '{{ .Values.bcUsername }}'
 GLOBAL_BC_PASSWORD = '{{ .Values.bcPassword }}'
 # dcae inventory and deployment handler info
@@ -290,7 +290,7 @@ GLOBAL_SO_NSSMF_ENDPOINT = 'http://' + GLOBAL_INJECTED_SO_NSSMF_IP_ADDR + ':' +
 GLOBAL_MUSIC_SERVER_PROTOCOL = "https"
 GLOBAL_MUSIC_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "music" "port" 8443) }}'
 # oof global info - everything is from the private oam network (also called onap private network)
-GLOBAL_OOF_SERVER_PROTOCOL = "https"
+GLOBAL_OOF_SERVER_PROTOCOL = 'http{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}'
 # oof-homing info - everything is from the private oam network (also called onap private network)
 GLOBAL_OOF_HOMING_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "oof-has-api" "port" 8091) }}'
 GLOBAL_OOF_HOMING_USERNAME="{{ .Values.oofHomingUsername }}"
@@ -315,7 +315,7 @@ GLOBAL_PACKET_GENERATOR_USERNAME = "admin"
 GLOBAL_PACKET_GENERATOR_PASSWORD = "admin"
 GLOBAL_PGN_PORT = "2831"
 # policy info - everything is from the private oam network (also called onap private network)
-GLOBAL_POLICY_SERVER_PROTOCOL = "https"
+GLOBAL_POLICY_SERVER_PROTOCOL = 'http{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}'
 GLOBAL_POLICY_SERVER_PORT = "8081"
 GLOBAL_POLICY_HEALTHCHECK_PORT = "6969"
 GLOBAL_POLICY_AUTH = '{{ .Values.policyAuth}}'
@@ -332,9 +332,9 @@ GLOBAL_PORTAL_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "host
 GLOBAL_PORTAL_USERNAME = '{{ .Values.portalUsername }}'
 GLOBAL_PORTAL_PASSWORD = '{{ .Values.portalPassword }}'
 # sdnc info - everything is from the private oam network (also called onap private network)
-GLOBAL_SDNC_SERVER_PROTOCOL = "https"
-GLOBAL_SDNC_REST_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "sdnc" "port" 8443) }}'
-GLOBAL_SDNC_ADMIN_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "sdnc-portal" "port" 8443) }}'
+GLOBAL_SDNC_SERVER_PROTOCOL = 'http{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}'
+GLOBAL_SDNC_REST_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "sdnc" "port" ( ternary 8443 8282 (eq "true" (include "common.needTLS" . )))) }}'
+GLOBAL_SDNC_ADMIN_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "sdnc-portal" "port" ( ternary 8443 8080 (eq "true" (include "common.needTLS" . )))) }}'
 GLOBAL_SDNC_USERNAME = '{{ .Values.sdncUsername }}'
 GLOBAL_SDNC_PASSWORD = '{{ .Values.sdncPassword }}'
 GLOBAL_SDNC_AUTHENTICATION = [GLOBAL_SDNC_USERNAME, GLOBAL_SDNC_PASSWORD]
@@ -350,13 +350,13 @@ GLOBAL_VID_PASSWORD = '{{ .Values.vidPassword}}'
 GLOBAL_VID_HEALTH_USERNAME = '{{ .Values.vidHealthUsername }}'
 GLOBAL_VID_HEALTH_PASSWORD = '{{ .Values.vidHealthPassword }}'
 # vnfsdk info - everything is from the private oam network (also called onap private network)
-GLOBAL_VNFSDK_SERVER_PROTOCOL = "https"
+GLOBAL_VNFSDK_SERVER_PROTOCOL = 'http{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}'
 GLOBAL_VNFSDK_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "refrepo" "port" 8703) }}'
 
 GLOBAL_DCAE_VES_PROTOCOL = "http"
 GLOBAL_DCAE_VES_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "dcae-ves-collector" "port" 8080) }}'
-GLOBAL_DCAE_VES_HTTPS_PROTOCOL = "https"
-GLOBAL_DCAE_VES_HTTPS_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "dcae-ves-collector-https" "port" 8443) }}'
+GLOBAL_DCAE_VES_HTTPS_PROTOCOL = 'http{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}'
+GLOBAL_DCAE_VES_HTTPS_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "dcae-ves-collector-https" "port" ( ternary 8443 8080 (eq "true" (include "common.needTLS" . )))) }}'
 GLOBAL_DCAE_VES_USERNAME = 'sample1'
 GLOBAL_DCAE_VES_PASSWORD = 'sample1'
 
index 0b1aa0e..d7ee243 100644 (file)
@@ -437,7 +437,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "robot.api"
+    - baseaddr: "robot-api"
       name: "robot"
       port: 443
   config:
index dc3b669..9f21635 100644 (file)
@@ -135,9 +135,10 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "sdc.api.be"
+    - baseaddr: "sdc-be-api"
       name: "sdc-be"
       port: 8443
+      plain_port: 8080
   config:
     ssl: "redirect"
 
index 5e0c8da..76c9e13 100644 (file)
@@ -122,9 +122,10 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "sdc.api.fe"
+    - baseaddr: "sdc-fe-ui"
       name: "sdc-fe"
       port: 9443
+      plain_port: 8181
   config:
     ssl: "redirect"
 
index 828283e..8e49169 100644 (file)
@@ -136,9 +136,10 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "sdcwfdbe"
+    - baseaddr: "sdc-wfd-be-api"
       name: "sdc-wfd-be"
       port: 8443
+      plain_port: 8080
   config:
     ssl: "redirect"
 
index fd6f713..37fdfd7 100644 (file)
@@ -110,9 +110,10 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "sdcwfdfe"
+    - baseaddr: "sdc-wfd-fe-ui"
       name: "sdc-wfd-fe"
       port: 8443
+      plain_port: 8080
   annotations:
     ingress.kubernetes.io/secure-backends: "false"
     nginx.ingress.kubernetes.io/secure-backends: "false"
index 292ea05..c2b1a9a 100644 (file)
@@ -486,12 +486,13 @@ dgbuilder:
   ingress:
     enabled: false
     service:
-      - baseaddr: "sdnc-dgbuilder"
+      - baseaddr: "sdnc-dgbuilder-ui"
         name: "sdnc-dgbuilder"
         port: 3000
-      - baseaddr: "sdnc-web-service"
+      - baseaddr: "sdnc-web-service-api"
         name: "sdnc-web-service"
         port: 8443
+        plain_port: 8080
     config:
       ssl: "redirect"
 
@@ -617,9 +618,10 @@ certpersistence:
 ingress:
   enabled: false
   service:
-    - baseaddr: "sdnc.api"
+    - baseaddr: "sdnc-api"
       name: "sdnc"
       port: 8443
+      plain_port: 8282
   config:
     ssl: "redirect"
 
index e1bac69..348609b 100644 (file)
@@ -1,4 +1,7 @@
 server:
+  {{- if include "common.onServiceMesh" . }}
+  forward-headers-strategy: none
+  {{- end }}
   port: {{ index .Values.containerPort }}
   {{- if .Values.global.aafEnabled }}
   ssl:
index 6cba922..f3954ed 100644 (file)
@@ -151,7 +151,7 @@ livenessProbe:
 ingress:
     enabled: false
     service:
-        - baseaddr: "soadmincockpit"
+        - baseaddr: "so-admin-cockpit-ui"
           name: "so-admin-cockpit"
           port: 9091
     config:
index 661ed64..061d8f0 100644 (file)
@@ -15,6 +15,9 @@
 */}}
 
 server:
+  {{- if include "common.onServiceMesh" . }}
+  forward-headers-strategy: none
+  {{- end }}
   port: {{ index .Values.containerPort }}
   tomcat:
     max-threads: 50
index ddff9c1..77e553b 100755 (executable)
@@ -20,7 +20,7 @@ aai:
   {{ if (include "common.needTLS" .) }}
   endpoint: https://aai.{{ include "common.namespace" . }}:8443
   {{ else }}
-  endpoint: http://aai.{{ include "common.namespace" . }}:8080
+  endpoint: http://aai.{{ include "common.namespace" . }}:80
   {{ end }}
   workflowAaiDistributionDelay: PT30S
   pnfEntryNotificationTimeout: P14D
@@ -358,6 +358,9 @@ sniro:
     headers.minorVersion: 1
     headers.latestVersion: 2
 server:
+  {{- if include "common.onServiceMesh" . }}
+  forward-headers-strategy: none
+  {{- end }}
   port: {{ index .Values.containerPort }}
   tomcat:
     max-threads: 50
index 7aa5984..c82a0d2 100755 (executable)
@@ -14,6 +14,9 @@
 # limitations under the License.
 */}}
 server:
+    {{- if include "common.onServiceMesh" . }}
+    forward-headers-strategy: none
+    {{- end }}
     port: {{ index .Values.containerPort }}
     tomcat:
         max-threads: 50
index 0c2f679..d667cb5 100755 (executable)
@@ -19,7 +19,7 @@ aai:
   {{ if (include "common.needTLS" .) }}
   endpoint: https://aai.{{ include "common.namespace" . }}:8443
   {{ else }}
-  endpoint: http://aai.{{ include "common.namespace" . }}:8080
+  endpoint: http://aai.{{ include "common.namespace" . }}:80
   {{ end }}
   enabled: {{ .Values.global.aai.enabled }}
 logging:
@@ -31,6 +31,9 @@ spring:
         password: ${ACTUATOR_PASSWORD}
         role: ACTUATOR
 server:
+  {{- if include "common.onServiceMesh" . }}
+  forward-headers-strategy: none
+  {{- end }}
   port: {{ index .Values.containerPort }}
   tomcat:
     max-threads: 50
index 7c1cb1b..df47c0a 100644 (file)
@@ -20,7 +20,7 @@ aai:
   {{ if (include "common.needTLS" .) }}
   endpoint: https://aai.{{ include "common.namespace" . }}:8443
   {{ else }}
-  endpoint: http://aai.{{ include "common.namespace" . }}:8080
+  endpoint: http://aai.{{ include "common.namespace" . }}:80
   {{ end }}
 spring:
   datasource:
@@ -45,6 +45,9 @@ spring:
       password: ${ETSI_NFVO_PASSWORD}
       role: ETSI-NFVO-Client
 server:
+  {{- if include "common.onServiceMesh" . }}
+  forward-headers-strategy: none
+  {{- end }}
   port: {{ .Values.containerPort }}
   tomcat:
     max-threads: 50
index 57bf2f3..f791cda 100644 (file)
@@ -150,7 +150,7 @@ livenessProbe:
 ingress:
   enabled: false
   service:
-    - baseaddr: 'soetsinfvonslcm'
+    - baseaddr: 'so-etsi-nfvo-ns-lcm-api'
       name: 'so-etsi-nfvo-ns-lcm'
       port: 9095
   config:
index 33b38ad..fed38f7 100755 (executable)
@@ -19,7 +19,7 @@ aai:
   {{ if (include "common.needTLS" .) }}
   endpoint: https://aai.{{ include "common.namespace" . }}:8443
   {{ else }}
-  endpoint: http://aai.{{ include "common.namespace" . }}:8080
+  endpoint: http://aai.{{ include "common.namespace" . }}:80
   {{ end }}
 spring:
   security:
@@ -31,6 +31,9 @@ spring:
       password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
       role: ACTUATOR
 server:
+  {{- if include "common.onServiceMesh" . }}
+  forward-headers-strategy: none
+  {{- end }}
   port: {{ index .Values.containerPort }}
   ssl:
     enabled: false
index 42554bb..339b042 100755 (executable)
@@ -101,7 +101,7 @@ livenessProbe:
 ingress:
   enabled: false
   service:
-      - baseaddr: "soetsisol003adapter"
+      - baseaddr: "so-etsi-sol003-adapter-api"
         name: "so-etsi-sol003-adapter"
         port: 9092
   config:
index e1e2fc2..189a02b 100755 (executable)
@@ -33,6 +33,9 @@ spring:
       password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
       role: ACTUATOR
 server:
+    {{- if include "common.onServiceMesh" . }}
+    forward-headers-strategy: none
+    {{- end }}
     port: {{ index .Values.containerPort }}
     tomcat:
         max-threads: 50
index 1d8a97c..016b3f5 100755 (executable)
@@ -18,7 +18,7 @@ aai:
   {{ if (include "common.needTLS" .) }}
   endpoint: https://aai.{{ include "common.namespace" . }}:8443
   {{ else }}
-  endpoint: http://aai.{{ include "common.namespace" . }}:8080
+  endpoint: http://aai.{{ include "common.namespace" . }}:80
   {{ end }}
 logging:
   path: logs
@@ -44,6 +44,9 @@ spring:
         password: ${ACTUATOR_PASSWORD}
         role: ACTUATOR
 server:
+  {{- if include "common.onServiceMesh" . }}
+  forward-headers-strategy: none
+  {{- end }}
   port: {{ index .Values.containerPort }}
   tomcat:
     max-threads: 50
index 8db5d26..2d645be 100755 (executable)
@@ -25,6 +25,9 @@ spring:
         password: ${ACTUATOR_PASSWORD}
         role: ACTUATOR
 server:
+  {{- if include "common.onServiceMesh" . }}
+  forward-headers-strategy: none
+  {{- end }}
   port: {{ index .Values.containerPort }}
   tomcat:
     max-threads: 50
index 487e931..7dc22c3 100755 (executable)
@@ -18,10 +18,14 @@ aai:
   {{ if (include "common.needTLS" .) }}
   endpoint: https://aai.{{ include "common.namespace" . }}:8443
   {{ else }}
-  endpoint: http://aai.{{ include "common.namespace" . }}:8080
+  endpoint: http://aai.{{ include "common.namespace" . }}:80
   {{ end }}
 server:
+  {{- if include "common.onServiceMesh" . }}
+  forward-headers-strategy: none
+  {{- end }}
   port: {{ index .Values.containerPort }}
+SW  port: {{ index .Values.containerPort }}
 spring:
   datasource:
     hikari:
@@ -117,8 +121,8 @@ mso:
   auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.aaf.auth.encrypted "value2" .Values.mso.auth )}}
   logPath: ./logs/openstack
   msb-ip: msb-iag
-  msb-port: 443
-  msb-scheme: https
+  msb-port: 80
+  msb-scheme: http
   workflow:
     endpoint: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/sobpmnengine
   msoKey: {{ .Values.mso.msoKey }}
index 9b70ddc..86e02d6 100755 (executable)
@@ -15,6 +15,9 @@
 # will be used as entry in DB to say SITE OFF/ON for healthcheck
 */}}
 server:
+    {{- if include "common.onServiceMesh" . }}
+    forward-headers-strategy: none
+    {{- end }}
     port: {{ index .Values.containerPort }}
     tomcat:
         max-threads: 50
index ffa66e9..29a1cf7 100755 (executable)
@@ -16,6 +16,9 @@
 aai:
   auth: {{.Values.aai.auth}}
 server:
+  {{- if include "common.onServiceMesh" . }}
+  forward-headers-strategy: none
+  {{- end }}
   port: {{ index .Values.containerPort }}
 spring:
   datasource:
@@ -66,7 +69,7 @@ mso:
     {{ if (include "common.needTLS" .) }}
     endpoint: https://aai.{{ include "common.namespace" . }}:8443
     {{ else }}
-    endpoint: http://aai.{{ include "common.namespace" . }}:8080
+    endpoint: http://aai.{{ include "common.namespace" . }}:80
     {{ end }}
   asdc-connections:
     asdc-controller1:
index 5c7a9af..119236b 100755 (executable)
@@ -14,6 +14,9 @@
 # limitations under the License.
 */}}
 server:
+    {{- if include "common.onServiceMesh" . }}
+    forward-headers-strategy: none
+    {{- end }}
     port: {{ index .Values.containerPort }}
 mso:
     msoKey: ${MSO_KEY}
index 8471540..1a96abf 100755 (executable)
@@ -15,6 +15,9 @@
 */}}
 
 server:
+  {{- if include "common.onServiceMesh" . }}
+  forward-headers-strategy: none
+  {{- end }}
   port: {{ include "common.getPort" (dict "global" . "name" "http") }}
 
 vevnfmadapter:
@@ -28,7 +31,7 @@ aai:
   {{ if (include "common.needTLS" .) }}
   endpoint: https://aai.{{ include "common.namespace" . }}:8443
   {{ else }}
-  endpoint: http://aai.{{ include "common.namespace" . }}:8080
+  endpoint: http://aai.{{ include "common.namespace" . }}:80
   {{ end }}
 
 dmaap:
index 6933607..48b75c7 100755 (executable)
@@ -2,7 +2,7 @@ aai:
   {{ if (include "common.needTLS" .) }}
   endpoint: https://aai.{{ include "common.namespace" . }}:8443
   {{ else }}
-  endpoint: http://aai.{{ include "common.namespace" . }}:8080
+  endpoint: http://aai.{{ include "common.namespace" . }}:80
   {{ end }}
   auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.mso.aai.auth )}}
 server:
@@ -62,7 +62,7 @@ mso:
     {{ if (include "common.needTLS" .) }}
     endpoint: https://aai.{{ include "common.namespace" . }}:8443
     {{ else }}
-    endpoint: http://aai.{{ include "common.namespace" . }}:8080
+    endpoint: http://aai.{{ include "common.namespace" . }}:80
     {{ end }}
     auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.mso.aai.auth )}}
 
index 553de8c..911c34d 100755 (executable)
@@ -280,7 +280,7 @@ mariadb-galera:
 ingress:
   enabled: false
   service:
-    - baseaddr: 'so.api'
+    - baseaddr: 'so-api'
       name: 'so'
       port: 8080
   config:
index edeef7a..8b98ae6 100644 (file)
@@ -103,7 +103,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: uuiserver
+    - baseaddr: uui-server-api
       name: "uui-server"
       port: 8082
   config:
index 10d9a25..d265b6e 100644 (file)
@@ -97,7 +97,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "uui.api"
+    - baseaddr: "uui-ui"
       name: "uui"
       port: 8443
   config:
index aba010e..f2ca814 100644 (file)
@@ -170,9 +170,10 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "vid.api"
+    - baseaddr: "vid-ui"
       name: "vid-http"
       port: 8443
+      plain_port: 8080
   config:
     ssl: "redirect"
 
index 0fbee4c..a19f15d 100644 (file)
@@ -140,7 +140,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "refrepo"
+    - baseaddr: "vnfsdk-refrepo-api"
       name: "refrepo"
       port: 8703
   config: