From 54872c9d73ec5dc31dd0ba915cd1e0beb13a3096 Mon Sep 17 00:00:00 2001 From: DenisGNoonan Date: Tue, 5 Sep 2023 11:55:40 +0100 Subject: [PATCH] NONRTRIC-924: RANPM - Add control-panel to Kubernetes deployment Change-Id: I9351d2cf95b2d10d9eb00a02f2bd8c84c7ac4cf1 Signed-off-by: DenisGNoonan --- docker-proj/docker-compose-k1.yaml | 1 + install/README.md | 5 ++ install/helm/controlpanel/.helmignore | 22 ++++++++ install/helm/controlpanel/Chart.yaml | 21 ++++++++ install/helm/controlpanel/resources-ing/nginx.conf | 28 ++++++++++ install/helm/controlpanel/resources-ngw/nginx.conf | 28 ++++++++++ install/helm/controlpanel/templates/configmap.yaml | 29 ++++++++++ .../helm/controlpanel/templates/deployment.yaml | 61 ++++++++++++++++++++++ install/helm/controlpanel/templates/service.yaml | 40 ++++++++++++++ install/helm/controlpanel/values.yaml | 45 ++++++++++++++++ install/helm/nonrtricgateway/.helmignore | 22 ++++++++ install/helm/nonrtricgateway/Chart.yaml | 21 ++++++++ .../resources/config/application.yaml | 50 ++++++++++++++++++ .../helm/nonrtricgateway/templates/configmap.yaml | 26 +++++++++ .../helm/nonrtricgateway/templates/deployment.yaml | 57 ++++++++++++++++++++ .../helm/nonrtricgateway/templates/service.yaml | 33 ++++++++++++ install/helm/nonrtricgateway/values.yaml | 37 +++++++++++++ install/install-nrt.sh | 16 +++++- install/install-pm-influx-job.sh | 2 +- install/uninstall-nrt.sh | 9 ++++ install/uninstall-ranpm.sh | 4 +- 21 files changed, 553 insertions(+), 4 deletions(-) create mode 100644 install/helm/controlpanel/.helmignore create mode 100644 install/helm/controlpanel/Chart.yaml create mode 100644 install/helm/controlpanel/resources-ing/nginx.conf create mode 100644 install/helm/controlpanel/resources-ngw/nginx.conf create mode 100644 install/helm/controlpanel/templates/configmap.yaml create mode 100644 install/helm/controlpanel/templates/deployment.yaml create mode 100644 install/helm/controlpanel/templates/service.yaml create mode 100644 install/helm/controlpanel/values.yaml create mode 100644 install/helm/nonrtricgateway/.helmignore create mode 100644 install/helm/nonrtricgateway/Chart.yaml create mode 100644 install/helm/nonrtricgateway/resources/config/application.yaml create mode 100644 install/helm/nonrtricgateway/templates/configmap.yaml create mode 100644 install/helm/nonrtricgateway/templates/deployment.yaml create mode 100644 install/helm/nonrtricgateway/templates/service.yaml create mode 100644 install/helm/nonrtricgateway/values.yaml diff --git a/docker-proj/docker-compose-k1.yaml b/docker-proj/docker-compose-k1.yaml index d943a53..c6e1fd8 100644 --- a/docker-proj/docker-compose-k1.yaml +++ b/docker-proj/docker-compose-k1.yaml @@ -39,6 +39,7 @@ services: kafka-1: image: ${STRIMZI_IMAGE} + container_name: common-kafka-1-1 command: [ "sh", "-c", "bin/kafka-server-start.sh /tmp/kafka/strimzi.properties" diff --git a/install/README.md b/install/README.md index 90ce2c6..2b707c1 100644 --- a/install/README.md +++ b/install/README.md @@ -109,3 +109,8 @@ Browser for influx db. - nodeport: 31812 - user: admin - password: mySuP3rS3cr3tT0keN + +### Controlpanel +Browser for control-panel \ +browser: `:30091/ei-coordinator` +- nodeport: 30091 diff --git a/install/helm/controlpanel/.helmignore b/install/helm/controlpanel/.helmignore new file mode 100644 index 0000000..50af031 --- /dev/null +++ b/install/helm/controlpanel/.helmignore @@ -0,0 +1,22 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/install/helm/controlpanel/Chart.yaml b/install/helm/controlpanel/Chart.yaml new file mode 100644 index 0000000..180898f --- /dev/null +++ b/install/helm/controlpanel/Chart.yaml @@ -0,0 +1,21 @@ +################################################################################ +# Copyright (c) 2023 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. # +################################################################################ + +apiVersion: v1 +appVersion: "2.0.0" +description: A Helm chart for nonrtric controlpanel +name: controlpanel +version: 2.0.0 diff --git a/install/helm/controlpanel/resources-ing/nginx.conf b/install/helm/controlpanel/resources-ing/nginx.conf new file mode 100644 index 0000000..d72eea7 --- /dev/null +++ b/install/helm/controlpanel/resources-ing/nginx.conf @@ -0,0 +1,28 @@ +events{} + +http { + include /etc/nginx/mime.types; + + upstream backend { + server kong-proxy.kong:80; + } + + server { + listen 8080; + server_name localhost; + root /usr/share/nginx/html; + index index.html; + location /a1-policy/ { + proxy_pass http://backend; + } + location /data-producer/ { + proxy_pass http://backend; + } + location /data-consumer/ { + proxy_pass http://backend; + } + location / { + try_files $uri $uri/ /index.html; + } + } +} \ No newline at end of file diff --git a/install/helm/controlpanel/resources-ngw/nginx.conf b/install/helm/controlpanel/resources-ngw/nginx.conf new file mode 100644 index 0000000..a0ac584 --- /dev/null +++ b/install/helm/controlpanel/resources-ngw/nginx.conf @@ -0,0 +1,28 @@ +events{} + +http { + include /etc/nginx/mime.types; + + upstream backend { + server nonrtricgateway:9090; + } + + server { + listen 8080; + server_name localhost; + root /usr/share/nginx/html; + index index.html; + location /a1-policy/ { + proxy_pass http://backend; + } + location /data-producer/ { + proxy_pass http://backend; + } + location /data-consumer/ { + proxy_pass http://backend; + } + location / { + try_files $uri $uri/ /index.html; + } + } +} diff --git a/install/helm/controlpanel/templates/configmap.yaml b/install/helm/controlpanel/templates/configmap.yaml new file mode 100644 index 0000000..3a17366 --- /dev/null +++ b/install/helm/controlpanel/templates/configmap.yaml @@ -0,0 +1,29 @@ +################################################################################ +# Copyright (c) 2023 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. # +################################################################################ + +apiVersion: v1 +kind: ConfigMap +metadata: + name: controlpanel-configmap + namespace: nonrtric + labels: + app: nonrtric-controlpanel +data: +{{if eq .Values.controlpanel.ingress.enabled false }} +{{ tpl (.Files.Glob "resources-ngw/*").AsConfig . | indent 2 }} +{{ else }} +{{ tpl (.Files.Glob "resources-ing/*").AsConfig . | indent 2 }} +{{ end }} \ No newline at end of file diff --git a/install/helm/controlpanel/templates/deployment.yaml b/install/helm/controlpanel/templates/deployment.yaml new file mode 100644 index 0000000..ddf5157 --- /dev/null +++ b/install/helm/controlpanel/templates/deployment.yaml @@ -0,0 +1,61 @@ +################################################################################ +# Copyright (c) 2023 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. # +################################################################################ + +kind: Deployment +apiVersion: apps/v1 +metadata: + name: controlpanel + namespace: nonrtric + labels: + app: nonrtric-controlpanel +spec: + replicas: {{ .Values.controlpanel.replicaCount }} + selector: + matchLabels: + app: nonrtric-controlpanel + template: + metadata: + labels: + app: nonrtric-controlpanel + spec: + containers: + - name: controlpanel + image: "{{ .Values.controlpanel.image.registry }}/{{ .Values.controlpanel.image.name }}:{{ .Values.controlpanel.image.tag }}" + imagePullPolicy: {{ .Values.controlpanel.imagePullPolicy }} + ports: + - containerPort: {{ .Values.controlpanel.service.targetPort1 }} + protocol: TCP + - containerPort: {{ .Values.controlpanel.service.targetPort2 }} + protocol: TCP + volumeMounts: + - name: controlpanel-configmap + mountPath: /etc/nginx/nginx.conf + subPath: nginx.conf + readOnly: true + readinessProbe: + tcpSocket: + port: {{ .Values.controlpanel.service.targetPort1 }} + initialDelaySeconds: {{ .Values.controlpanel.readiness.initialDelaySeconds }} # liveness -> readiness + periodSeconds: {{ .Values.controlpanel.readiness.periodSeconds }} # liveness -> readiness + livenessProbe: + tcpSocket: + port: {{ .Values.controlpanel.service.targetPort1 }} + initialDelaySeconds: {{ .Values.controlpanel.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.controlpanel.liveness.periodSeconds }} + volumes: + - name: controlpanel-configmap + configMap: + name: controlpanel-configmap diff --git a/install/helm/controlpanel/templates/service.yaml b/install/helm/controlpanel/templates/service.yaml new file mode 100644 index 0000000..a5e1c66 --- /dev/null +++ b/install/helm/controlpanel/templates/service.yaml @@ -0,0 +1,40 @@ +################################################################################ +# Copyright (c) 2023 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. # +################################################################################ + +kind: Service +apiVersion: v1 +metadata: + name: controlpanel + namespace: nonrtric + labels: + app: nonrtric-controlpanel +spec: + type: NodePort + ports: + {{if eq .Values.controlpanel.service.allowHttp true -}} + - name: {{ index .Values.controlpanel.service.httpName }} + port: {{ .Values.controlpanel.service.internalPort1 }} + targetPort: {{ .Values.controlpanel.service.targetPort1 }} + nodePort: {{ .Values.controlpanel.service.externalPort1 }} + protocol: TCP + {{- end }} + - name: {{ index .Values.controlpanel.service.httpsName }} + port: {{ .Values.controlpanel.service.internalPort2 }} + targetPort: {{ .Values.controlpanel.service.targetPort2 }} + nodePort: {{ .Values.controlpanel.service.externalPort2 }} + protocol: TCP + selector: + app: nonrtric-controlpanel diff --git a/install/helm/controlpanel/values.yaml b/install/helm/controlpanel/values.yaml new file mode 100644 index 0000000..03fa569 --- /dev/null +++ b/install/helm/controlpanel/values.yaml @@ -0,0 +1,45 @@ +################################################################################ +# Copyright (c) 2023 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. # +################################################################################ + +# Default values for controlpanel. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +controlpanel: + imagePullPolicy: IfNotPresent + image: + registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc' + name: nonrtric-controlpanel + tag: 2.5.0 + replicaCount: 1 + service: + allowHttp: true + httpName: http + internalPort1: 8080 + targetPort1: 8080 + externalPort1: 30091 + httpsName: https + internalPort2: 8081 + targetPort2: 8082 + externalPort2: 30092 + liveness: + initialDelaySeconds: 20 + periodSeconds: 10 + readiness: + initialDelaySeconds: 20 + periodSeconds: 10 + ingress: + enabled: false diff --git a/install/helm/nonrtricgateway/.helmignore b/install/helm/nonrtricgateway/.helmignore new file mode 100644 index 0000000..50af031 --- /dev/null +++ b/install/helm/nonrtricgateway/.helmignore @@ -0,0 +1,22 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/install/helm/nonrtricgateway/Chart.yaml b/install/helm/nonrtricgateway/Chart.yaml new file mode 100644 index 0000000..3642ff8 --- /dev/null +++ b/install/helm/nonrtricgateway/Chart.yaml @@ -0,0 +1,21 @@ +################################################################################ +# Copyright (c) 2023 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. # +################################################################################ + +apiVersion: v1 +appVersion: "0.0.1" +description: A Helm chart for Nonrtric Gateway +name: nonrtricgateway +version: 1.0.0 diff --git a/install/helm/nonrtricgateway/resources/config/application.yaml b/install/helm/nonrtricgateway/resources/config/application.yaml new file mode 100644 index 0000000..1c5c63c --- /dev/null +++ b/install/helm/nonrtricgateway/resources/config/application.yaml @@ -0,0 +1,50 @@ +################################################################################ +# Copyright (c) 2023 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-EI + uri: http://informationservice:8083 + predicates: + - Path=/data-producer/**,/data-consumer/** +# - id: A1-EI2 +#uri: http://ics:8083 +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/install/helm/nonrtricgateway/templates/configmap.yaml b/install/helm/nonrtricgateway/templates/configmap.yaml new file mode 100644 index 0000000..bab097f --- /dev/null +++ b/install/helm/nonrtricgateway/templates/configmap.yaml @@ -0,0 +1,26 @@ +################################################################################ +# Copyright (c) 2023 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. # +################################################################################ + + +apiVersion: v1 +kind: ConfigMap +metadata: + name: nonrtricgateway-configmap + namespace: nonrtric + labels: + app: nonrtric-nonrtricgateway +data: +{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }} \ No newline at end of file diff --git a/install/helm/nonrtricgateway/templates/deployment.yaml b/install/helm/nonrtricgateway/templates/deployment.yaml new file mode 100644 index 0000000..c09c19c --- /dev/null +++ b/install/helm/nonrtricgateway/templates/deployment.yaml @@ -0,0 +1,57 @@ +################################################################################ +# Copyright (c) 2023 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. # +################################################################################ + +kind: Deployment +apiVersion: apps/v1 +metadata: + name: nonrtricgateway + namespace: nonrtric + labels: + app: nonrtric-nonrtricgateway +spec: + replicas: 1 + selector: + matchLabels: + app: nonrtric-nonrtricgateway + template: + metadata: + labels: + app: nonrtric-nonrtricgateway + spec: + containers: + - name: nonrtric-nonrtricgateway + image: "{{ .Values.nonrtricgateway.image.registry }}/{{ .Values.nonrtricgateway.image.name }}:{{ .Values.nonrtricgateway.image.tag }}" + imagePullPolicy: {{ .Values.nonrtricgateway.imagePullPolicy }} + ports: + - containerPort: {{ .Values.nonrtricgateway.service.targetPort1 }} + protocol: TCP + readinessProbe: + tcpSocket: + port: {{ .Values.nonrtricgateway.service.targetPort1 }} + initialDelaySeconds: {{ .Values.nonrtricgateway.readiness.initialDelaySeconds }} # changed from liveness + periodSeconds: {{ .Values.nonrtricgateway.readiness.periodSeconds }} + livenessProbe: + tcpSocket: + port: {{ .Values.nonrtricgateway.service.targetPort1 }} + initialDelaySeconds: {{ .Values.nonrtricgateway.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.nonrtricgateway.liveness.periodSeconds }} + volumeMounts: + - name: nonrtricgateway-config + mountPath: /opt/app/nonrtric-gateway/config + volumes: + - name: nonrtricgateway-config + configMap: + name: nonrtricgateway-configmap diff --git a/install/helm/nonrtricgateway/templates/service.yaml b/install/helm/nonrtricgateway/templates/service.yaml new file mode 100644 index 0000000..44caa2f --- /dev/null +++ b/install/helm/nonrtricgateway/templates/service.yaml @@ -0,0 +1,33 @@ +################################################################################ +# Copyright (c) 2023 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. # +################################################################################ + +kind: Service +apiVersion: v1 +metadata: + name: nonrtricgateway + namespace: nonrtric + labels: + app: nonrtric-nonrtricgateway +spec: + ports: + - name: {{ .Values.nonrtricgateway.service.httpName }} # name: {{ index .Values.nonrtricgateway.service.httpName }}, remove index + port: {{ .Values.nonrtricgateway.service.internalPort1 }} + targetPort: {{ .Values.nonrtricgateway.service.targetPort1 }} + nodePort: {{ .Values.nonrtricgateway.service.externalPort1 }} + protocol: TCP + selector: + app: nonrtric-nonrtricgateway + type: NodePort diff --git a/install/helm/nonrtricgateway/values.yaml b/install/helm/nonrtricgateway/values.yaml new file mode 100644 index 0000000..b3016c7 --- /dev/null +++ b/install/helm/nonrtricgateway/values.yaml @@ -0,0 +1,37 @@ +################################################################################ +# Copyright (c) 2023 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. # +################################################################################ + +# Default values for Gateway application. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +nonrtricgateway: + imagePullPolicy: IfNotPresent + image: + registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc' + name: nonrtric-gateway + tag: 1.2.0 + service: + httpName: http + internalPort1: 9090 + targetPort1: 9090 + externalPort1: 30093 + liveness: + initialDelaySeconds: 20 + periodSeconds: 10 + readiness: + initialDelaySeconds: 20 + periodSeconds: 10 \ No newline at end of file diff --git a/install/install-nrt.sh b/install/install-nrt.sh index 906fd31..a30dcf3 100755 --- a/install/install-nrt.sh +++ b/install/install-nrt.sh @@ -166,6 +166,20 @@ done echo "" +################################################################################## +echo "##### Installing: chart nonrtricgateway" +################################################################################## + +helm install --wait -n nonrtric nonrtricgateway helm/nonrtricgateway +echo "" + +################################################################################## +echo "##### Installing: chart controlpanel" +################################################################################## + +helm install --wait -n nonrtric controlpanel helm/controlpanel +echo "" + ################################################################################## echo "##### Installing: chart ran" ################################################################################## @@ -257,4 +271,4 @@ echo "ranpm installed" echo "Wait until all pods are running before installation additional charts" echo "Do: 'kubectl get po -n nonrtric' and verify that all pods are in status Running" echo " and all included containers are Ready" -echo "######################################################################" \ No newline at end of file +echo "######################################################################" diff --git a/install/install-pm-influx-job.sh b/install/install-pm-influx-job.sh index 1de513e..2b79ede 100755 --- a/install/install-pm-influx-job.sh +++ b/install/install-pm-influx-job.sh @@ -43,7 +43,7 @@ echo "Kubernetes control plane host: $KUBERNETESHOST" . scripts/create_influxdb2_bucket.sh . scripts/create_ics_job.sh -echo "Installtion pm to influx job" +echo "Installation pm to influx job" echo " Retriving influxdb2 access token..." INFLUXDB2_TOKEN=$(get_influxdb2_token influxdb2-0 nonrtric) diff --git a/install/uninstall-nrt.sh b/install/uninstall-nrt.sh index 62abf73..ab7d3fc 100755 --- a/install/uninstall-nrt.sh +++ b/install/uninstall-nrt.sh @@ -29,13 +29,22 @@ check_error() { NUM_ERRORS=0 +helm uninstall -n nonrtric controlpanel +check_error $? controlpanel +helm uninstall -n nonrtric nonrtricgateway +check_error $? nonrtricgateway + helm uninstall -n ran ran +check_error $? ran helm uninstall -n nonrtric nrt-pm +check_error $? nrt-pm helm uninstall -n nonrtric nrt-base-1 +check_error $? nrt-base-1 helm uninstall -n nonrtric nrt-base-0 +check_error $? nrt-base-0 INST="strimzi-kafka CRDs" echo "##########################" diff --git a/install/uninstall-ranpm.sh b/install/uninstall-ranpm.sh index f4c08d1..272a69f 100644 --- a/install/uninstall-ranpm.sh +++ b/install/uninstall-ranpm.sh @@ -20,7 +20,7 @@ ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" cd "${ROOT_DIR}" # Array of scripts to execute -scripts=("uninstall-pm-rapp.sh" "uninstall-nrt.sh") +scripts=("uninstall-pm-rapp.sh" "uninstall-pm-log.sh" "uninstall-nrt.sh") for script in "${scripts[@]}"; do echo "*****************************************************************" @@ -41,4 +41,4 @@ echo "*****************************************************************" echo "*****************************************************************" echo "All RANPM uninstallation scripts executed successfully!" echo "*****************************************************************" -echo "*****************************************************************" \ No newline at end of file +echo "*****************************************************************" -- 2.16.6