From f41055fec0cdbd2d03c8a795bcde69a69093e40e Mon Sep 17 00:00:00 2001
From: Matteo Di Carlo <matteo.dicarlo@inaf.it>
Date: Tue, 6 Oct 2020 14:08:39 +0000
Subject: [PATCH] update tango-rest
---
charts/ska-docker/Chart.yaml | 2 +-
charts/tango-base/Chart.yaml | 2 +-
charts/tango-base/templates/tango-rest.yaml | 52 +++++++++++++++++++--
3 files changed, 51 insertions(+), 5 deletions(-)
diff --git a/charts/ska-docker/Chart.yaml b/charts/ska-docker/Chart.yaml
index e0095a37..3e4ed1a7 100644
--- a/charts/ska-docker/Chart.yaml
+++ b/charts/ska-docker/Chart.yaml
@@ -9,7 +9,7 @@ dependencies:
version: 0.2.0
repository: file://../tango-util
- name: tango-base
- version: 0.2.2
+ version: 0.2.3
repository: file://../tango-base
condition: tango-base.enabled,global.sub-system.tango-base.enabled
- name: archiver
diff --git a/charts/tango-base/Chart.yaml b/charts/tango-base/Chart.yaml
index 6b1b9d27..b536aff7 100644
--- a/charts/tango-base/Chart.yaml
+++ b/charts/tango-base/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
appVersion: "1.0"
description: A Helm chart for deploying the TANGO base system on Kubernetes
name: tango-base
-version: 0.2.2
+version: 0.2.3
icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
dependencies:
- name: tango-util
diff --git a/charts/tango-base/templates/tango-rest.yaml b/charts/tango-base/templates/tango-rest.yaml
index fb0c6892..eec33e0e 100644
--- a/charts/tango-base/templates/tango-rest.yaml
+++ b/charts/tango-base/templates/tango-rest.yaml
@@ -70,8 +70,8 @@ spec:
{{- end }}
initContainers:
- name: check-dependencies-0
- image: "{{ .Values.global.dsconfig.image.registry }}/{{ .Values.global.dsconfig.image.image }}:{{ .Values.global.dsconfig.image.tag }}"
- imagePullPolicy: {{ .Values.global.dsconfig.image.pullPolicy }}
+ image: "{{ .Values.tangorest.image.registry }}/{{ .Values.tangorest.image.image }}:{{ .Values.tangorest.image.tag }}"
+ imagePullPolicy: {{ .Values.tangorest.image.pullPolicy }}
command:
- retry
- --max=10
@@ -82,6 +82,50 @@ spec:
env:
- name: TANGO_HOST
value: {{ .Values.global.tango_host }}
+ - name: init-0
+ image: "{{ .Values.tangorest.image.registry }}/{{ .Values.tangorest.image.image }}:{{ .Values.tangorest.image.tag }}"
+ imagePullPolicy: {{ .Values.tangorest.image.pullPolicy }}
+ command:
+ - /bin/bash
+ args:
+ - "-c"
+ - /usr/local/bin/tango_register_device.sh TangoRestServer/{{ template "tango-base.name" . }}-{{ .Values.tangorest.component }} TangoRestServer {{ template "tango-base.name" . }}-{{ .Values.tangorest.component }}/rest/0
+ env:
+ - name: TANGO_HOST
+ value: {{ .Values.global.tango_host }}
+ - name: init-1
+ image: "{{ .Values.tangorest.image.registry }}/{{ .Values.tangorest.image.image }}:{{ .Values.tangorest.image.tag }}"
+ imagePullPolicy: {{ .Values.tangorest.image.pullPolicy }}
+ command:
+ - /bin/bash
+ args:
+ - "-c"
+ - /usr/local/bin/tango_admin --add-property {{ template "tango-base.name" . }}-{{ .Values.tangorest.component }}/rest/0 TANGO_DB tango://{{ .Values.global.tango_host }}/sys/database/2
+ env:
+ - name: TANGO_HOST
+ value: {{ .Values.global.tango_host }}
+ - name: init-2
+ image: "{{ .Values.tangorest.image.registry }}/{{ .Values.tangorest.image.image }}:{{ .Values.tangorest.image.tag }}"
+ imagePullPolicy: {{ .Values.tangorest.image.pullPolicy }}
+ command:
+ - /bin/bash
+ args:
+ - "-c"
+ - /usr/local/bin/tango_admin --add-property {{ template "tango-base.name" . }}-{{ .Values.tangorest.component }}/rest/0 TOMCAT_PORT 8080
+ env:
+ - name: TANGO_HOST
+ value: {{ .Values.global.tango_host }}
+ - name: init-3
+ image: "{{ .Values.tangorest.image.registry }}/{{ .Values.tangorest.image.image }}:{{ .Values.tangorest.image.tag }}"
+ imagePullPolicy: {{ .Values.tangorest.image.pullPolicy }}
+ command:
+ - /bin/bash
+ args:
+ - "-c"
+ - /usr/local/bin/tango_admin --add-property {{ template "tango-base.name" . }}-{{ .Values.tangorest.component }}/rest/0 TOMCAT_AUTH_METHOD plain
+ env:
+ - name: TANGO_HOST
+ value: {{ .Values.global.tango_host }}
containers:
- name: tango-rest
image: "{{ .Values.tangorest.image.registry }}/{{ .Values.tangorest.image.image }}:{{ .Values.tangorest.image.tag }}"
@@ -90,12 +134,14 @@ spec:
- /bin/bash
args:
- "-c"
- - /usr/bin/supervisord --configuration /etc/supervisor/supervisord.conf
+ - /usr/bin/java -jar $JAVA_OPTS /usr/local/lib/tango/mtangorest.jar $MYHOSTNAME
env:
- name: TANGO_HOST
value: "{{ .Values.global.tango_host }}"
- name: JAVA_OPTS
value: "-Xmx4G -Xshare:off -XX:+UseG1GC -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5009"
+ - name: MYHOSTNAME
+ value: {{ template "tango-base.name" . }}-{{ .Values.tangorest.component }}
ports:
- name: rest
containerPort: 8080
--
GitLab