From 0e96b9e7209c06f6e3ce090a737f0c504f5a0948 Mon Sep 17 00:00:00 2001 From: elinuxhenrik Date: Wed, 23 Jun 2021 23:58:56 +0200 Subject: [PATCH] Step versions on master after release R-App Catalogue has not been stepped since it has not been modified since its first release, so the version number is correct. ALso remove docker-compose files for the Control Panel that have been moved to the Control Panel repo. Issue-ID: NONRTRIC-547 Signed-off-by: elinuxhenrik Change-Id: I887a26b424e8b714943bea9573f06953ddf697a7 --- docker-compose/a1-sim/docker-compose.yaml | 6 +-- docker-compose/control-panel/config/nginx.conf | 27 ----------- docker-compose/control-panel/docker-compose.yaml | 33 -------------- docker-compose/ecs/docker-compose.yaml | 2 +- .../config/application-nonrtricgateway.yaml | 52 ---------------------- .../nonrtric-gateway/docker-compose.yaml | 34 -------------- docker-compose/policy-service/docker-compose.yaml | 2 +- enrichment-coordinator-service/pom.xml | 2 +- helm-manager/pom.xml | 2 +- policy-agent/pom.xml | 2 +- 10 files changed, 8 insertions(+), 154 deletions(-) delete mode 100644 docker-compose/control-panel/config/nginx.conf delete mode 100644 docker-compose/control-panel/docker-compose.yaml delete mode 100644 docker-compose/nonrtric-gateway/config/application-nonrtricgateway.yaml delete mode 100644 docker-compose/nonrtric-gateway/docker-compose.yaml diff --git a/docker-compose/a1-sim/docker-compose.yaml b/docker-compose/a1-sim/docker-compose.yaml index ddd9c181..64ac983f 100644 --- a/docker-compose/a1-sim/docker-compose.yaml +++ b/docker-compose/a1-sim/docker-compose.yaml @@ -22,7 +22,7 @@ networks: services: a1-sim-OSC: - image: nexus3.o-ran-sc.org:10004/o-ran-sc/a1-simulator:2.1.0 + image: nexus3.o-ran-sc.org:10004/o-ran-sc/a1-simulator:2.2.0 container_name: a1-sim-OSC networks: - default @@ -35,7 +35,7 @@ services: - ALLOW_HTTP=true a1-sim-STD: - image: nexus3.o-ran-sc.org:10004/o-ran-sc/a1-simulator:2.1.0 + image: nexus3.o-ran-sc.org:10004/o-ran-sc/a1-simulator:2.2.0 container_name: a1-sim-STD networks: - default @@ -48,7 +48,7 @@ services: - ALLOW_HTTP=true a1-sim-STD-v2: - image: nexus3.o-ran-sc.org:10004/o-ran-sc/a1-simulator:2.1.0 + image: nexus3.o-ran-sc.org:10004/o-ran-sc/a1-simulator:2.2.0 container_name: a1-sim-STD-v2 networks: - default diff --git a/docker-compose/control-panel/config/nginx.conf b/docker-compose/control-panel/config/nginx.conf deleted file mode 100644 index 3416fd4e..00000000 --- a/docker-compose/control-panel/config/nginx.conf +++ /dev/null @@ -1,27 +0,0 @@ -events{} - -http { - include /etc/nginx/mime.types; - resolver 127.0.0.11; - server { - listen 8080; - server_name localhost; - root /usr/share/nginx/html; - index index.html; - location /a1-policy/ { - set $upstream nonrtric-gateway; - proxy_pass http://$upstream:9090; - } - location /data-producer/{ - set $upstream nonrtric-gateway; - proxy_pass http://$upstream:9090; - } - location /data-consumer/{ - set $upstream nonrtric-gateway; - proxy_pass http://$upstream:9090; - } - location / { - try_files $uri $uri/ /index.html; - } - } -} diff --git a/docker-compose/control-panel/docker-compose.yaml b/docker-compose/control-panel/docker-compose.yaml deleted file mode 100644 index bc56c3db..00000000 --- a/docker-compose/control-panel/docker-compose.yaml +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (C) 2020 Nordix Foundation. All rights reserved. -# ======================================================================== -# 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. -# ============LICENSE_END================================================= -# -version: '3.5' - -networks: - default: - driver: bridge - name: nonrtric-docker-net - -services: - policy-control-panel: - image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-controlpanel:2.2.0 - container_name: policy-control-panel - networks: - - default - ports: - - 8080:8080 - - 8082:8082 - volumes: - - ./control-panel/config/nginx.conf:/etc/nginx/nginx.conf:ro diff --git a/docker-compose/ecs/docker-compose.yaml b/docker-compose/ecs/docker-compose.yaml index d33f3290..354b3bc2 100644 --- a/docker-compose/ecs/docker-compose.yaml +++ b/docker-compose/ecs/docker-compose.yaml @@ -22,7 +22,7 @@ networks: services: ecs: - image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-enrichment-coordinator-service:1.1.0 + image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-enrichment-coordinator-service:1.2.0 container_name: ecs networks: default: diff --git a/docker-compose/nonrtric-gateway/config/application-nonrtricgateway.yaml b/docker-compose/nonrtric-gateway/config/application-nonrtricgateway.yaml deleted file mode 100644 index cee5398d..00000000 --- a/docker-compose/nonrtric-gateway/config/application-nonrtricgateway.yaml +++ /dev/null @@ -1,52 +0,0 @@ -################################################################################ -# Copyright (c) 2021 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. # -################################################################################ - -server: - port: 9090 -spring: - cloud: - gateway: - httpclient: - ssl: - useInsecureTrustManager: true - wiretap: true - httpserver: - wiretap: true - routes: - - id: A1-Policy - uri: https://policy-agent:8433 - predicates: - - Path=/a1-policy/** - - id: A1-EI - uri: https://ecs:8434 - predicates: - - Path=/data-producer/**,/data-consumer/** -management: - endpoint: - gateway: - enabled: true - endpoints: - web: - exposure: - include: "gateway,loggers,logfile,health,info,metrics,threaddump,heapdump" -logging: - level: - ROOT: ERROR - org.springframework: ERROR - org.springframework.cloud.gateway: INFO - reactor.netty: INFO - file: - name: /var/log/nonrtric-gateway/application.log diff --git a/docker-compose/nonrtric-gateway/docker-compose.yaml b/docker-compose/nonrtric-gateway/docker-compose.yaml deleted file mode 100644 index f2bcdce2..00000000 --- a/docker-compose/nonrtric-gateway/docker-compose.yaml +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright (C) 2021 Nordix Foundation. All rights reserved. -# ======================================================================== -# 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. -# ============LICENSE_END================================================= -# -version: '3.5' - -networks: - default: - driver: bridge - name: nonrtric-docker-net - -services: - nonrtric-gateway: - image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-gateway:1.0.0 - container_name: nonrtric-gateway - networks: - default: - aliases: - - nonrtric-gateway-container - ports: - - 9090:9090 - volumes: - - ./nonrtric-gateway/config/application-nonrtricgateway.yaml:/opt/app/nonrtric-gateway/config/application.yaml:ro diff --git a/docker-compose/policy-service/docker-compose.yaml b/docker-compose/policy-service/docker-compose.yaml index d755f211..a593e2e8 100644 --- a/docker-compose/policy-service/docker-compose.yaml +++ b/docker-compose/policy-service/docker-compose.yaml @@ -22,7 +22,7 @@ networks: services: policy-agent: - image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-policy-agent:2.2.0 + image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-policy-agent:2.3.0 container_name: policy-agent networks: default: diff --git a/enrichment-coordinator-service/pom.xml b/enrichment-coordinator-service/pom.xml index 8d97767e..ff88b520 100644 --- a/enrichment-coordinator-service/pom.xml +++ b/enrichment-coordinator-service/pom.xml @@ -31,7 +31,7 @@ org.o-ran-sc.nonrtric enrichment-coordinator-service - 1.1.0-SNAPSHOT + 1.2.0-SNAPSHOT The Apache Software License, Version 2.0 diff --git a/helm-manager/pom.xml b/helm-manager/pom.xml index 4a660ce7..7ca62919 100644 --- a/helm-manager/pom.xml +++ b/helm-manager/pom.xml @@ -32,7 +32,7 @@ org.o-ran-sc.nonrtric helm-manager - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT The Apache Software License, Version 2.0 diff --git a/policy-agent/pom.xml b/policy-agent/pom.xml index 36559e93..48827ff7 100644 --- a/policy-agent/pom.xml +++ b/policy-agent/pom.xml @@ -31,7 +31,7 @@ org.o-ran-sc.nonrtric policy-agent - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT The Apache Software License, Version 2.0 -- 2.16.6