diff options
25 files changed, 57 insertions, 62 deletions
diff --git a/docs/oom_setup_ingress_controller.rst b/docs/oom_setup_ingress_controller.rst index 29dac92c95..e49c72a2e4 100644 --- a/docs/oom_setup_ingress_controller.rst +++ b/docs/oom_setup_ingress_controller.rst @@ -174,7 +174,6 @@ Ingress also can be enabled on any onap setup override using following code: --- <...> - #ingress virtualhost based configuration global: <...> ingress: diff --git a/kubernetes/common/common/templates/_ingress.tpl b/kubernetes/common/common/templates/_ingress.tpl index e57d4bedaa..18f9bb1ba5 100644 --- a/kubernetes/common/common/templates/_ingress.tpl +++ b/kubernetes/common/common/templates/_ingress.tpl @@ -1,42 +1,18 @@ -{{- define "ingress.config.host" -}} -{{- $dot := default . .dot -}} -{{- $baseaddr := (required "'baseaddr' param, set to the specific part of the fqdn, is required." .baseaddr) -}} -{{- $burl := (required "'baseurl' param, set to the generic part of the fqdn, is required." $dot.Values.global.ingress.virtualhost.baseurl) -}} -{{ printf "%s.%s" $baseaddr $burl }} -{{- end -}} - {{- define "ingress.config.port" -}} {{- $dot := default . .dot -}} -{{- if .Values.ingress -}} -{{- if .Values.global.ingress -}} -{{- if or (not .Values.global.ingress.virtualhost) (not .Values.global.ingress.virtualhost.enabled) -}} - - http: - paths: -{{- range .Values.ingress.service }} -{{ $baseaddr := required "baseaddr" .baseaddr }} - - path: {{ include "ingress.config.host" (dict "dot" $dot "baseaddr" $baseaddr) }} - backend: - serviceName: {{ .name }} - servicePort: {{ .port }} -{{- end -}} -{{- else if .Values.ingress.service -}} +{{- $burl := (required "'baseurl' param, set to the generic part of the fqdn, is required." $dot.Values.global.ingress.virtualhost.baseurl) -}} {{ range .Values.ingress.service }} -{{ $baseaddr := required "baseaddr" .baseaddr }} - - host: {{ include "ingress.config.host" (dict "dot" $dot "baseaddr" $baseaddr) }} +{{- $baseaddr := (required "'baseaddr' param, set to the specific part of the fqdn, is required." .baseaddr) }} + - host: {{ printf "%s.%s" $baseaddr $burl }} http: paths: - backend: serviceName: {{ .name }} servicePort: {{ .port }} -{{- end -}} -{{- else -}} - - path: {{ printf "/%s" .Chart.Name }} - backend: - serviceName: {{ .Chart.Name }} - servicePort: {{ .Values.service.externalPort }} -{{- end -}} -{{- end -}} -{{- end -}} + {{- if .path }} + path: {{ .path }} + {{- end }} +{{- end }} {{- end -}} diff --git a/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml index 1e381d5ff8..0b103212be 100644 --- a/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml +++ b/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml @@ -120,7 +120,7 @@ componentImages: ves: onap/org.onap.dcaegen2.collectors.ves.vescollector:1.7.9 snmptrap: onap/org.onap.dcaegen2.collectors.snmptrap:1.4.0 prh: onap/org.onap.dcaegen2.services.prh.prh-app-server:1.5.4 - hv_ves: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:1.5.0 + hv_ves: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:1.5.1 # Resource Limit flavor -By Default using small flavor: small diff --git a/kubernetes/dcaemod/components/dcaemod-designtool/values.yaml b/kubernetes/dcaemod/components/dcaemod-designtool/values.yaml index 5be8cacefd..f2128d2457 100644 --- a/kubernetes/dcaemod/components/dcaemod-designtool/values.yaml +++ b/kubernetes/dcaemod/components/dcaemod-designtool/values.yaml @@ -25,9 +25,8 @@ global: readinessImage: onap/oom/readiness:3.0.1 ingress: - enabled: true virtualhost: - enabled: false + baseurl: "simpledemo.onap.org" config: nifiJarsIndexURL: http://dcaemod-genprocessor:8080/nifi-jars @@ -47,11 +46,14 @@ service: ingress: enabled: true + enabledOverride: true service: - - baseaddr: "nifi" + - baseaddr: "dcaemod" + path: "/nifi" name: "dcaemod-designtool" port: 8080 - - baseaddr: "nifi-api" + - baseaddr: "dcaemod" + path: "/nifi-api" name: "dcaemod-designtool" port: 8080 config: diff --git a/kubernetes/dcaemod/components/dcaemod-distributor-api/values.yaml b/kubernetes/dcaemod/components/dcaemod-distributor-api/values.yaml index c717ca3309..f08ef82c31 100644 --- a/kubernetes/dcaemod/components/dcaemod-distributor-api/values.yaml +++ b/kubernetes/dcaemod/components/dcaemod-distributor-api/values.yaml @@ -25,9 +25,8 @@ global: readinessImage: onap/oom/readiness:3.0.1 ingress: - enabled: true virtualhost: - enabled: false + baseurl: "simpledemo.onap.org" config: nifiRegistryURL: http://dcaemod-nifi-registry:18080/nifi-registry-api @@ -46,8 +45,10 @@ service: ingress: enabled: true + enabledOverride: true service: - - baseaddr: "distributor" + - baseaddr: "dcaemod" + path: "/distributor" name: dcaemod-distributor-api port: 8080 config: diff --git a/kubernetes/dcaemod/components/dcaemod-genprocessor/values.yaml b/kubernetes/dcaemod/components/dcaemod-genprocessor/values.yaml index 92633acf97..9bfcc83d58 100644 --- a/kubernetes/dcaemod/components/dcaemod-genprocessor/values.yaml +++ b/kubernetes/dcaemod/components/dcaemod-genprocessor/values.yaml @@ -24,9 +24,8 @@ global: nodePortPrefixExt: 304 readinessImage: onap/oom/readiness:3.0.1 ingress: - enabled: true virtualhost: - enabled: false + baseurl: "simpledemo.onap.org" config: onboardingAPIURL: http://dcaemod-onboarding-api:8080/onboarding @@ -45,8 +44,10 @@ service: ingress: enabled: true + enabledOverride: true service: - - baseaddr: "nifi-jars" + - baseaddr: "dcaemod" + path: "/nifi-jars" name: dcaemod-genprocessor port: 8080 config: diff --git a/kubernetes/dcaemod/components/dcaemod-onboarding-api/values.yaml b/kubernetes/dcaemod/components/dcaemod-onboarding-api/values.yaml index 161b3621a0..3c460ca9a0 100644 --- a/kubernetes/dcaemod/components/dcaemod-onboarding-api/values.yaml +++ b/kubernetes/dcaemod/components/dcaemod-onboarding-api/values.yaml @@ -23,9 +23,9 @@ global: nodePortPrefixExt: 304 readinessImage: onap/oom/readiness:3.0.1 ingress: - enabled: true virtualhost: - enabled: false + baseurl: "simpledemo.onap.org" + ################################################################# # Secrets metaconfig ################################################################# @@ -49,8 +49,10 @@ service: port: 8080 ingress: enabled: true + enabledOverride: true service: - - baseaddr: "onboarding" + - baseaddr: "dcaemod" + path: "/onboarding" name: dcaemod-onboarding-api port: 8080 config: diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml index 54f886d3aa..11068bae37 100755 --- a/kubernetes/onap/values.yaml +++ b/kubernetes/onap/values.yaml @@ -106,7 +106,6 @@ global: ingress: enabled: false virtualhost: - enabled: true baseurl: "simpledemo.onap.org" # Global Service Mesh configuration diff --git a/kubernetes/sdnc/resources/config/conf/org.opendaylight.aaa.filterchain.cfg b/kubernetes/sdnc/resources/config/conf/org.opendaylight.aaa.filterchain.cfg new file mode 100755 index 0000000000..cffc526fb6 --- /dev/null +++ b/kubernetes/sdnc/resources/config/conf/org.opendaylight.aaa.filterchain.cfg @@ -0,0 +1 @@ +customFilterList=org.onap.ccsdk.sli.core.filters.ControllerAuditLogFilter,org.onap.ccsdk.sli.core.filters.ControllerPayloadLoggingFilter diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml index 98ad43ed60..1f0a31ac7b 100644 --- a/kubernetes/sdnc/templates/statefulset.yaml +++ b/kubernetes/sdnc/templates/statefulset.yaml @@ -267,6 +267,9 @@ spec: - mountPath: {{ .Values.config.odl.etcDir }}/org.opendaylight.controller.cluster.datastore.cfg name: properties subPath: org.opendaylight.controller.cluster.datastore.cfg + - mountPath: {{ .Values.config.odl.etcDir }}/org.opendaylight.aaa.filterchain.cfg + name: properties + subPath: org.opendaylight.aaa.filterchain.cfg - mountPath: {{ .Values.config.odl.binDir }}/setenv name: properties subPath: setenv diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml index f710deb4c0..f821e9afbc 100644 --- a/kubernetes/sdnc/values.yaml +++ b/kubernetes/sdnc/values.yaml @@ -193,7 +193,7 @@ config: binDir: /opt/opendaylight/bin gcLogDir: /opt/opendaylight/data/log salConfigDir: /opt/opendaylight/system/org/opendaylight/controller/sal-clustering-config - salConfigVersion: 1.9.1 + salConfigVersion: 1.10.4 akka: seedNodeTimeout: 15s circuitBreaker: diff --git a/kubernetes/so/components/so-bpmn-infra/values.yaml b/kubernetes/so/components/so-bpmn-infra/values.yaml index 2bb7d7b44c..d234e6007c 100755 --- a/kubernetes/so/components/so-bpmn-infra/values.yaml +++ b/kubernetes/so/components/so-bpmn-infra/values.yaml @@ -67,7 +67,7 @@ secrets: # Application configuration defaults. ################################################################# repository: nexus3.onap.org:10001 -image: onap/so/bpmn-infra:1.7.10 +image: onap/so/bpmn-infra:1.7.11 pullPolicy: Always db: diff --git a/kubernetes/so/components/so-catalog-db-adapter/values.yaml b/kubernetes/so/components/so-catalog-db-adapter/values.yaml index b27566d336..319d45bdea 100755 --- a/kubernetes/so/components/so-catalog-db-adapter/values.yaml +++ b/kubernetes/so/components/so-catalog-db-adapter/values.yaml @@ -66,7 +66,8 @@ secrets: # Application configuration defaults. ################################################################# repository: nexus3.onap.org:10001 -image: onap/so/catalog-db-adapter:1.7.10 +image: onap/so/catalog-db-adapter:1.7.11 + pullPolicy: Always db: diff --git a/kubernetes/so/components/so-cnf-adapter/values.yaml b/kubernetes/so/components/so-cnf-adapter/values.yaml index 7cfa75a152..31c493598f 100755 --- a/kubernetes/so/components/so-cnf-adapter/values.yaml +++ b/kubernetes/so/components/so-cnf-adapter/values.yaml @@ -76,7 +76,8 @@ secrets: ################################################################# # Application configuration defaults. ################################################################# -image: onap/so/mso-cnf-adapter:1.7.1 +repository: nexus3.onap.org:10001 +image: onap/so/mso-cnf-adapter:1.7.11 pullPolicy: Always db: userName: so_user diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml index 0612f506c5..cc8d15b48c 100644 --- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml +++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml @@ -60,7 +60,8 @@ secrets: # Application configuration defaults. ################################################################# repository: nexus3.onap.org:10001 -image: onap/so/so-etsi-nfvo-ns-lcm:1.7.7 +image: onap/so/so-etsi-nfvo-ns-lcm:1.7.11 + pullPolicy: Always aai: diff --git a/kubernetes/so/components/so-monitoring/values.yaml b/kubernetes/so/components/so-monitoring/values.yaml index 31ad9d072c..a4bf6c370b 100644 --- a/kubernetes/so/components/so-monitoring/values.yaml +++ b/kubernetes/so/components/so-monitoring/values.yaml @@ -71,7 +71,7 @@ secrets: # Application configuration defaults. ################################################################# repository: nexus3.onap.org:10001 -image: onap/so/so-monitoring:1.7.7 +image: onap/so/so-monitoring:1.7.11 pullPolicy: Always db: diff --git a/kubernetes/so/components/so-nssmf-adapter/values.yaml b/kubernetes/so/components/so-nssmf-adapter/values.yaml index 40a55c6c0b..5b629e8d9c 100755 --- a/kubernetes/so/components/so-nssmf-adapter/values.yaml +++ b/kubernetes/so/components/so-nssmf-adapter/values.yaml @@ -79,7 +79,8 @@ secrets: # Application configuration defaults. ################################################################# repository: nexus3.onap.org:10001 -image: onap/so/nssmf-adapter:1.7.10 +image: onap/so/nssmf-adapter:1.7.11 + pullPolicy: Always db: diff --git a/kubernetes/so/components/so-oof-adapter/values.yaml b/kubernetes/so/components/so-oof-adapter/values.yaml index 6bddf29032..2641201bb0 100755 --- a/kubernetes/so/components/so-oof-adapter/values.yaml +++ b/kubernetes/so/components/so-oof-adapter/values.yaml @@ -76,8 +76,10 @@ secrets: ################################################################# # Application configuration defaults. ################################################################# + repository: nexus3.onap.org:10001 -image: onap/so/so-oof-adapter:1.7.4 +image: onap/so/so-oof-adapter:1.7.11 + pullPolicy: Always mso: diff --git a/kubernetes/so/components/so-openstack-adapter/values.yaml b/kubernetes/so/components/so-openstack-adapter/values.yaml index 129ad59385..d41904b288 100755 --- a/kubernetes/so/components/so-openstack-adapter/values.yaml +++ b/kubernetes/so/components/so-openstack-adapter/values.yaml @@ -61,7 +61,7 @@ secrets: ################################################################# # Application configuration defaults. ################################################################# -image: onap/so/openstack-adapter:1.7.10 +image: onap/so/openstack-adapter:1.7.11 pullPolicy: Always repository: nexus3.onap.org:10001 diff --git a/kubernetes/so/components/so-request-db-adapter/values.yaml b/kubernetes/so/components/so-request-db-adapter/values.yaml index e221870306..8cffdb1ebc 100755 --- a/kubernetes/so/components/so-request-db-adapter/values.yaml +++ b/kubernetes/so/components/so-request-db-adapter/values.yaml @@ -62,7 +62,8 @@ secrets: # Application configuration defaults. ################################################################# repository: nexus3.onap.org:10001 -image: onap/so/request-db-adapter:1.7.10 +image: onap/so/request-db-adapter:1.7.11 + pullPolicy: Always db: diff --git a/kubernetes/so/components/so-sdc-controller/values.yaml b/kubernetes/so/components/so-sdc-controller/values.yaml index be3be26bc3..865db79f43 100755 --- a/kubernetes/so/components/so-sdc-controller/values.yaml +++ b/kubernetes/so/components/so-sdc-controller/values.yaml @@ -62,7 +62,8 @@ secrets: # Application configuration defaults. ################################################################# repository: nexus3.onap.org:10001 -image: onap/so/sdc-controller:1.7.10 +image: onap/so/sdc-controller:1.7.11 + pullPolicy: Always db: diff --git a/kubernetes/so/components/so-sdnc-adapter/values.yaml b/kubernetes/so/components/so-sdnc-adapter/values.yaml index cabd60e011..d545fd3172 100755 --- a/kubernetes/so/components/so-sdnc-adapter/values.yaml +++ b/kubernetes/so/components/so-sdnc-adapter/values.yaml @@ -61,7 +61,7 @@ secrets: # Application configuration defaults. ################################################################# repository: nexus3.onap.org:10001 -image: onap/so/sdnc-adapter:1.7.10 +image: onap/so/sdnc-adapter:1.7.11 pullPolicy: Always org: diff --git a/kubernetes/so/components/so-vfc-adapter/values.yaml b/kubernetes/so/components/so-vfc-adapter/values.yaml index f88e117fae..50860777a3 100755 --- a/kubernetes/so/components/so-vfc-adapter/values.yaml +++ b/kubernetes/so/components/so-vfc-adapter/values.yaml @@ -61,7 +61,8 @@ secrets: # Application configuration defaults. ################################################################# repository: nexus3.onap.org:10001 -image: onap/so/vfc-adapter:1.7.10 +image: onap/so/vfc-adapter:1.7.11 + pullPolicy: Always db: diff --git a/kubernetes/so/components/so-vnfm-adapter/values.yaml b/kubernetes/so/components/so-vnfm-adapter/values.yaml index f8fa7c93be..ef41c44a44 100755 --- a/kubernetes/so/components/so-vnfm-adapter/values.yaml +++ b/kubernetes/so/components/so-vnfm-adapter/values.yaml @@ -33,7 +33,8 @@ global: # Application configuration defaults. ################################################################# repository: nexus3.onap.org:10001 -image: onap/so/vnfm-adapter:1.7.10 +image: onap/so/vnfm-adapter:1.7.11 + pullPolicy: Always aaf: diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml index a51f21a921..bf540da995 100755 --- a/kubernetes/so/values.yaml +++ b/kubernetes/so/values.yaml @@ -174,8 +174,9 @@ dbCreds: userName: so_user adminName: so_admin + repository: nexus3.onap.org:10001 -image: onap/so/api-handler-infra:1.7.10 +image: onap/so/api-handler-infra:1.7.11 server: aaf: |