diff options
Diffstat (limited to 'kubernetes/uui/components/uui-server')
3 files changed, 70 insertions, 21 deletions
diff --git a/kubernetes/uui/components/uui-server/resources/config/application.properties b/kubernetes/uui/components/uui-server/resources/config/application.properties index 67b0ff08c9..3b966f902b 100644 --- a/kubernetes/uui/components/uui-server/resources/config/application.properties +++ b/kubernetes/uui/components/uui-server/resources/config/application.properties @@ -47,3 +47,28 @@ logging.level.*=INFO #enable shutdown endpoints.shutdown.enabled=true endpoints.shutdown.sensitive=false + +intents.scheduledTask.enabled=false + +management.endpoints.web.exposure.include=* +management.tracing.enabled={{ default .Values.global.tracing.enabled .Values.tracing.enabled }} +management.tracing.sampling.probability={{ default .Values.global.tracing.sampling.probability .Values.tracing.collector.baseUrl }} +management.zipkin.tracing.endpoint={{ default .Values.global.tracing.collector.baseUrl .Values.tracing.collector.baseUrl }}/api/v2/spans + +uui-server.client.aai.baseUrl={{ .Values.uuiServer.client.aai.baseUrl }} +uui-server.client.aai.username={{ .Values.uuiServer.client.aai.username }} +uui-server.client.aai.password={{ .Values.uuiServer.client.aai.password }} +uui-server.client.so.baseUrl={{ .Values.uuiServer.client.so.baseUrl }} +uui-server.client.so.username={{ .Values.uuiServer.client.so.username }} +uui-server.client.so.password={{ .Values.uuiServer.client.so.password }} +uui-server.client.sdc.baseUrl={{ .Values.uuiServer.client.sdc.baseUrl }} +uui-server.client.sdc.username={{ .Values.uuiServer.client.sdc.username }} +uui-server.client.sdc.password={{ .Values.uuiServer.client.sdc.password }} +uui-server.slicing.service-invariant-uuid={{ .Values.uuiServer.slicing.serviceInvariantUuid }} +uui-server.slicing.service-uuid={{ .Values.uuiServer.slicing.serviceUuid }} +uui-server.slicing.global-subscriber-id={{ .Values.uuiServer.slicing.globalSubscriberId }} +uui-server.slicing.service-type={{ .Values.uuiServer.slicing.serviceType }} +uui-server.ccvpn.globalCustomerId={{ .Values.uuiServer.ccvpn.globalCustomerId }} +uui-server.ccvpn.serviceType={{ .Values.uuiServer.ccvpn.serviceType }} +uui-server.ccvpn.subscriberName={{ .Values.uuiServer.ccvpn.subscriberName }} +uui-server.ccvpn.subscriberType={{ .Values.uuiServer.ccvpn.subscriberType }} diff --git a/kubernetes/uui/components/uui-server/templates/deployment.yaml b/kubernetes/uui/components/uui-server/templates/deployment.yaml index d19f180f4e..58d91a024a 100644 --- a/kubernetes/uui/components/uui-server/templates/deployment.yaml +++ b/kubernetes/uui/components/uui-server/templates/deployment.yaml @@ -21,6 +21,7 @@ metadata: {{- include "common.resourceMetadata" . | nindent 2 }} spec: selector: {{- include "common.selectors" . | nindent 4 }} replicas: {{ .Values.replicaCount }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} template: metadata: {{- include "common.templateMetadata" . | nindent 6 }} spec: diff --git a/kubernetes/uui/components/uui-server/values.yaml b/kubernetes/uui/components/uui-server/values.yaml index 28da40a7dd..3a9aee888a 100644 --- a/kubernetes/uui/components/uui-server/values.yaml +++ b/kubernetes/uui/components/uui-server/values.yaml @@ -20,7 +20,11 @@ # Global configuration defaults. ################################################################# global: - nodePortPrefix: 302 + tracing: + collector: + baseUrl: http://jaeger-collector.istio-system:9411 + sampling: + probability: 1.0 secrets: - uid: pg-root-pass @@ -48,8 +52,9 @@ flavor: small # application image repository: nexus3.onap.org:10001 -image: onap/usecase-ui-server:15.0.0 +image: onap/usecase-ui-server:15.0.2 pullPolicy: Always +revisionHistoryLimit: 1 # application configuration @@ -102,28 +107,11 @@ readiness: periodSeconds: 10 service: - type: NodePort + type: ClusterIP name: uui-server - internalPort: 8082 - nodePortPrefixOverride: 303 ports: - name: http port: 8082 - nodePort: '99' - annotations: - msb.onap.org/service-info: | - {{ if .Values.global.msbEnabled -}}[ - { - "serviceName": "usecaseui-server", - "version": "v1", - "url": "/api/usecase-server/v1", - "path":"/iui/usecaseui", - "protocol": "REST", - "visualRange":"1", - "port": "{{ include "common.getPort" (dict "global" . "name" "http" "getPlain" true) }}", - "enable_ssl": false - } - ]{{ end }} ingress: enabled: false @@ -132,6 +120,16 @@ ingress: name: "uui-server" port: 8082 +## +## Use this to override the global defaults +tracing: +# enabled: false + collector: {} +# baseUrl: http://jaeger-collector.istio-system:9411 + sampling: {} +# probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) + + # 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 @@ -148,7 +146,7 @@ resources: cpu: "1.5" memory: "2Gi" requests: - cpu: "1" + cpu: "300m" memory: "1Gi" large: limits: @@ -186,3 +184,28 @@ wait_for_job_container: # "helm.sh/hook": "pre-upgrade,pre-rollback,post-install" # "helm.sh/hook-delete-policy": "before-hook-creation" # "helm.sh/hook-weight": "1" + +uuiServer: + client: + aai: + baseUrl: http://aai.onap + username: AAI + password: AAI + so: + baseUrl: http://so.onap:8080 + username: InfraPortalClient + password: password1 + sdc: + baseUrl: http://sdc-be:8080 + username: aai + password: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U + slicing: + serviceInvariantUuid: defaultServiceInvariantUuid + serviceUuid: defaultServiceUuid + globalSubscriberId: defaultGlobalSubscriberId + serviceType: defaultServiceType + ccvpn: + globalCustomerId: defaultGlobalCustomerId + serviceType: defaultServiceType + subscriberName: defaultSubscriberName + subscriberType: defaultSubscriberType |