diff options
14 files changed, 105 insertions, 48 deletions
diff --git a/kubernetes/common/nginx/README.md b/kubernetes/common/nginx/README.md index afe71051ce..0043b875be 100644 --- a/kubernetes/common/nginx/README.md +++ b/kubernetes/common/nginx/README.md @@ -336,7 +336,7 @@ For annotations, please see [this document](https://github.com/kubernetes/ingres | Name | Description | Value | | --------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------- | ------------------------ | -| `service.type` | Service type | `LoadBalancer` | +| `service.type` | Service type | `ClusterIP` | | `service.ports.http` | Service HTTP port | `80` | | `service.ports.https` | Service HTTPS port | `443` | | `service.nodePorts` | Specify the nodePort(s) value(s) for the LoadBalancer and NodePort service types. | `{}` | @@ -554,4 +554,4 @@ 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.
\ No newline at end of file +limitations under the License. diff --git a/kubernetes/common/nginx/values.yaml b/kubernetes/common/nginx/values.yaml index d794acb936..bb26ecebf2 100644 --- a/kubernetes/common/nginx/values.yaml +++ b/kubernetes/common/nginx/values.yaml @@ -636,7 +636,7 @@ staticSitePVC: "" service: ## @param service.type Service type ## - type: LoadBalancer + type: ClusterIP ## @param service.ports.http Service HTTP port ## @param service.ports.https Service HTTPS port ## diff --git a/kubernetes/uui/components/uui-intent-analysis/resources/entrypoint/run.sh b/kubernetes/uui/components/uui-intent-analysis/resources/entrypoint/run.sh index cf68e7c96a..0107a73805 100644 --- a/kubernetes/uui/components/uui-intent-analysis/resources/entrypoint/run.sh +++ b/kubernetes/uui/components/uui-intent-analysis/resources/entrypoint/run.sh @@ -20,7 +20,7 @@ main_path="/home/uui" echo @main_path@ $main_path JAVA_PATH="$JAVA_HOME/bin/java" -JAVA_OPTS="-Xms50m -Xmx128m" +JAVA_OPTS="-XX:MaxRAMPercentage=${MAX_RAM_PERCENTAGE:-70}" echo @JAVA_PATH@ $JAVA_PATH echo @JAVA_OPTS@ $JAVA_OPTS diff --git a/kubernetes/uui/components/uui-intent-analysis/templates/deployment.yaml b/kubernetes/uui/components/uui-intent-analysis/templates/deployment.yaml index d2824d1bbb..890bc5e033 100644 --- a/kubernetes/uui/components/uui-intent-analysis/templates/deployment.yaml +++ b/kubernetes/uui/components/uui-intent-analysis/templates/deployment.yaml @@ -19,6 +19,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-intent-analysis/values.yaml b/kubernetes/uui/components/uui-intent-analysis/values.yaml index 991c42a927..53c1aa036d 100644 --- a/kubernetes/uui/components/uui-intent-analysis/values.yaml +++ b/kubernetes/uui/components/uui-intent-analysis/values.yaml @@ -49,6 +49,7 @@ flavor: small replicaCount: 1 nodeSelector: {} affinity: {} +revisionHistoryLimit: 1 service: type: ClusterIP diff --git a/kubernetes/uui/components/uui-llm-adaptation/resources/entrypoint/run.sh b/kubernetes/uui/components/uui-llm-adaptation/resources/entrypoint/run.sh index f1dcefa168..7786624d53 100644 --- a/kubernetes/uui/components/uui-llm-adaptation/resources/entrypoint/run.sh +++ b/kubernetes/uui/components/uui-llm-adaptation/resources/entrypoint/run.sh @@ -20,7 +20,7 @@ main_path="/home/uui" echo @main_path@ $main_path JAVA_PATH="$JAVA_HOME/bin/java" -JAVA_OPTS="-Xms50m -Xmx128m" +JAVA_OPTS="-XX:MaxRAMPercentage=${MAX_RAM_PERCENTAGE:-70}" echo @JAVA_PATH@ $JAVA_PATH echo @JAVA_OPTS@ $JAVA_OPTS diff --git a/kubernetes/uui/components/uui-llm-adaptation/templates/deployment.yaml b/kubernetes/uui/components/uui-llm-adaptation/templates/deployment.yaml index d2824d1bbb..890bc5e033 100644 --- a/kubernetes/uui/components/uui-llm-adaptation/templates/deployment.yaml +++ b/kubernetes/uui/components/uui-llm-adaptation/templates/deployment.yaml @@ -19,6 +19,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-llm-adaptation/values.yaml b/kubernetes/uui/components/uui-llm-adaptation/values.yaml index 27068ac930..9ee1f3043e 100644 --- a/kubernetes/uui/components/uui-llm-adaptation/values.yaml +++ b/kubernetes/uui/components/uui-llm-adaptation/values.yaml @@ -49,6 +49,7 @@ flavor: small replicaCount: 1 nodeSelector: {} affinity: {} +revisionHistoryLimit: 1 service: type: ClusterIP diff --git a/kubernetes/uui/components/uui-nlp/templates/deployment.yaml b/kubernetes/uui/components/uui-nlp/templates/deployment.yaml index 8ef27920b6..f8537bd325 100644 --- a/kubernetes/uui/components/uui-nlp/templates/deployment.yaml +++ b/kubernetes/uui/components/uui-nlp/templates/deployment.yaml @@ -22,6 +22,7 @@ kind: Deployment metadata: {{- include "common.resourceMetadata" . | nindent 2 }} spec: replicas: 1 + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} selector: {{- include "common.selectors" . | nindent 4 }} template: metadata: {{- include "common.templateMetadata" . | nindent 6 }} diff --git a/kubernetes/uui/components/uui-nlp/values.yaml b/kubernetes/uui/components/uui-nlp/values.yaml index cdfa50e3c0..abf1d7f227 100644 --- a/kubernetes/uui/components/uui-nlp/values.yaml +++ b/kubernetes/uui/components/uui-nlp/values.yaml @@ -43,6 +43,7 @@ service: - name: http-upload port: *upload_port +revisionHistoryLimit: 1 liveness: initialDelaySeconds: 300 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 diff --git a/kubernetes/uui/values.yaml b/kubernetes/uui/values.yaml index c9a0331350..8f7c6cd3cb 100644 --- a/kubernetes/uui/values.yaml +++ b/kubernetes/uui/values.yaml @@ -17,7 +17,10 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. global: - nodePortPrefix: 302 + tracing: + enabled: false + collectorHost: jaeger-collector.istio-system + collectorPort: 9411 subChartsOnly: enabled: true @@ -25,7 +28,7 @@ subChartsOnly: flavor: small # application image -image: onap/usecase-ui:15.0.0 +image: onap/usecase-ui:15.0.1 pullPolicy: Always # application configuration @@ -56,28 +59,11 @@ readiness: periodSeconds: 10 service: - type: NodePort + type: ClusterIP name: uui - internalPort: 8080 - nodePortPrefixOverride: 303 ports: - name: http port: 8080 - nodePort: '98' - annotations: - msb.onap.org/service-info: | - {{ if .Values.global.msbEnabled -}}[ - { - "serviceName": "usecaseui-ui", - "version": "v1", - "url": "/usecase-ui", - "path":"/iui/usecaseui", - "protocol": "UI", - "visualRange":"1", - "port": "{{ include "common.getPort" (dict "global" . "name" "http" "getPlain" true) }}", - "enable_ssl": false - } - ]{{ end }} ingress: enabled: true @@ -136,12 +122,28 @@ nginx: proxy_set_header X-Forwarded-Proto $scheme; } - # backend - location /api { + # uui-server + location /api/usecaseui-server { proxy_pass http://uui-server:8082; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; } + # intent-service + location /api/usecaseui-intent-analysis { + proxy_pass http://uui-intent-analysis:8083; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } + # llm-service + location /api/usecaseui-llm-adaptation { + proxy_pass http://uui-nlp:33011; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } } |