From e04b1210f1104c56f6a0a06996327f2643a55af0 Mon Sep 17 00:00:00 2001 From: Sean Condon Date: Fri, 9 Jul 2021 19:06:04 +0100 Subject: [PATCH] aether-roc-umbrella: releasing 1.2.24 (#671) --- aether-roc-umbrella/Chart.yaml | 8 ++-- .../templates/post-install-job-grafana.yaml | 3 +- .../templates/sdcore-test-dummy-config.yaml | 44 +++++++++++++++++++ aether-roc-umbrella/values.yaml | 40 +++-------------- 4 files changed, 56 insertions(+), 39 deletions(-) create mode 100644 aether-roc-umbrella/templates/sdcore-test-dummy-config.yaml diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml index 28d0727b..739ded6f 100644 --- a/aether-roc-umbrella/Chart.yaml +++ b/aether-roc-umbrella/Chart.yaml @@ -7,7 +7,7 @@ name: aether-roc-umbrella description: Aether ROC Umbrella chart to deploy all Aether ROC kubeVersion: ">=1.18.0" type: application -version: 1.2.23 +version: 1.2.24 appVersion: v0.0.0 keywords: - aether @@ -29,7 +29,7 @@ dependencies: - name: config-model-aether condition: onos-config.models.aether.v3.enabled repository: "@sdran" - version: 3.0.5 + version: 3.0.6 alias: config-model-aether-3-0-0 - name: onos-config condition: import.onos-config.enabled @@ -55,7 +55,7 @@ dependencies: - name: aether-roc-gui condition: import.aether-roc-gui.v3.enabled repository: "@sdran" - version: 3.0.5 + version: 3.0.6 alias: aether-roc-gui-v3 - name: sdcore-adapter condition: import.sdcore-adapter.v2_1.enabled @@ -65,7 +65,7 @@ dependencies: - name: sdcore-adapter condition: import.sdcore-adapter.v3.enabled repository: "@sdran" - version: 3.0.5 + version: 3.0.6 alias: sdcore-adapter-v3 - name: nginx alias: sdcore-test-dummy diff --git a/aether-roc-umbrella/templates/post-install-job-grafana.yaml b/aether-roc-umbrella/templates/post-install-job-grafana.yaml index e65c1c6e..bc2d0c87 100644 --- a/aether-roc-umbrella/templates/post-install-job-grafana.yaml +++ b/aether-roc-umbrella/templates/post-install-job-grafana.yaml @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: 2021-present Open Networking Foundation # # SPDX-License-Identifier: LicenseRef-ONF-Member-1.0 - +{{ if .Values.import.grafana.enabled }} apiVersion: batch/v1 kind: Job metadata: @@ -73,3 +73,4 @@ spec: configMap: name: {{ template "aether-roc-api.fullname" . }}-dashboards-acme + {{end}} \ No newline at end of file diff --git a/aether-roc-umbrella/templates/sdcore-test-dummy-config.yaml b/aether-roc-umbrella/templates/sdcore-test-dummy-config.yaml new file mode 100644 index 00000000..74196e65 --- /dev/null +++ b/aether-roc-umbrella/templates/sdcore-test-dummy-config.yaml @@ -0,0 +1,44 @@ +# SPDX-FileCopyrightText: 2020-present Open Networking Foundation +# +# SPDX-License-Identifier: LicenseRef-ONF-Member-1.0 + +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ .Release.Name }}-sdcore-test-dummy + namespace: {{ .Release.Namespace }} +data: + sdcore-test-dummy.conf: |- + log_format client '$remote_addr - $remote_user $request_time $upstream_response_time ' + '[$time_local] "$request" $status $body_bytes_sent $request_body "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + server { + listen 0.0.0.0:8080; + default_type application/json; + access_log /opt/bitnami/nginx/logs/access.log client; + + # You can provide a special subPath or the root + location = /v1/config { + root /; + proxy_pass http://127.0.0.1:8080/post_dummy; + } + location = /v1/config/policies { + root /; + proxy_pass http://127.0.0.1:8080/post_dummy; + } + location = /v1/config/imsis { + root /; + proxy_pass http://127.0.0.1:8080/post_dummy; + } + location /v1/config/5g { + rewrite ^/v1/config/5g/.* /v1/config/5g break; + proxy_pass http://127.0.0.1:8080/post_dummy; + } + location = /post_dummy { + # turn off logging here to avoid double logging + access_log off; + return 200; + } + error_page 405 =200 $uri; + } diff --git a/aether-roc-umbrella/values.yaml b/aether-roc-umbrella/values.yaml index f1f37201..132fcac9 100644 --- a/aether-roc-umbrella/values.yaml +++ b/aether-roc-umbrella/values.yaml @@ -124,6 +124,11 @@ grafana: domain: aether-roc-gui root_url: "%(protocol)s://%(domain)s:%(http_port)s/grafana/" serve_from_sub_path: true + auth.anonymous: + enabled: true + org_role: Viewer + # Hide the Grafana version text from the footer and help tooltip for unauthenticated users (default: false) + hide_version: true auth.generic_oauth: enabled: true client_id: aether-roc-gui @@ -157,40 +162,7 @@ prometheus: sdcore-test-dummy: service: type: ClusterIP - serverBlock: |- - log_format client '$remote_addr - $remote_user $request_time $upstream_response_time ' - '[$time_local] "$request" $status $body_bytes_sent $request_body "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - server { - listen 0.0.0.0:8080; - default_type application/json; - access_log /opt/bitnami/nginx/logs/access.log client; - - # You can provide a special subPath or the root - location = /v1/config { - root /; - proxy_pass http://127.0.0.1:8080/post_dummy; - } - location = /v1/config/policies { - root /; - proxy_pass http://127.0.0.1:8080/post_dummy; - } - location = /v1/config/imsis { - root /; - proxy_pass http://127.0.0.1:8080/post_dummy; - } - location /v1/config/5g { - rewrite ^/v1/config/5g/.* /v1/config/5g break; - proxy_pass http://127.0.0.1:8080/post_dummy; - } - location = /post_dummy { - # turn off logging here to avoid double logging - access_log off; - return 200; - } - error_page 405 =200 $uri; - } + existingServerBlockConfigmap: aether-roc-umbrella-sdcore-test-dummy # ONOS-CONFIG onos-config: