From 9e5b709a8698ec01bc46eba0666055ef5b4c8fd3 Mon Sep 17 00:00:00 2001 From: toor <elisabetta.giani@inaf.it> Date: Fri, 23 Oct 2020 08:40:42 +0200 Subject: [PATCH] tango-util: charts folder re-organizatio to implement charts and sub-charts relying on tango-util library. --- csp-lmc-mid/charts/csp-proto/Chart.yaml | 6 - .../charts/csp-proto/data/configuration.json | 1563 --------------- .../charts/csp-proto/templates/_helpers.tpl | 44 - .../charts/csp-proto/templates/csplmc.yaml | 186 -- csp-lmc-mid/charts/csp-proto/values.yaml | 81 - csp-lmc-mid/charts/csp-proto/values.yaml.new | 59 - .../charts/mid-csp-umbrella/Chart.yaml | 15 + .../secrets/.gitkeep | 0 .../secrets/tls.crt | 0 .../secrets/tls.key | 0 .../charts/mid-csp-umbrella/values.yaml | 11 + csp-lmc-mid/charts/mid-csp/Chart.lock | 9 - csp-lmc-mid/charts/mid-csp/Chart.yaml | 19 +- .../mid-csp/charts/cbf-proto/Chart.yaml | 6 - .../charts/cbf-proto/data/midcbfconfig.json | 1719 ----------------- .../mid-csp/charts/cbf-proto/secrets/.gitkeep | 0 .../charts/cbf-proto/templates/_helpers.tpl | 43 - .../charts/cbf-proto/templates/midcbf.yaml | 182 -- .../mid-csp/charts/cbf-proto/values.yaml | 155 -- .../data/mid-csp-config.json} | 0 .../charts/mid-csp/templates/_helpers.tpl | 62 - csp-lmc-mid/charts/mid-csp/values.yaml | 92 +- 22 files changed, 112 insertions(+), 4140 deletions(-) delete mode 100644 csp-lmc-mid/charts/csp-proto/Chart.yaml delete mode 100644 csp-lmc-mid/charts/csp-proto/data/configuration.json delete mode 100644 csp-lmc-mid/charts/csp-proto/templates/_helpers.tpl delete mode 100644 csp-lmc-mid/charts/csp-proto/templates/csplmc.yaml delete mode 100644 csp-lmc-mid/charts/csp-proto/values.yaml delete mode 100644 csp-lmc-mid/charts/csp-proto/values.yaml.new create mode 100644 csp-lmc-mid/charts/mid-csp-umbrella/Chart.yaml rename csp-lmc-mid/charts/{csp-proto => mid-csp-umbrella}/secrets/.gitkeep (100%) rename csp-lmc-mid/charts/{csp-proto => mid-csp-umbrella}/secrets/tls.crt (100%) rename csp-lmc-mid/charts/{csp-proto => mid-csp-umbrella}/secrets/tls.key (100%) create mode 100644 csp-lmc-mid/charts/mid-csp-umbrella/values.yaml delete mode 100644 csp-lmc-mid/charts/mid-csp/Chart.lock delete mode 100644 csp-lmc-mid/charts/mid-csp/charts/cbf-proto/Chart.yaml delete mode 100644 csp-lmc-mid/charts/mid-csp/charts/cbf-proto/data/midcbfconfig.json delete mode 100644 csp-lmc-mid/charts/mid-csp/charts/cbf-proto/secrets/.gitkeep delete mode 100644 csp-lmc-mid/charts/mid-csp/charts/cbf-proto/templates/_helpers.tpl delete mode 100644 csp-lmc-mid/charts/mid-csp/charts/cbf-proto/templates/midcbf.yaml delete mode 100644 csp-lmc-mid/charts/mid-csp/charts/cbf-proto/values.yaml rename csp-lmc-mid/charts/{csp-proto/data/cspconfig.json => mid-csp/data/mid-csp-config.json} (100%) delete mode 100644 csp-lmc-mid/charts/mid-csp/templates/_helpers.tpl diff --git a/csp-lmc-mid/charts/csp-proto/Chart.yaml b/csp-lmc-mid/charts/csp-proto/Chart.yaml deleted file mode 100644 index e4f8d6d..0000000 --- a/csp-lmc-mid/charts/csp-proto/Chart.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -appVersion: "0.6.9" -description: A Helm chart for deploying the Mid_CSP.LMC devices on Kubernetes -name: csp-proto -version: 0.2.2 -icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png diff --git a/csp-lmc-mid/charts/csp-proto/data/configuration.json b/csp-lmc-mid/charts/csp-proto/data/configuration.json deleted file mode 100644 index fd23f9d..0000000 --- a/csp-lmc-mid/charts/csp-proto/data/configuration.json +++ /dev/null @@ -1,1563 +0,0 @@ -{ - "servers": { - "CspMaster": { - "csp": { - "CspMaster": { - "mid_csp/elt/master": { - "attribute_properties": { - "adminMode": { - "abs_change": [ - "-1", - "1" - ] - }, - "fspMembership": { - "__root_att": [ - "mid_csp_cbf/sub_elt/master/reportFSPSubarrayMembership" - ] - }, - "healthState": { - "abs_change": [ - "-1", - "1" - ] - }, - "reportFSPAdminMode": { - "__root_att": [ - "mid_csp_cbf/sub_elt/master/reportFSPAdminMode" - ] - }, - "reportFSPHealthState": { - "__root_att": [ - "mid_csp_cbf/sub_elt/master/reportFSPHealthState" - ] - }, - "reportFSPState": { - "__root_att": [ - "mid_csp_cbf/sub_elt/master/reportFSPState" - ] - }, - "reportVCCAdminMode": { - "__root_att": [ - "mid_csp_cbf/sub_elt/master/reportVCCAdminMode" - ] - }, - "reportVCCHealthState": { - "__root_att": [ - "mid_csp_cbf/sub_elt/master/reportVCCHealthState" - ] - }, - "reportVCCState": { - "__root_att": [ - "mid_csp_cbf/sub_elt/master/reportVCCState" - ] - }, - "vccMembership": { - "__root_att": [ - "mid_csp_cbf/sub_elt/master/reportVCCSubarrayMembership" - ] - } - }, - "properties": { - "CspMidCbf": [ - "mid_csp_cbf/sub_elt/master" - ], - "CspMidPss": [ - "mid_csp_pss/sub_elt/master" - ], - "CspMidPst": [ - "mid_csp_pst/sub_elt/master" - ], - "CspSubarrays": [ - "mid_csp/elt/subarray_01", - "mid_csp/elt/subarray_02", - "mid_csp/elt/subarray_03" - ], - "MaxCapabilities": [ - "Subarray:16", - "VlbiBeam:20", - "TimingBeam:16", - "SearchBeam:1500" - ], - "polled_attr": [ - "healthstate", - "1000", - "adminmode", - "1000", - "state", - "1000", - "csppststate", - "1000", - "cspcbfstate", - "1000", - "csppsthealthstate", - "1000", - "pssadminmode", - "1000", - "cbfadminmode", - "1000", - "csppssstate", - "1000", - "pstadminmode", - "1000", - "commandprogress", - "3000", - "cspcbfhealthstate", - "1000", - "csppsshealthstate", - "1000" - ] - } - } - } - } - }, - "CspSubarray": { - "sub1": { - "CspSubarray": { - "mid_csp/elt/subarray_01": { - "attribute_properties": { - "adminMode": { - "abs_change": [ - "-1", - "1" - ] - }, - "healthState": { - "abs_change": [ - "-1", - "1" - ] - }, - "obsState": { - "abs_change": [ - "-1", - "1" - ] - }, - "receptors": { - "__root_att": [ - "mid_csp_cbf/sub_elt/subarray_01/receptors" - ] - }, - "vccHealthState": { - "__root_att": [ - "mid_csp_cbf/sub_elt/subarray_01/vccHealthState" - ] - }, - "vccState": { - "__root_att": [ - "mid_csp_cbf/sub_elt/subarray_01/vccState" - ] - }, - "cbfOutputLink": { - "__root_att": [ - "mid_csp_cbf/sub_elt/subarray_01/outputLinksDistribution" - ] - } - }, - "properties": { - "CspMaster": [ - "mid_csp/elt/master" - ], - "SubID": [ - "1" - ], - "polled_attr": [ - "state", - "1000", - "healthstate", - "1000", - "adminmode", - "1000", - "obsstate", - "1000", - "obsmode", - "1000" - ] - } - } - } - }, - "sub2": { - "CspSubarray": { - "mid_csp/elt/subarray_02": { - "attribute_properties": { - "adminMode": { - "abs_change": [ - "-1", - "1" - ] - }, - "healthState": { - "abs_change": [ - "-1", - "1" - ] - }, - "obsState": { - "abs_change": [ - "-1", - "1" - ] - }, - "receptors": { - "__root_att": [ - "mid_csp_cbf/sub_elt/subarray_02/receptors" - ] - }, - "vccHealthState": { - "__root_att": [ - "mid_csp_cbf/sub_elt/subarray_02/vccHealthState" - ] - }, - "vccState": { - "__root_att": [ - "mid_csp_cbf/sub_elt/subarray_02/vccState" - ] - }, - "cbfOutputLink": { - "__root_att": [ - "mid_csp_cbf/sub_elt/subarray_02/outputLinksDistribution" - ] - } - }, - "properties": { - "CspMaster": [ - "mid_csp/elt/master" - ], - "SubID": [ - "2" - ], - "polled_attr": [ - "state", - "1000", - "healthstate", - "1000", - "adminmode", - "1000", - "obsstate", - "1000", - "obsmode", - "1000" - ] - } - } - } - }, - "sub3": { - "CspSubarray": { - "mid_csp/elt/subarray_03": { - "attribute_properties": { - "adminMode": { - "abs_change": [ - "-1", - "1" - ] - }, - "healthState": { - "abs_change": [ - "-1", - "1" - ] - }, - "obsState": { - "abs_change": [ - "-1", - "1" - ] - }, - "receptors": { - "__root_att": [ - "mid_csp_cbf/sub_elt/subarray_03/receptors" - ] - }, - "vccHealthState": { - "__root_att": [ - "mid_csp_cbf/sub_elt/subarray_03/vccHealthState" - ] - }, - "vccState": { - "__root_att": [ - "mid_csp_cbf/sub_elt/subarray_03/vccState" - ] - }, - "cbfOutputLink": { - "__root_att": [ - "mid_csp_cbf/sub_elt/subarray_03/outputLinksDistribution" - ] - } - }, - "properties": { - "CspMaster": [ - "mid_csp/elt/master" - ], - "SubID": [ - "3" - ], - "polled_attr": [ - "state", - "1000", - "healthstate", - "1000", - "adminmode", - "1000", - "obsstate", - "1000", - "obsmode", - "1000" - ] - } - } - } - } - }, - "CspTelState": { - "csp": { - "CspTelState": { - "mid_csp/elt/telstate": { - "attribute_properties": { - }, - "properties": { - } - } - } - } - }, - "DataBaseds": { - "2": { - "DataBase": { - "sys/database/2": {} - } - } - }, - "CbfMaster": { - "master": { - "CbfMaster": { - "mid_csp_cbf/sub_elt/master": { - "attribute_properties": { - "adminMode": { - "abs_change": [ - "-1", - "1" - ] - }, - "healthState": { - "abs_change": [ - "-1", - "1" - ] - } - }, - "properties": { - "CbfSubarray": [ - "mid_csp_cbf/sub_elt/subarray_01", - "mid_csp_cbf/sub_elt/subarray_02", - "mid_csp_cbf/sub_elt/subarray_03" - ], - "FSP": [ - "mid_csp_cbf/fsp/01", - "mid_csp_cbf/fsp/02", - "mid_csp_cbf/fsp/03", - "mid_csp_cbf/fsp/04" - ], - "MaxCapabilities": [ - "VCC:4", - "FSP:4", - "Subarray:3" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ], - "polled_attr": [ - "reportfspstate", - "1000", - "reportvccadminmode", - "1000", - "reportvcchealthstate", - "1000", - "receptortovcc", - "1000", - "reportvccsubarraymembership", - "1000", - "reportfspsubarraymembership", - "1000", - "reportfsphealthstate", - "1000", - "healthstate", - "1000", - "adminmode", - "1000", - "subarrayscanid", - "1000", - "reportfspadminmode", - "1000", - "commandprogress", - "2000", - "reportsubarrayhealthstate", - "1000", - "reportvccstate", - "1000", - "reportsubarrayadminmode", - "1000", - "vcctoreceptor", - "3000", - "reportsubarraystate", - "3000", - "state", - "1000" - ] - } - } - } - } - }, - "CbfSubarrayMulti": { - "cbfSubarray-01": { - "CbfSubarray": { - "mid_csp_cbf/sub_elt/subarray_01": { - "attribute_properties": { - "adminMode": { - "abs_change": [ - "-1", - "1" - ] - }, - "healthState": { - "abs_change": [ - "-1", - "1" - ] - }, - "obsState": { - "abs_change": [ - "-1", - "1" - ] - }, - "scanID": { - "abs_change": [ - "-1", - "1" - ] - } - }, - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "FSP": [ - "mid_csp_cbf/fsp/01", - "mid_csp_cbf/fsp/02", - "mid_csp_cbf/fsp/03", - "mid_csp_cbf/fsp/04" - ], - "FspSubarray": [ - "mid_csp_cbf/fspSubarray/01_01", - "mid_csp_cbf/fspSubarray/02_01", - "mid_csp_cbf/fspSubarray/03_01", - "mid_csp_cbf/fspSubarray/04_01" - ], - "SW1Address": [ - "mid_csp_cbf/sw1/01" - ], - "SW2Address": [ - "mid_csp_cbf/sw2/01" - ], - "SubID": [ - "1" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ], - "polled_attr": [ - "state", - "1000", - "healthstate", - "1000", - "adminmode", - "1000", - "fsphealthstate", - "1000", - "fspstate", - "1000", - "vccstate", - "1000", - "vcchealthstate", - "1000", - "obsstate", - "1000", - "scanid", - "1000", - "outputLinksDistribution", - "1000" - ] - } - } - }, - "SearchWindow": { - "mid_csp_cbf/sw1/01": {}, - "mid_csp_cbf/sw2/01": {} - } - }, - "cbfSubarray-02": { - "CbfSubarray": { - "mid_csp_cbf/sub_elt/subarray_02": { - "attribute_properties": { - "adminMode": { - "abs_change": [ - "-1", - "1" - ] - }, - "healthState": { - "abs_change": [ - "-1", - "1" - ] - }, - "obsState": { - "abs_change": [ - "-1", - "1" - ] - }, - "scanID": { - "abs_change": [ - "-1", - "1" - ] - } - }, - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "FSP": [ - "mid_csp_cbf/fsp/01", - "mid_csp_cbf/fsp/02", - "mid_csp_cbf/fsp/03", - "mid_csp_cbf/fsp/04" - ], - "FspSubarray": [ - "mid_csp_cbf/fspSubarray/01_02", - "mid_csp_cbf/fspSubarray/02_02", - "mid_csp_cbf/fspSubarray/03_02", - "mid_csp_cbf/fspSubarray/04_02" - ], - "SW1Address": [ - "mid_csp_cbf/sw1/02" - ], - "SW2Address": [ - "mid_csp_cbf/sw2/02" - ], - "SubID": [ - "2" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ], - "polled_attr": [ - "scanid", - "1000", - "healthstate", - "1000", - "state", - "1000", - "obsstate", - "1000", - "vcchealthstate", - "1000", - "adminmode", - "1000", - "fspstate", - "1000", - "fsphealthstate", - "1000", - "vccstate", - "1000" - ] - } - } - }, - "SearchWindow": { - "mid_csp_cbf/sw1/02": {}, - "mid_csp_cbf/sw2/02": {} - } - }, - "cbfSubarray-03": { - "CbfSubarray": { - "mid_csp_cbf/sub_elt/subarray_03": { - "attribute_properties": { - "adminMode": { - "abs_change": [ - "-1", - "1" - ] - }, - "healthState": { - "abs_change": [ - "-1", - "1" - ] - }, - "obsState": { - "abs_change": [ - "-1", - "1" - ] - }, - "scanID": { - "abs_change": [ - "-1", - "1" - ] - } - }, - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "FSP": [ - "mid_csp_cbf/fsp/01", - "mid_csp_cbf/fsp/02", - "mid_csp_cbf/fsp/03", - "mid_csp_cbf/fsp/04" - ], - "FspSubarray": [ - "mid_csp_cbf/fspSubarray/01_03", - "mid_csp_cbf/fspSubarray/02_03", - "mid_csp_cbf/fspSubarray/03_03", - "mid_csp_cbf/fspSubarray/04_03" - ], - "SW1Address": [ - "mid_csp_cbf/sw1/03" - ], - "SW2Address": [ - "mid_csp_cbf/sw2/03" - ], - "SubID": [ - "3" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ], - "polled_attr": [ - "scanid", - "1000", - "healthstate", - "1000", - "state", - "1000", - "obsstate", - "1000", - "vcchealthstate", - "1000", - "adminmode", - "1000", - "fspstate", - "1000", - "fsphealthstate", - "1000", - "vccstate", - "1000" - ] - } - } - }, - "SearchWindow": { - "mid_csp_cbf/sw1/03": {}, - "mid_csp_cbf/sw2/03": {} - } - } - }, - "FspMulti": { - "fsp-01": { - "Fsp": { - "mid_csp_cbf/fsp/01": { - "attribute_properties": { - "adminMode": { - "abs_change": [ - "-1", - "1" - ] - }, - "healthState": { - "abs_change": [ - "-1", - "1" - ] - }, - "subarrayMembership": { - "abs_change": [ - "-1", - "1" - ] - } - }, - "properties": { - "CorrelationAddress": [ - "mid_csp_cbf/fsp_corr/01" - ], - "FspID": [ - "1" - ], - "PSSAddress": [ - "mid_csp_cbf/fsp_pss/01" - ], - "PSTAddress": [ - "mid_csp_cbf/fsp_pst/01" - ], - "VLBIAddress": [ - "mid_csp_cbf/fsp_vlbi/01" - ], - "FspSubarray": [ - "mid_csp_cbf/fspSubarray/01_01", - "mid_csp_cbf/fspSubarray/01_02", - "mid_csp_cbf/fspSubarray/01_03" - ], - "polled_attr": [ - "adminmode", - "1000", - "healthstate", - "1000", - "state", - "1000", - "subarraymembership", - "1000" - ] - } - } - }, - "FspCorr": { - "mid_csp_cbf/fsp_corr/01": {} - }, - "FspPss": { - "mid_csp_cbf/fsp_pss/01": {} - }, - "FspPst": { - "mid_csp_cbf/fsp_pst/01": {} - }, - "FspSubarray": { - "mid_csp_cbf/fspSubarray/01_01": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_01" - ], - "FspID": [ - "1" - ], - "SubID": [ - "1" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - }, - "mid_csp_cbf/fspSubarray/01_02": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_02" - ], - "FspID": [ - "1" - ], - "SubID": [ - "2" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - }, - "mid_csp_cbf/fspSubarray/01_03": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_03" - ], - "FspID": [ - "1" - ], - "SubID": [ - "3" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - } - }, - "FspVlbi": { - "mid_csp_cbf/fsp_vlbi/01": {} - } - }, - "fsp-02": { - "Fsp": { - "mid_csp_cbf/fsp/02": { - "attribute_properties": { - "adminMode": { - "abs_change": [ - "-1", - "1" - ] - }, - "healthState": { - "abs_change": [ - "-1", - "1" - ] - }, - "subarrayMembership": { - "abs_change": [ - "-1", - "1" - ] - } - }, - "properties": { - "CorrelationAddress": [ - "mid_csp_cbf/fsp_corr/02" - ], - "FspID": [ - "2" - ], - "PSSAddress": [ - "mid_csp_cbf/fsp_pss/02" - ], - "PSTAddress": [ - "mid_csp_cbf/fsp_pst/02" - ], - "VLBIAddress": [ - "mid_csp_cbf/fsp_vlbi/02" - ], - "FspSubarray": [ - "mid_csp_cbf/fspSubarray/02_01", - "mid_csp_cbf/fspSubarray/02_02", - "mid_csp_cbf/fspSubarray/02_03" - ], - "polled_attr": [ - "adminmode", - "1000", - "healthstate", - "1000", - "state", - "1000", - "subarraymembership", - "1000" - ] - } - } - }, - "FspCorr": { - "mid_csp_cbf/fsp_corr/02": {} - }, - "FspPss": { - "mid_csp_cbf/fsp_pss/02": {} - }, - "FspPst": { - "mid_csp_cbf/fsp_pst/02": {} - }, - "FspSubarray": { - "mid_csp_cbf/fspSubarray/02_01": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_01" - ], - "FspID": [ - "2" - ], - "SubID": [ - "1" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - }, - "mid_csp_cbf/fspSubarray/02_02": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_02" - ], - "FspID": [ - "2" - ], - "SubID": [ - "2" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - }, - "mid_csp_cbf/fspSubarray/02_03": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_03" - ], - "FspID": [ - "2" - ], - "SubID": [ - "3" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - } - }, - "FspVlbi": { - "mid_csp_cbf/fsp_vlbi/02": {} - } - }, - "fsp-03": { - "Fsp": { - "mid_csp_cbf/fsp/03": { - "attribute_properties": { - "adminMode": { - "abs_change": [ - "-1", - "1" - ] - }, - "healthState": { - "abs_change": [ - "-1", - "1" - ] - }, - "subarrayMembership": { - "abs_change": [ - "-1", - "1" - ] - } - }, - "properties": { - "CorrelationAddress": [ - "mid_csp_cbf/fsp_corr/03" - ], - "FspID": [ - "3" - ], - "PSSAddress": [ - "mid_csp_cbf/fsp_pss/03" - ], - "PSTAddress": [ - "mid_csp_cbf/fsp_pst/03" - ], - "VLBIAddress": [ - "mid_csp_cbf/fsp_vlbi/03" - ], - "FspSubarray": [ - "mid_csp_cbf/fspSubarray/03_01", - "mid_csp_cbf/fspSubarray/03_02" - ], - "polled_attr": [ - "adminmode", - "1000", - "healthstate", - "1000", - "state", - "1000", - "subarraymembership", - "1000" - ] - } - } - }, - "FspCorr": { - "mid_csp_cbf/fsp_corr/03": {} - }, - "FspPss": { - "mid_csp_cbf/fsp_pss/03": {} - }, - "FspPst": { - "mid_csp_cbf/fsp_pst/03": {} - }, - "FspSubarray": { - "mid_csp_cbf/fspSubarray/03_01": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_01" - ], - "FspID": [ - "3" - ], - "SubID": [ - "1" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - }, - "mid_csp_cbf/fspSubarray/03_02": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_02" - ], - "FspID": [ - "3" - ], - "SubID": [ - "2" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - }, - "mid_csp_cbf/fspSubarray/03_03": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_03" - ], - "FspID": [ - "3" - ], - "SubID": [ - "3" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - } - }, - "FspVlbi": { - "mid_csp_cbf/fsp_vlbi/03": {} - } - }, - "fsp-04": { - "Fsp": { - "mid_csp_cbf/fsp/04": { - "attribute_properties": { - "adminMode": { - "abs_change": [ - "-1", - "1" - ] - }, - "healthState": { - "abs_change": [ - "-1", - "1" - ] - }, - "subarrayMembership": { - "abs_change": [ - "-1", - "1" - ] - } - }, - "properties": { - "CorrelationAddress": [ - "mid_csp_cbf/fsp_corr/04" - ], - "FspID": [ - "4" - ], - "PSSAddress": [ - "mid_csp_cbf/fsp_pss/04" - ], - "PSTAddress": [ - "mid_csp_cbf/fsp_pst/04" - ], - "VLBIAddress": [ - "mid_csp_cbf/fsp_vlbi/04" - ], - "FspSubarray": [ - "mid_csp_cbf/fspSubarray/04_01", - "mid_csp_cbf/fspSubarray/04_02" - ], - "polled_attr": [ - "adminmode", - "1000", - "healthstate", - "1000", - "state", - "1000", - "subarraymembership", - "1000" - ] - } - } - }, - "FspCorr": { - "mid_csp_cbf/fsp_corr/04": {} - }, - "FspPss": { - "mid_csp_cbf/fsp_pss/04": {} - }, - "FspPst": { - "mid_csp_cbf/fsp_pst/04": {} - }, - "FspSubarray": { - "mid_csp_cbf/fspSubarray/04_01": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_01" - ], - "FspID": [ - "4" - ], - "SubID": [ - "1" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - }, - "mid_csp_cbf/fspSubarray/04_02": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_02" - ], - "FspID": [ - "4" - ], - "SubID": [ - "2" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - }, - "mid_csp_cbf/fspSubarray/04_03": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_03" - ], - "FspID": [ - "4" - ], - "SubID": [ - "3" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - } - }, - "FspVlbi": { - "mid_csp_cbf/fsp_vlbi/04": {} - } - } - }, - "VccMulti": { - "vcc-001": { - "Vcc": { - "mid_csp_cbf/vcc/001": { - "attribute_properties": { - "adminMode": { - "abs_change": [ - "-1", - "1" - ] - }, - "healthState": { - "abs_change": [ - "-1", - "1" - ] - }, - "subarrayMembership": { - "abs_change": [ - "-1", - "1" - ] - } - }, - "properties": { - "Band1And2Address": [ - "mid_csp_cbf/vcc_band12/001" - ], - "Band3Address": [ - "mid_csp_cbf/vcc_band3/001" - ], - "Band4Address": [ - "mid_csp_cbf/vcc_band4/001" - ], - "Band5Address": [ - "mid_csp_cbf/vcc_band5/001" - ], - "SW1Address": [ - "mid_csp_cbf/vcc_sw1/001" - ], - "SW2Address": [ - "mid_csp_cbf/vcc_sw2/001" - ], - "VccID": [ - "1" - ], - "polled_attr": [ - "state", - "1000", - "healthstate", - "1000", - "adminmode", - "1000", - "subarraymembership", - "1000" - ] - } - } - }, - "VccBand1And2": { - "mid_csp_cbf/vcc_band12/001": {} - }, - "VccBand3": { - "mid_csp_cbf/vcc_band3/001": {} - }, - "VccBand4": { - "mid_csp_cbf/vcc_band4/001": {} - }, - "VccBand5": { - "mid_csp_cbf/vcc_band5/001": {} - }, - "VccSearchWindow": { - "mid_csp_cbf/vcc_sw1/001": {}, - "mid_csp_cbf/vcc_sw2/001": {} - } - }, - "vcc-002": { - "Vcc": { - "mid_csp_cbf/vcc/002": { - "attribute_properties": { - "adminMode": { - "abs_change": [ - "-1", - "1" - ] - }, - "healthState": { - "abs_change": [ - "-1", - "1" - ] - }, - "subarrayMembership": { - "abs_change": [ - "-1", - "1" - ] - } - }, - "properties": { - "Band1And2Address": [ - "mid_csp_cbf/vcc_band12/002" - ], - "Band3Address": [ - "mid_csp_cbf/vcc_band3/002" - ], - "Band4Address": [ - "mid_csp_cbf/vcc_band4/002" - ], - "Band5Address": [ - "mid_csp_cbf/vcc_band5/002" - ], - "SW1Address": [ - "mid_csp_cbf/vcc_sw1/002" - ], - "SW2Address": [ - "mid_csp_cbf/vcc_sw2/002" - ], - "VccID": [ - "2" - ], - "polled_attr": [ - "state", - "1000", - "healthstate", - "1000", - "adminmode", - "1000", - "subarraymembership", - "1000" - ] - } - } - }, - "VccBand1And2": { - "mid_csp_cbf/vcc_band12/002": {} - }, - "VccBand3": { - "mid_csp_cbf/vcc_band3/002": {} - }, - "VccBand4": { - "mid_csp_cbf/vcc_band4/002": {} - }, - "VccBand5": { - "mid_csp_cbf/vcc_band5/002": {} - }, - "VccSearchWindow": { - "mid_csp_cbf/vcc_sw1/002": {}, - "mid_csp_cbf/vcc_sw2/002": {} - } - }, - "vcc-003": { - "Vcc": { - "mid_csp_cbf/vcc/003": { - "attribute_properties": { - "adminMode": { - "abs_change": [ - "-1", - "1" - ] - }, - "healthState": { - "abs_change": [ - "-1", - "1" - ] - }, - "subarrayMembership": { - "abs_change": [ - "-1", - "1" - ] - } - }, - "properties": { - "Band1And2Address": [ - "mid_csp_cbf/vcc_band12/003" - ], - "Band3Address": [ - "mid_csp_cbf/vcc_band3/003" - ], - "Band4Address": [ - "mid_csp_cbf/vcc_band4/003" - ], - "Band5Address": [ - "mid_csp_cbf/vcc_band5/003" - ], - "SW1Address": [ - "mid_csp_cbf/vcc_sw1/003" - ], - "SW2Address": [ - "mid_csp_cbf/vcc_sw2/003" - ], - "VccID": [ - "3" - ], - "polled_attr": [ - "state", - "1000", - "healthstate", - "1000", - "adminmode", - "1000", - "subarraymembership", - "1000" - ] - } - } - }, - "VccBand1And2": { - "mid_csp_cbf/vcc_band12/003": {} - }, - "VccBand3": { - "mid_csp_cbf/vcc_band3/003": {} - }, - "VccBand4": { - "mid_csp_cbf/vcc_band4/003": {} - }, - "VccBand5": { - "mid_csp_cbf/vcc_band5/003": {} - }, - "VccSearchWindow": { - "mid_csp_cbf/vcc_sw1/003": {}, - "mid_csp_cbf/vcc_sw2/003": {} - } - }, - "vcc-004": { - "Vcc": { - "mid_csp_cbf/vcc/004": { - "attribute_properties": { - "adminMode": { - "abs_change": [ - "-1", - "1" - ] - }, - "healthState": { - "abs_change": [ - "-1", - "1" - ] - }, - "subarrayMembership": { - "abs_change": [ - "-1", - "1" - ] - } - }, - "properties": { - "Band1And2Address": [ - "mid_csp_cbf/vcc_band12/004" - ], - "Band3Address": [ - "mid_csp_cbf/vcc_band3/004" - ], - "Band4Address": [ - "mid_csp_cbf/vcc_band4/004" - ], - "Band5Address": [ - "mid_csp_cbf/vcc_band5/004" - ], - "SW1Address": [ - "mid_csp_cbf/vcc_sw1/004" - ], - "SW2Address": [ - "mid_csp_cbf/vcc_sw2/004" - ], - "VccID": [ - "4" - ], - "polled_attr": [ - "state", - "1000", - "healthstate", - "1000", - "adminmode", - "1000", - "subarraymembership", - "1000" - ] - } - } - }, - "VccBand1And2": { - "mid_csp_cbf/vcc_band12/004": {} - }, - "VccBand3": { - "mid_csp_cbf/vcc_band3/004": {} - }, - "VccBand4": { - "mid_csp_cbf/vcc_band4/004": {} - }, - "VccBand5": { - "mid_csp_cbf/vcc_band5/004": {} - }, - "VccSearchWindow": { - "mid_csp_cbf/vcc_sw1/004": {}, - "mid_csp_cbf/vcc_sw2/004": {} - } - } - }, - "DataBaseds": { - "2": { - "DataBase": { - "sys/database/2": {} - } - } - }, - "TangoAccessControl": { - "1": { - "TangoAccessControl": { - "sys/access_control/1": {} - } - } - }, - "TangoTest": { - "test": { - "TangoTest": { - "sys/tg_test/1": {} - } - } - } - } -} - diff --git a/csp-lmc-mid/charts/csp-proto/templates/_helpers.tpl b/csp-lmc-mid/charts/csp-proto/templates/_helpers.tpl deleted file mode 100644 index 90ccf07..0000000 --- a/csp-lmc-mid/charts/csp-proto/templates/_helpers.tpl +++ /dev/null @@ -1,44 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "csp-proto.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Common labels -*/}} -{{- define "csp-proto.labels" }} -app: {{ template "csp-proto.name" . }} -chart: {{ template "csp-proto.chart" . }} -release: {{ .Release.Name }} -heritage: {{ .Release.Service }} -system: {{ .Values.system }} -telescope: {{ .Values.telescope }} -{{- end }} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "csp-proto.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} -{{- end -}} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "csp-proto.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} diff --git a/csp-lmc-mid/charts/csp-proto/templates/csplmc.yaml b/csp-lmc-mid/charts/csp-proto/templates/csplmc.yaml deleted file mode 100644 index 6457e94..0000000 --- a/csp-lmc-mid/charts/csp-proto/templates/csplmc.yaml +++ /dev/null @@ -1,186 +0,0 @@ -{{ if .Values.csplmc.enabled }} - ---- -# Device Server configurations -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "csp-proto.name" . }}-configuration" - namespace: {{ .Release.Namespace }} - labels: - {{- include "csp-proto.labels" . | indent 4 }} - component: configurator - function: deployment - intent: enabling - domain: self-configuration -data: - cspconfig.json: -{{ (tpl (.Files.Glob "data/cspconfig.json").AsConfig . ) | indent 2 }} - bootstrap.sh: | - #/bin/sh - json2tango -w -a -u data/cspconfig.json - rc=$? - if [ $rc -eq 0 ]; then - echo "finished normally." - exit 0 - else - if [ $rc -eq 2 ]; then - echo "finished with an update." - exit 0 - else - echo "finished with an ERROR." - exit $rc - fi - fi - ---- -# run once Job for loading Device Server config -apiVersion: batch/v1 -kind: Job -metadata: - name: {{ template "csp-proto.name" . }}-configurator - namespace: {{ .Release.Namespace }} - labels: - {{- include "csp-proto.labels" . | indent 4 }} - component: configurator - function: deployment - intent: enabling - domain: self-configuration -spec: - ttlSecondsAfterFinished: 100 - template: - spec: - initContainers: - - name: check-databaseds-ready - image: "{{ .Values.dsconfig.image.registry }}/{{ .Values.dsconfig.image.image }}:{{ .Values.dsconfig.image.tag }}" - imagePullPolicy: {{ .Values.dsconfig.image.pullPolicy }} - command: - - /usr/local/bin/wait-for-it.sh - - {{ if .Values.tangoDatabaseDS -}} {{ .Values.tangoDatabaseDS }}:10000 {{- else -}} databaseds-tango-base-{{ .Release.Name }}:10000 {{- end }} - - --timeout=180 - - --strict - - -- - - echo databaseds ready - containers: - - name: dsconfig - image: "{{ .Values.dsconfig.image.registry }}/{{ .Values.dsconfig.image.image }}:{{ .Values.dsconfig.image.tag }}" - imagePullPolicy: {{ .Values.dsconfig.image.pullPolicy }} - command: # exit code 2 is CONFIG_APPLIED - https://github.com/MaxIV-KitsControls/lib-maxiv-dsconfig/blob/master/dsconfig/utils.py#L11 !!!! this should not be an error !!!! - - sh - - data/bootstrap.sh - env: - - name: TANGO_HOST - value: {{ if .Values.tangoDatabaseDS -}} {{ .Values.tangoDatabaseDS }}:10000 {{- else -}} databaseds-tango-base-{{ .Release.Name }}:10000 {{- end }} - volumeMounts: - - name: configuration - mountPath: data - readOnly: true - volumes: - - name: configuration - configMap: - name: "{{ template "csp-proto.name" . }}-configuration" - restartPolicy: Never - -{{- $global := . }} -{{- range $deviceserver := .Values.deviceServers }} - ---- -# giving a dummy Service entry ensures that the single pod is DNS addressable -apiVersion: v1 -kind: Service -metadata: - name: {{ template "csp-proto.name" $global }}-{{ $deviceserver.name }} - namespace: {{ $global.Release.Namespace }} - labels: - {{- include "csp-proto.labels" $global | indent 4 }} - component: {{ $deviceserver.name }} - function: {{ $deviceserver.function }} - domain: {{ $deviceserver.domain }} - subsystem: {{ $global.Values.subsystem }} - intent: production -spec: - clusterIP: None - ports: - - name: dummy # Actually, no port is needed. - port: 1234 - targetPort: 1234 - selector: - subsystem: {{ $global.Values.subsystem }} - component: {{ $deviceserver.name }} - ---- -# Single Pod separate statefulset per Device Server -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ template "csp-proto.name" $global }}-{{ $deviceserver.name }} - namespace: {{ $global.Release.Namespace }} - labels: - {{- include "csp-proto.labels" $global | indent 4 }} - component: {{ $deviceserver.name }} - function: {{ $deviceserver.function }} - domain: {{ $deviceserver.domain }} - subsystem: {{ $global.Values.subsystem }} - intent: production -spec: - selector: - matchLabels: - component: {{ $deviceserver.name }} - subsystem: {{ $global.Values.subsystem }} - serviceName: {{ template "csp-proto.name" $global }}-{{ $deviceserver.name }} - replicas: 1 - template: - metadata: - labels: - {{- include "csp-proto.labels" $global | indent 8 }} - component: {{ $deviceserver.name }} - function: {{ $deviceserver.function }} - domain: {{ $deviceserver.domain }} - subsystem: {{ $global.Values.subsystem }} - intent: production - cspServer: {{$deviceserver.name}} - spec: - initContainers: - - name: check-databaseds-ready - image: {{ $global.Values.dsconfig.image.registry }}/{{ $global.Values.dsconfig.image.image }}:{{ $global.Values.dsconfig.image.tag }} - imagePullPolicy: {{ $global.Values.dsconfig.image.pullPolicy }} - # 'tango_admin --check-device' will exit 0 once databaseds is alive and the dsconfig job is complete - command: - - retry - - --max=10 - - -- - - tango_admin - - --check-device - - mid_csp/elt/master - env: - - name: TANGO_HOST - value: {{ if $global.Values.tangoDatabaseDS -}} {{ $global.Values.tangoDatabaseDS }}:10000 {{- else -}} databaseds-tango-base-{{ $global.Release.Name }}:10000 {{- end }} - containers: - - name: deviceserver - image: "{{ $global.Values.csplmc.image.registry }}/{{ $global.Values.csplmc.image.image }}:{{ $global.Values.csplmc.image.tag }}" - imagePullPolicy: {{ $global.Values.csplmc.image.pullPolicy }} - command: - - sh - args: -{{ toYaml $deviceserver.args | indent 10 }} - env: - - name: TANGO_HOST - value: {{ if $global.Values.tangoDatabaseDS -}} {{ $global.Values.tangoDatabaseDS }}:10000 {{- else -}} databaseds-tango-base-{{ $global.Release.Name }}:10000 {{- end }} - resources: -{{ toYaml $global.Values.resources | indent 10 }} -{{- with $global.Values.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} -{{- end }} -{{- with $global.Values.affinity }} - affinity: -{{ toYaml . | indent 8 }} -{{- end }} -{{- with $global.Values.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} -{{- end }} - -{{- end }} # end of range - -{{ end }} diff --git a/csp-lmc-mid/charts/csp-proto/values.yaml b/csp-lmc-mid/charts/csp-proto/values.yaml deleted file mode 100644 index 54d34cd..0000000 --- a/csp-lmc-mid/charts/csp-proto/values.yaml +++ /dev/null @@ -1,81 +0,0 @@ -# Default values for csp-proto. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -display: ":0" -xauthority: "~/.Xauthority" - -system: csp -subsystem: csp-lmc -telescope: SKA-mid - -csplmc: - enabled: true - image: - registry: nexus.engageska-portugal.pt/ska-docker - image: mid-csp-lmc - tag: 0.6.9-dev - pullPolicy: IfNotPresent - -deviceServers: - - name: midcapabilitymonitor - function: csp-capability-monitoring - domain: csp-monitoring - args: - - "-c" - - "/venv/bin/python /app/csp_lmc_mid/MidCspCapabilityMonitor.py monitor" - - name: midcspmaster - function: csp-central-control - domain: csp-monitoring - args: - - "-c" - - "retry --max=20 -- tango_admin --ping-device mid_csp_cbf/sub_elt/master &&\ - retry --max=5 -- tango_admin --ping-device mid_csp/capability_monitor/search_beams &&\ - /venv/bin/python /app/csp_lmc_mid/MidCspMaster.py master" - - name: midcspsubarray01 - function: csp-subarray-observation - domain: subarray - args: - - "-c" - - "retry --max=10 -- tango_admin --ping-device mid_csp/elt/master &&\ - retry --max=10 -- tango_admin --ping-device mid_csp_cbf/sub_elt/subarray_01 &&\ - /venv/bin/python /app/csp_lmc_mid/MidCspSubarray.py subarray1" - - name: midcspsubarray02 - function: csp-subarray-observation - domain: subarray - args: - - "-c" - - "retry --max=10 -- tango_admin --ping-device mid_csp/elt/master &&\ - retry --max=10 -- tango_admin --ping-device mid_csp_cbf/sub_elt/subarray_02 &&\ - /venv/bin/python /app/csp_lmc_mid/MidCspSubarray.py subarray2" - - name: midcspsubarray03 - function: csp-subarray-observation - domain: subarray - args: - - "-c" - - "retry --max=10 -- tango_admin --ping-device mid_csp/elt/master &&\ - retry --max=10 -- tango_admin --ping-device mid_csp_cbf/sub_elt/subarray_03 &&\ - /venv/bin/python /app/csp_lmc_mid/MidCspSubarray.py subarray3" - -dsconfig: - image: - registry: nexus.engageska-portugal.pt/ska-docker - image: tango-dsconfig - tag: 1.2.5.1 - pullPolicy: IfNotPresent - -nodeSelector: {} - -affinity: {} - -tolerations: [] - -resources: - requests: - cpu: 150m # 150m = 0.15 CPU - memory: 128Mi # 128Mi = 0.12 GB mem - ephemeral-storage: 256Mi - limits: - cpu: 250m # 250m = 0.25 CPU - memory: 256Mi # 256Mi = 0.25 GB mem - ephemeral-storage: 512Mi diff --git a/csp-lmc-mid/charts/csp-proto/values.yaml.new b/csp-lmc-mid/charts/csp-proto/values.yaml.new deleted file mode 100644 index 9700530..0000000 --- a/csp-lmc-mid/charts/csp-proto/values.yaml.new +++ /dev/null @@ -1,59 +0,0 @@ -# Default values for csp-proto. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -display: ":0" -xauthority: "~/.Xauthority" - - -csplmc: - enabled: true - image: - registry: nexus.engageska-portugal.pt/ska-docker - image: mid-csp-lmc - tag: 0.6.8-452d0a0-dirty - pullPolicy: IfNotPresent - -deviceServers: - - name: midcapabilitymonitor - args: - - "-c" - - "/venv/bin/python /app/csp_lmc_mid/MidCspCapabilityMonitor.py monitor" - - name: midcspmaster - args: - - "-c" - - "retry --max=5 -- tango_admin --ping-device mid_csp/capability_monitor/search_beams &&\ - /venv/bin/python /app/csp_lmc_mid/MidCspMaster.py master" - - name: midcspsubarray01 - args: - - "-c" - - " /venv/bin/python /app/csp_lmc_mid/MidCspSubarray.py subarray1" - - name: midcspsubarray02 - args: - - "-c" - - "/venv/bin/python /app/csp_lmc_mid/MidCspSubarray.py subarray2" - - name: midcspsubarray03 - args: - - "-c" - - "/venv/bin/python /app/csp_lmc_mid/MidCspSubarray.py subarray3" - -dsconfig: - image: - registry: nexus.engageska-portugal.pt/ska-docker - image: tango-dsconfig - tag: 1.2.5.1 - pullPolicy: IfNotPresent - -nodeSelector: {} - -affinity: {} - -tolerations: [] - -resources: - requests: - cpu: 150m # 150m = 0.15 CPU - memory: 128Mi # 128Mi = 0.12 GB mem - limits: - cpu: 250m # 250m = 0.25 CPU - memory: 256Mi # 256Mi = 0.25 GB mem diff --git a/csp-lmc-mid/charts/mid-csp-umbrella/Chart.yaml b/csp-lmc-mid/charts/mid-csp-umbrella/Chart.yaml new file mode 100644 index 0000000..9cbfdb6 --- /dev/null +++ b/csp-lmc-mid/charts/mid-csp-umbrella/Chart.yaml @@ -0,0 +1,15 @@ +apiVersion: v2 +appVersion: 0.6.9 +description: A Helm chart for deploying the whole Mid_CSP prototype on Kubernetes +name: mid-csp +version: 0.1.0 +icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png +dependencies: +- name: tango-base + version: 0.1.2 + repository: https://gitlab.com/ska-telescope/skampi/-/raw/master/repository + condition: tango-base.enabled +- name: csp-proto + version: 0.2.2 + repository: "file://../csp-proto" + condition: csp-proto.enabled diff --git a/csp-lmc-mid/charts/csp-proto/secrets/.gitkeep b/csp-lmc-mid/charts/mid-csp-umbrella/secrets/.gitkeep similarity index 100% rename from csp-lmc-mid/charts/csp-proto/secrets/.gitkeep rename to csp-lmc-mid/charts/mid-csp-umbrella/secrets/.gitkeep diff --git a/csp-lmc-mid/charts/csp-proto/secrets/tls.crt b/csp-lmc-mid/charts/mid-csp-umbrella/secrets/tls.crt similarity index 100% rename from csp-lmc-mid/charts/csp-proto/secrets/tls.crt rename to csp-lmc-mid/charts/mid-csp-umbrella/secrets/tls.crt diff --git a/csp-lmc-mid/charts/csp-proto/secrets/tls.key b/csp-lmc-mid/charts/mid-csp-umbrella/secrets/tls.key similarity index 100% rename from csp-lmc-mid/charts/csp-proto/secrets/tls.key rename to csp-lmc-mid/charts/mid-csp-umbrella/secrets/tls.key diff --git a/csp-lmc-mid/charts/mid-csp-umbrella/values.yaml b/csp-lmc-mid/charts/mid-csp-umbrella/values.yaml new file mode 100644 index 0000000..5048f33 --- /dev/null +++ b/csp-lmc-mid/charts/mid-csp-umbrella/values.yaml @@ -0,0 +1,11 @@ +# Default values for mid-csp. +csp-proto: + csplmc: + enabled: true +cbf-proto: + midcbfmcs: + enabled: true +tango-base: + tangodb: + enabled: true + use_pv: false diff --git a/csp-lmc-mid/charts/mid-csp/Chart.lock b/csp-lmc-mid/charts/mid-csp/Chart.lock deleted file mode 100644 index e6a9d22..0000000 --- a/csp-lmc-mid/charts/mid-csp/Chart.lock +++ /dev/null @@ -1,9 +0,0 @@ -dependencies: -- name: csp-lmc - repository: "file://../csp-proto" - version: 0.5.3 -- name: tango-base - repository: https://gitlab.com/ska-telescope/skampi/-/raw/master/repository - version: 0.1.1 -digest: sha256:9d9ae70d4070c7eba89e967b744e8f37fda46778dd0af3b05e49cb642ae32a36 -generated: "2020-09-04T08:16:47.853296221+02:00" diff --git a/csp-lmc-mid/charts/mid-csp/Chart.yaml b/csp-lmc-mid/charts/mid-csp/Chart.yaml index 9cbfdb6..e4f8d6d 100644 --- a/csp-lmc-mid/charts/mid-csp/Chart.yaml +++ b/csp-lmc-mid/charts/mid-csp/Chart.yaml @@ -1,15 +1,6 @@ -apiVersion: v2 -appVersion: 0.6.9 -description: A Helm chart for deploying the whole Mid_CSP prototype on Kubernetes -name: mid-csp -version: 0.1.0 +apiVersion: v1 +appVersion: "0.6.9" +description: A Helm chart for deploying the Mid_CSP.LMC devices on Kubernetes +name: csp-proto +version: 0.2.2 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png -dependencies: -- name: tango-base - version: 0.1.2 - repository: https://gitlab.com/ska-telescope/skampi/-/raw/master/repository - condition: tango-base.enabled -- name: csp-proto - version: 0.2.2 - repository: "file://../csp-proto" - condition: csp-proto.enabled diff --git a/csp-lmc-mid/charts/mid-csp/charts/cbf-proto/Chart.yaml b/csp-lmc-mid/charts/mid-csp/charts/cbf-proto/Chart.yaml deleted file mode 100644 index d86101a..0000000 --- a/csp-lmc-mid/charts/mid-csp/charts/cbf-proto/Chart.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -appVersion: "1.0" -description: A Helm chart for deploying the CSP_Mid.LMC CBF prototype on Kubernetes -name: cbf-proto -version: 0.4.0 -icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png diff --git a/csp-lmc-mid/charts/mid-csp/charts/cbf-proto/data/midcbfconfig.json b/csp-lmc-mid/charts/mid-csp/charts/cbf-proto/data/midcbfconfig.json deleted file mode 100644 index e2fcaa5..0000000 --- a/csp-lmc-mid/charts/mid-csp/charts/cbf-proto/data/midcbfconfig.json +++ /dev/null @@ -1,1719 +0,0 @@ -{ - "servers": { - "CbfMaster": { - "master": { - "CbfMaster": { - "mid_csp_cbf/sub_elt/master": { - "attribute_properties": { - "adminMode": { - "abs_change": [ - "-1", - "1" - ] - }, - "healthState": { - "abs_change": [ - "-1", - "1" - ] - } - }, - "properties": { - "CbfSubarray": [ - "mid_csp_cbf/sub_elt/subarray_01", - "mid_csp_cbf/sub_elt/subarray_02", - "mid_csp_cbf/sub_elt/subarray_03" - ], - "FSP": [ - "mid_csp_cbf/fsp/01", - "mid_csp_cbf/fsp/02", - "mid_csp_cbf/fsp/03", - "mid_csp_cbf/fsp/04" - ], - "MaxCapabilities": [ - "VCC:4", - "FSP:4", - "Subarray:2" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ], - "polled_attr": [ - "reportfspstate", - "1000", - "reportvccadminmode", - "1000", - "reportvcchealthstate", - "1000", - "receptortovcc", - "1000", - "reportfspCorrSubarraymembership", - "1000", - "reportfsphealthstate", - "1000", - "healthstate", - "1000", - "adminmode", - "1000", - "subarrayconfigid", - "1000", - "reportfspadminmode", - "1000", - "commandprogress", - "2000", - "reportsubarrayhealthstate", - "1000", - "reportvccstate", - "1000", - "reportsubarrayadminmode", - "1000", - "vcctoreceptor", - "3000", - "reportsubarraystate", - "3000", - "state", - "1000" - ] - } - } - } - } - }, - "CbfSubarrayMulti": { - "cbfSubarray-01": { - "CbfSubarray": { - "mid_csp_cbf/sub_elt/subarray_01": { - "attribute_properties": { - "adminMode": { - "abs_change": [ - "-1", - "1" - ] - }, - "healthState": { - "abs_change": [ - "-1", - "1" - ] - }, - "obsState": { - "abs_change": [ - "-1", - "1" - ] - }, - "scanID": { - "abs_change": [ - "-1", - "1" - ] - } - }, - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "FSP": [ - "mid_csp_cbf/fsp/01", - "mid_csp_cbf/fsp/02", - "mid_csp_cbf/fsp/03", - "mid_csp_cbf/fsp/04" - ], - "FspCorrSubarray": [ - "mid_csp_cbf/fspCorrSubarray/01_01", - "mid_csp_cbf/fspCorrSubarray/02_01", - "mid_csp_cbf/fspCorrSubarray/03_01", - "mid_csp_cbf/fspCorrSubarray/04_01" - ], - "FspPssSubarray": [ - "mid_csp_cbf/fspPssSubarray/01_01", - "mid_csp_cbf/fspPssSubarray/02_01", - "mid_csp_cbf/fspPssSubarray/03_01", - "mid_csp_cbf/fspPssSubarray/04_01" - ], - "SW1Address": [ - "mid_csp_cbf/sw1/01" - ], - "SW2Address": [ - "mid_csp_cbf/sw2/01" - ], - "PssConfigAddress": [ - "mid_csp_cbf/pssconfig/01" - ], - "CorrConfigAddress": [ - "mid_csp_cbf/corrconfig/01" - ], - "SubID": [ - "1" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ], - "polled_attr": [ - "healthstate", - "1000", - "fsphealthstate", - "1000", - "fspstate", - "1000", - "vccstate", - "1000", - "vcchealthstate", - "1000", - "configid", - "1000", - "fspList", - "1000", - "outputLinksDistribution", - "1000" - ] - } - } - }, - "SearchWindow": { - "mid_csp_cbf/sw1/01": {}, - "mid_csp_cbf/sw2/01": {} - }, - "CbfSubarrayPssConfig": { - "mid_csp_cbf/pssConfig/01": { - "properties": { - "FspPssSubarray": [ - "mid_csp_cbf/fspPssSubarray/01_01", - "mid_csp_cbf/fspPssSubarray/02_01", - "mid_csp_cbf/fspPssSubarray/03_01", - "mid_csp_cbf/fspPssSubarray/04_01" - ], - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ] - } - } - }, - "CbfSubarrayCorrConfig": { - "mid_csp_cbf/corrConfig/01": { - "properties": { - "FspCorrSubarray": [ - "mid_csp_cbf/fspCorrSubarray/01_01", - "mid_csp_cbf/fspCorrSubarray/02_01", - "mid_csp_cbf/fspCorrSubarray/03_01", - "mid_csp_cbf/fspCorrSubarray/04_01" - ], - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ] - } - } - }, - "SendConfig": { - "mid_csp_cbf/SendConfig/01": { - "properties": { - "SubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_01" - ] - } - } - } - }, - "cbfSubarray-02": { - "CbfSubarray": { - "mid_csp_cbf/sub_elt/subarray_02": { - "attribute_properties": { - "adminMode": { - "abs_change": [ - "-1", - "1" - ] - }, - "healthState": { - "abs_change": [ - "-1", - "1" - ] - }, - "obsState": { - "abs_change": [ - "-1", - "1" - ] - }, - "scanID": { - "abs_change": [ - "-1", - "1" - ] - } - }, - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "FSP": [ - "mid_csp_cbf/fsp/01", - "mid_csp_cbf/fsp/02", - "mid_csp_cbf/fsp/03", - "mid_csp_cbf/fsp/04" - ], - "FspCorrSubarray": [ - "mid_csp_cbf/fspCorrSubarray/01_02", - "mid_csp_cbf/fspCorrSubarray/02_02", - "mid_csp_cbf/fspCorrSubarray/03_02", - "mid_csp_cbf/fspCorrSubarray/04_02" - ], - "FspPssSubarray": [ - "mid_csp_cbf/fspPssSubarray/01_02", - "mid_csp_cbf/fspPssSubarray/02_02", - "mid_csp_cbf/fspPssSubarray/03_02", - "mid_csp_cbf/fspPssSubarray/04_02" - ], - "SW1Address": [ - "mid_csp_cbf/sw1/02" - ], - "SW2Address": [ - "mid_csp_cbf/sw2/02" - ], - "PssConfigAddress": [ - "mid_csp_cbf/pssconfig/02" - ], - "CorrConfigAddress": [ - "mid_csp_cbf/corrconfig/02" - ], - "SubID": [ - "2" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ], - "polled_attr": [ - "configid", - "1000", - "healthstate", - "1000", - "vcchealthstate", - "1000", - "adminmode", - "1000", - "fspstate", - "1000", - "fspList", - "1000", - "fsphealthstate", - "1000", - "vccstate", - "1000", - "outputLinksDistribution", - "1000" - ] - } - } - }, - "SearchWindow": { - "mid_csp_cbf/sw1/02": {}, - "mid_csp_cbf/sw2/02": {} - }, - "CbfSubarrayPssConfig": { - "mid_csp_cbf/pssConfig/02": { - "properties": { - "FspPssSubarray": [ - "mid_csp_cbf/fspPssSubarray/01_02", - "mid_csp_cbf/fspPssSubarray/02_02", - "mid_csp_cbf/fspPssSubarray/03_02", - "mid_csp_cbf/fspPssSubarray/04_02" - ], - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ] - } - } - }, - "CbfSubarrayCorrConfig": { - "mid_csp_cbf/corrConfig/02": { - "properties": { - "FspCorrSubarray": [ - "mid_csp_cbf/fspCorrSubarray/01_02", - "mid_csp_cbf/fspCorrSubarray/02_02", - "mid_csp_cbf/fspCorrSubarray/03_02", - "mid_csp_cbf/fspCorrSubarray/04_02" - ], - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ] - } - } - }, - "SendConfig": { - "mid_csp_cbf/SendConfig/02": { - "properties": { - "SubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_02" - ] - } - } - } - - }, - "cbfSubarray-03": { - "CbfSubarray": { - "mid_csp_cbf/sub_elt/subarray_03": { - "attribute_properties": { - "adminMode": { - "abs_change": [ - "-1", - "1" - ] - }, - "healthState": { - "abs_change": [ - "-1", - "1" - ] - }, - "obsState": { - "abs_change": [ - "-1", - "1" - ] - }, - "scanID": { - "abs_change": [ - "-1", - "1" - ] - } - }, - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "FSP": [ - "mid_csp_cbf/fsp/01", - "mid_csp_cbf/fsp/02", - "mid_csp_cbf/fsp/03", - "mid_csp_cbf/fsp/04" - ], - "FspCorrSubarray": [ - "mid_csp_cbf/fspCorrSubarray/01_03", - "mid_csp_cbf/fspCorrSubarray/02_03", - "mid_csp_cbf/fspCorrSubarray/03_03", - "mid_csp_cbf/fspCorrSubarray/04_03" - ], - "FspPssSubarray": [ - "mid_csp_cbf/fspPssSubarray/01_03", - "mid_csp_cbf/fspPssSubarray/02_03", - "mid_csp_cbf/fspPssSubarray/03_03", - "mid_csp_cbf/fspPssSubarray/04_03" - ], - "SW1Address": [ - "mid_csp_cbf/sw1/03" - ], - "SW2Address": [ - "mid_csp_cbf/sw2/03" - ], - "PssConfigAddress": [ - "mid_csp_cbf/pssconfig/03" - ], - "CorrConfigAddress": [ - "mid_csp_cbf/corrconfig/03" - ], - "SubID": [ - "3" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ], - "polled_attr": [ - "healthstate", - "1000", - "fsphealthstate", - "1000", - "fspstate", - "1000", - "vccstate", - "1000", - "vcchealthstate", - "1000", - "configid", - "1000", - "fspList", - "1000", - "outputLinksDistribution", - "1000" - ] - } - } - }, - "SearchWindow": { - "mid_csp_cbf/sw1/03": {}, - "mid_csp_cbf/sw2/03": {} - }, - "CbfSubarrayPssConfig": { - "mid_csp_cbf/pssConfig/03": { - "properties": { - "FspPssSubarray": [ - "mid_csp_cbf/fspPssSubarray/01_03", - "mid_csp_cbf/fspPssSubarray/02_03", - "mid_csp_cbf/fspPssSubarray/03_03", - "mid_csp_cbf/fspPssSubarray/04_03" - ], - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ] - } - } - }, - "CbfSubarrayCorrConfig": { - "mid_csp_cbf/corrConfig/03": { - "properties": { - "FspCorrSubarray": [ - "mid_csp_cbf/fspCorrSubarray/01_03", - "mid_csp_cbf/fspCorrSubarray/02_03", - "mid_csp_cbf/fspCorrSubarray/03_03", - "mid_csp_cbf/fspCorrSubarray/04_03" - ], - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ] - } - } - }, - "SendConfig": { - "mid_csp_cbf/SendConfig/03": { - "properties": { - "SubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_03" - ] - } - } - } - } - }, - "DataBaseds": { - "2": { - "DataBase": { - "sys/database/2": {} - } - } - }, - "FspMulti": { - "fsp-01": { - "Fsp": { - "mid_csp_cbf/fsp/01": { - "attribute_properties": { - "adminMode": { - "abs_change": [ - "-1", - "1" - ] - }, - "healthState": { - "abs_change": [ - "-1", - "1" - ] - }, - "subarrayMembership": { - "abs_change": [ - "-1", - "1" - ] - } - }, - "properties": { - "CorrelationAddress": [ - "mid_csp_cbf/fsp_corr/01" - ], - "FspID": [ - "1" - ], - "PSSAddress": [ - "mid_csp_cbf/fsp_pss/01" - ], - "PSTAddress": [ - "mid_csp_cbf/fsp_pst/01" - ], - "VLBIAddress": [ - "mid_csp_cbf/fsp_vlbi/01" - ], - "FspCorrSubarray": [ - "mid_csp_cbf/fspCorrSubarray/01_01", - "mid_csp_cbf/fspCorrSubarray/01_02", - "mid_csp_cbf/fspCorrSubarray/01_03" - ], - "FspPssSubarray": [ - "mid_csp_cbf/fspPssSubarray/01_01", - "mid_csp_cbf/fspPssSubarray/01_02", - "mid_csp_cbf/fspPssSubarray/01_03" - ], - "polled_attr": [ - "adminmode", - "1000", - "healthstate", - "1000", - "state", - "1000", - "subarraymembership", - "1000" - ] - } - } - }, - "FspCorr": { - "mid_csp_cbf/fsp_corr/01": {} - }, - "FspPss": { - "mid_csp_cbf/fsp_pss/01": {} - }, - "FspPst": { - "mid_csp_cbf/fsp_pst/01": {} - }, - "FspCorrSubarray": { - "mid_csp_cbf/fspCorrSubarray/01_01": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_01" - ], - "FspID": [ - "1" - ], - "SubID": [ - "1" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - }, - "mid_csp_cbf/fspCorrSubarray/01_02": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_02" - ], - "FspID": [ - "1" - ], - "SubID": [ - "2" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - }, - "mid_csp_cbf/fspCorrSubarray/01_03": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_03" - ], - "FspID": [ - "1" - ], - "SubID": [ - "3" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - } - }, - "FspPssSubarray": { - "mid_csp_cbf/fspPssSubarray/01_01": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_01" - ], - "FspID": [ - "1" - ], - "SubID": [ - "1" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - }, - "mid_csp_cbf/fspPssSubarray/01_02": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_02" - ], - "FspID": [ - "1" - ], - "SubID": [ - "2" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - }, - "mid_csp_cbf/fspPssSubarray/01_03": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_03" - ], - "FspID": [ - "1" - ], - "SubID": [ - "3" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - } - }, - "FspVlbi": { - "mid_csp_cbf/fsp_vlbi/01": {} - } - }, - "fsp-02": { - "Fsp": { - "mid_csp_cbf/fsp/02": { - "attribute_properties": { - "adminMode": { - "abs_change": [ - "-1", - "1" - ] - }, - "healthState": { - "abs_change": [ - "-1", - "1" - ] - }, - "subarrayMembership": { - "abs_change": [ - "-1", - "1" - ] - } - }, - "properties": { - "CorrelationAddress": [ - "mid_csp_cbf/fsp_corr/02" - ], - "FspID": [ - "2" - ], - "PSSAddress": [ - "mid_csp_cbf/fsp_pss/02" - ], - "PSTAddress": [ - "mid_csp_cbf/fsp_pst/02" - ], - "VLBIAddress": [ - "mid_csp_cbf/fsp_vlbi/02" - ], - "FspCorrSubarray": [ - "mid_csp_cbf/fspCorrSubarray/02_01", - "mid_csp_cbf/fspCorrSubarray/02_02", - "mid_csp_cbf/fspCorrSubarray/02_03" - ], - "FspPssSubarray": [ - "mid_csp_cbf/fspPssSubarray/02_01", - "mid_csp_cbf/fspPssSubarray/02_02", - "mid_csp_cbf/fspPssSubarray/02_03" - ], - "polled_attr": [ - "adminmode", - "1000", - "healthstate", - "1000", - "state", - "1000", - "subarraymembership", - "1000" - ] - } - } - }, - "FspCorr": { - "mid_csp_cbf/fsp_corr/02": {} - }, - "FspPss": { - "mid_csp_cbf/fsp_pss/02": {} - }, - "FspPst": { - "mid_csp_cbf/fsp_pst/02": {} - }, - "FspCorrSubarray": { - "mid_csp_cbf/fspCorrSubarray/02_01": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_01" - ], - "FspID": [ - "2" - ], - "SubID": [ - "1" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - }, - "mid_csp_cbf/fspCorrSubarray/02_02": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_02" - ], - "FspID": [ - "2" - ], - "SubID": [ - "2" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - }, - "mid_csp_cbf/fspCorrSubarray/02_03": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_03" - ], - "FspID": [ - "2" - ], - "SubID": [ - "3" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - } - }, - "FspPssSubarray": { - "mid_csp_cbf/fspPssSubarray/02_01": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_01" - ], - "FspID": [ - "2" - ], - "SubID": [ - "1" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - }, - "mid_csp_cbf/fspPssSubarray/02_02": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_02" - ], - "FspID": [ - "2" - ], - "SubID": [ - "2" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - }, - "mid_csp_cbf/fspPssSubarray/02_03": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_03" - ], - "FspID": [ - "2" - ], - "SubID": [ - "3" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - } - }, - "FspVlbi": { - "mid_csp_cbf/fsp_vlbi/02": {} - } - }, - "fsp-03": { - "Fsp": { - "mid_csp_cbf/fsp/03": { - "attribute_properties": { - "adminMode": { - "abs_change": [ - "-1", - "1" - ] - }, - "healthState": { - "abs_change": [ - "-1", - "1" - ] - }, - "subarrayMembership": { - "abs_change": [ - "-1", - "1" - ] - } - }, - "properties": { - "CorrelationAddress": [ - "mid_csp_cbf/fsp_corr/03" - ], - "FspID": [ - "3" - ], - "PSSAddress": [ - "mid_csp_cbf/fsp_pss/03" - ], - "PSTAddress": [ - "mid_csp_cbf/fsp_pst/03" - ], - "VLBIAddress": [ - "mid_csp_cbf/fsp_vlbi/03" - ], - "FspCorrSubarray": [ - "mid_csp_cbf/fspCorrSubarray/03_01", - "mid_csp_cbf/fspCorrSubarray/03_02", - "mid_csp_cbf/fspCorrSubarray/03_03" - ], - "FspPssSubarray": [ - "mid_csp_cbf/fspPssSubarray/03_01", - "mid_csp_cbf/fspPssSubarray/03_02", - "mid_csp_cbf/fspPssSubarray/03_03" - ], - "polled_attr": [ - "adminmode", - "1000", - "healthstate", - "1000", - "state", - "1000", - "subarraymembership", - "1000" - ] - } - } - }, - "FspCorr": { - "mid_csp_cbf/fsp_corr/03": {} - }, - "FspPss": { - "mid_csp_cbf/fsp_pss/03": {} - }, - "FspPst": { - "mid_csp_cbf/fsp_pst/03": {} - }, - "FspCorrSubarray": { - "mid_csp_cbf/fspCorrSubarray/03_01": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_01" - ], - "FspID": [ - "3" - ], - "SubID": [ - "1" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - }, - "mid_csp_cbf/fspCorrSubarray/03_02": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_02" - ], - "FspID": [ - "3" - ], - "SubID": [ - "2" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - }, - "mid_csp_cbf/fspCorrSubarray/03_03": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_03" - ], - "FspID": [ - "3" - ], - "SubID": [ - "3" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - } - }, - "FspPssSubarray": { - "mid_csp_cbf/fspPssSubarray/03_01": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_01" - ], - "FspID": [ - "3" - ], - "SubID": [ - "1" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - }, - "mid_csp_cbf/fspPssSubarray/03_02": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_02" - ], - "FspID": [ - "3" - ], - "SubID": [ - "2" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - }, - "mid_csp_cbf/fspPssSubarray/03_03": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_03" - ], - "FspID": [ - "3" - ], - "SubID": [ - "3" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - } - }, - "FspVlbi": { - "mid_csp_cbf/fsp_vlbi/03": {} - } - }, - "fsp-04": { - "Fsp": { - "mid_csp_cbf/fsp/04": { - "attribute_properties": { - "adminMode": { - "abs_change": [ - "-1", - "1" - ] - }, - "healthState": { - "abs_change": [ - "-1", - "1" - ] - }, - "subarrayMembership": { - "abs_change": [ - "-1", - "1" - ] - } - }, - "properties": { - "CorrelationAddress": [ - "mid_csp_cbf/fsp_corr/04" - ], - "FspID": [ - "4" - ], - "PSSAddress": [ - "mid_csp_cbf/fsp_pss/04" - ], - "PSTAddress": [ - "mid_csp_cbf/fsp_pst/04" - ], - "VLBIAddress": [ - "mid_csp_cbf/fsp_vlbi/04" - ], - "FspCorrSubarray": [ - "mid_csp_cbf/fspCorrSubarray/04_01", - "mid_csp_cbf/fspCorrSubarray/04_02", - "mid_csp_cbf/fspCorrSubarray/04_03" - ], - "FspPssSubarray": [ - "mid_csp_cbf/fspPssSubarray/04_01", - "mid_csp_cbf/fspPssSubarray/04_02", - "mid_csp_cbf/fspPssSubarray/04_03" - ], - "polled_attr": [ - "adminmode", - "1000", - "healthstate", - "1000", - "state", - "1000", - "subarraymembership", - "1000" - ] - } - } - }, - "FspCorr": { - "mid_csp_cbf/fsp_corr/04": {} - }, - "FspPss": { - "mid_csp_cbf/fsp_pss/04": {} - }, - "FspPst": { - "mid_csp_cbf/fsp_pst/04": {} - }, - "FspCorrSubarray": { - "mid_csp_cbf/fspCorrSubarray/04_01": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_01" - ], - "FspID": [ - "4" - ], - "SubID": [ - "1" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - }, - "mid_csp_cbf/fspCorrSubarray/04_02": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_02" - ], - "FspID": [ - "4" - ], - "SubID": [ - "2" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - }, - "mid_csp_cbf/fspCorrSubarray/04_03": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_03" - ], - "FspID": [ - "4" - ], - "SubID": [ - "3" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - } - }, - "FspPssSubarray": { - "mid_csp_cbf/fspPssSubarray/04_01": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_01" - ], - "FspID": [ - "4" - ], - "SubID": [ - "1" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - }, - "mid_csp_cbf/fspPssSubarray/04_02": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_02" - ], - "FspID": [ - "4" - ], - "SubID": [ - "2" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - }, - "mid_csp_cbf/fspPssSubarray/04_03": { - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_03" - ], - "FspID": [ - "4" - ], - "SubID": [ - "3" - ], - "VCC": [ - "mid_csp_cbf/vcc/001", - "mid_csp_cbf/vcc/002", - "mid_csp_cbf/vcc/003", - "mid_csp_cbf/vcc/004" - ] - } - } - }, - "FspVlbi": { - "mid_csp_cbf/fsp_vlbi/04": {} - } - } - }, - "TangoAccessControl": { - "1": { - "TangoAccessControl": { - "sys/access_control/1": {} - } - } - }, - "TangoTest": { - "test": { - "TangoTest": { - "sys/tg_test/1": {} - } - } - }, - "VccMulti": { - "vcc-001": { - "Vcc": { - "mid_csp_cbf/vcc/001": { - "attribute_properties": { - "adminMode": { - "abs_change": [ - "-1", - "1" - ] - }, - "healthState": { - "abs_change": [ - "-1", - "1" - ] - }, - "subarrayMembership": { - "abs_change": [ - "-1", - "1" - ] - } - }, - "properties": { - "Band1And2Address": [ - "mid_csp_cbf/vcc_band12/001" - ], - "Band3Address": [ - "mid_csp_cbf/vcc_band3/001" - ], - "Band4Address": [ - "mid_csp_cbf/vcc_band4/001" - ], - "Band5Address": [ - "mid_csp_cbf/vcc_band5/001" - ], - "SW1Address": [ - "mid_csp_cbf/vcc_sw1/001" - ], - "SW2Address": [ - "mid_csp_cbf/vcc_sw2/001" - ], - "VccID": [ - "1" - ], - "polled_attr": [ - "healthstate", - "1000", - "adminmode", - "1000" - ] - } - } - }, - "VccBand1And2": { - "mid_csp_cbf/vcc_band12/001": {} - }, - "VccBand3": { - "mid_csp_cbf/vcc_band3/001": {} - }, - "VccBand4": { - "mid_csp_cbf/vcc_band4/001": {} - }, - "VccBand5": { - "mid_csp_cbf/vcc_band5/001": {} - }, - "VccSearchWindow": { - "mid_csp_cbf/vcc_sw1/001": {}, - "mid_csp_cbf/vcc_sw2/001": {} - } - }, - "vcc-002": { - "Vcc": { - "mid_csp_cbf/vcc/002": { - "attribute_properties": { - "adminMode": { - "abs_change": [ - "-1", - "1" - ] - }, - "healthState": { - "abs_change": [ - "-1", - "1" - ] - }, - "subarrayMembership": { - "abs_change": [ - "-1", - "1" - ] - } - }, - "properties": { - "Band1And2Address": [ - "mid_csp_cbf/vcc_band12/002" - ], - "Band3Address": [ - "mid_csp_cbf/vcc_band3/002" - ], - "Band4Address": [ - "mid_csp_cbf/vcc_band4/002" - ], - "Band5Address": [ - "mid_csp_cbf/vcc_band5/002" - ], - "SW1Address": [ - "mid_csp_cbf/vcc_sw1/002" - ], - "SW2Address": [ - "mid_csp_cbf/vcc_sw2/002" - ], - "VccID": [ - "2" - ], - "polled_attr": [ - "healthstate", - "1000", - "adminmode", - "1000" - ] - } - } - }, - "VccBand1And2": { - "mid_csp_cbf/vcc_band12/002": {} - }, - "VccBand3": { - "mid_csp_cbf/vcc_band3/002": {} - }, - "VccBand4": { - "mid_csp_cbf/vcc_band4/002": {} - }, - "VccBand5": { - "mid_csp_cbf/vcc_band5/002": {} - }, - "VccSearchWindow": { - "mid_csp_cbf/vcc_sw1/002": {}, - "mid_csp_cbf/vcc_sw2/002": {} - } - }, - "vcc-003": { - "Vcc": { - "mid_csp_cbf/vcc/003": { - "attribute_properties": { - "adminMode": { - "abs_change": [ - "-1", - "1" - ] - }, - "healthState": { - "abs_change": [ - "-1", - "1" - ] - }, - "subarrayMembership": { - "abs_change": [ - "-1", - "1" - ] - } - }, - "properties": { - "Band1And2Address": [ - "mid_csp_cbf/vcc_band12/003" - ], - "Band3Address": [ - "mid_csp_cbf/vcc_band3/003" - ], - "Band4Address": [ - "mid_csp_cbf/vcc_band4/003" - ], - "Band5Address": [ - "mid_csp_cbf/vcc_band5/003" - ], - "SW1Address": [ - "mid_csp_cbf/vcc_sw1/003" - ], - "SW2Address": [ - "mid_csp_cbf/vcc_sw2/003" - ], - "VccID": [ - "3" - ], - "polled_attr": [ - "healthstate", - "1000", - "adminmode", - "1000" - ] - } - } - }, - "VccBand1And2": { - "mid_csp_cbf/vcc_band12/003": {} - }, - "VccBand3": { - "mid_csp_cbf/vcc_band3/003": {} - }, - "VccBand4": { - "mid_csp_cbf/vcc_band4/003": {} - }, - "VccBand5": { - "mid_csp_cbf/vcc_band5/003": {} - }, - "VccSearchWindow": { - "mid_csp_cbf/vcc_sw1/003": {}, - "mid_csp_cbf/vcc_sw2/003": {} - } - }, - "vcc-004": { - "Vcc": { - "mid_csp_cbf/vcc/004": { - "attribute_properties": { - "adminMode": { - "abs_change": [ - "-1", - "1" - ] - }, - "healthState": { - "abs_change": [ - "-1", - "1" - ] - }, - "subarrayMembership": { - "abs_change": [ - "-1", - "1" - ] - } - }, - "properties": { - "Band1And2Address": [ - "mid_csp_cbf/vcc_band12/004" - ], - "Band3Address": [ - "mid_csp_cbf/vcc_band3/004" - ], - "Band4Address": [ - "mid_csp_cbf/vcc_band4/004" - ], - "Band5Address": [ - "mid_csp_cbf/vcc_band5/004" - ], - "SW1Address": [ - "mid_csp_cbf/vcc_sw1/004" - ], - "SW2Address": [ - "mid_csp_cbf/vcc_sw2/004" - ], - "VccID": [ - "4" - ], - "polled_attr": [ - "healthstate", - "1000", - "adminmode", - "1000" - ] - } - } - }, - "VccBand1And2": { - "mid_csp_cbf/vcc_band12/004": {} - }, - "VccBand3": { - "mid_csp_cbf/vcc_band3/004": {} - }, - "VccBand4": { - "mid_csp_cbf/vcc_band4/004": {} - }, - "VccBand5": { - "mid_csp_cbf/vcc_band5/004": {} - }, - "VccSearchWindow": { - "mid_csp_cbf/vcc_sw1/004": {}, - "mid_csp_cbf/vcc_sw2/004": {} - } - } - }, - "TmCspSubarrayLeafNodeTest": { - "tm": { - "TmCspSubarrayLeafNodeTest": { - "ska_mid/tm_leaf_node/csp_subarray01": { - "attribute_properties": { - "dopplerPhaseCorrection": { - "abs_change": [ - "-1", - "1" - ] - } - }, - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_01" - ], - - "polled_attr": [ - "delaymodel", - "1000", - "visdestinationaddress", - "1000", - "dopplerphasecorrection", - "1000" - ] - } - } - } - }, - "tm2": { - "TmCspSubarrayLeafNodeTest": { - "ska_mid/tm_leaf_node/csp_subarray02": { - "attribute_properties": { - "dopplerPhaseCorrection": { - "abs_change": [ - "-1", - "1" - ] - } - }, - "properties": { - "CbfMasterAddress": [ - "mid_csp_cbf/sub_elt/master" - ], - "CbfSubarrayAddress": [ - "mid_csp_cbf/sub_elt/subarray_02" - ], - - "polled_attr": [ - "delaymodel", - "1000", - "visdestinationaddress", - "1000", - "dopplerphasecorrection", - "1000" - ] - } - } - } - } - } - } -} diff --git a/csp-lmc-mid/charts/mid-csp/charts/cbf-proto/secrets/.gitkeep b/csp-lmc-mid/charts/mid-csp/charts/cbf-proto/secrets/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/csp-lmc-mid/charts/mid-csp/charts/cbf-proto/templates/_helpers.tpl b/csp-lmc-mid/charts/mid-csp/charts/cbf-proto/templates/_helpers.tpl deleted file mode 100644 index 4333692..0000000 --- a/csp-lmc-mid/charts/mid-csp/charts/cbf-proto/templates/_helpers.tpl +++ /dev/null @@ -1,43 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "cbf-proto.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{/* -Common labels -*/}} -{{- define "cbf-proto.labels" }} -app: {{ template "cbf-proto.name" . }} -chart: {{ template "cbf-proto.chart" . }} -release: {{ .Release.Name }} -heritage: {{ .Release.Service }} -system: {{ .Values.system }} -subsystem: {{ .Values.subsystem }} -telescope: {{ .Values.telescope }} -{{- end }} -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "cbf-proto.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} -{{- end -}} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "cbf-proto.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} diff --git a/csp-lmc-mid/charts/mid-csp/charts/cbf-proto/templates/midcbf.yaml b/csp-lmc-mid/charts/mid-csp/charts/cbf-proto/templates/midcbf.yaml deleted file mode 100644 index 41dc71f..0000000 --- a/csp-lmc-mid/charts/mid-csp/charts/cbf-proto/templates/midcbf.yaml +++ /dev/null @@ -1,182 +0,0 @@ -{{ if .Values.midcbfmcs.enabled }} - ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "cbf-proto.name" . }}-configuration" - namespace: {{ .Release.Namespace }} - labels: - {{- include "cbf-proto.labels" . | indent 4 }} - component: configurator - function: deployment - intent: enabling - domain: self-configuration -data: - midcbfconfig.json: -{{ (tpl (.Files.Glob "data/midcbfconfig.json").AsConfig . ) | indent 2 }} - bootstrap.sh: | - #/bin/sh - json2tango -w -a -u data/midcbfconfig.json - rc=$? - if [ $rc -eq 0 ]; then - echo "finished normally." - exit 0 - else - if [ $rc -eq 2 ]; then - echo "finished with an update." - exit 0 - else - echo "finished with an ERROR." - exit $rc - fi - fi - ---- -# run once Job for loading Device Server config -apiVersion: batch/v1 -kind: Job -metadata: - name: {{ template "cbf-proto.name" . }}-configurator - namespace: {{ .Release.Namespace }} - labels: - {{- include "cbf-proto.labels" . | indent 4 }} - component: configurator - function: deployment - intent: enabling - domain: self-configuration -spec: - ttlSecondsAfterFinished: 100 - template: - spec: - initContainers: - - name: check-databaseds-ready - image: "{{ .Values.dsconfig.image.registry }}/{{ .Values.dsconfig.image.image }}:{{ .Values.dsconfig.image.tag }}" - imagePullPolicy: {{ .Values.dsconfig.image.pullPolicy }} - command: - - /usr/local/bin/wait-for-it.sh - - {{ if .Values.tangoDatabaseDS -}} {{ .Values.tangoDatabaseDS }}:10000 {{- else -}} databaseds-tango-base-{{ .Release.Name }}:10000 {{- end }} - - --timeout=180 - - --strict - - -- - - echo databaseds ready - containers: - - name: dsconfig - image: "{{ .Values.dsconfig.image.registry }}/{{ .Values.dsconfig.image.image }}:{{ .Values.dsconfig.image.tag }}" - imagePullPolicy: {{ .Values.dsconfig.image.pullPolicy }} - command: # exit code 2 is CONFIG_APPLIED - https://github.com/MaxIV-KitsControls/lib-maxiv-dsconfig/blob/master/dsconfig/utils.py#L11 !!!! this should not be an error !!!! - - sh - - data/bootstrap.sh - env: - - name: TANGO_HOST - value: {{ if .Values.tangoDatabaseDS -}} {{ .Values.tangoDatabaseDS }}:10000 {{- else -}} databaseds-tango-base-{{ .Release.Name }}:10000 {{- end }} - volumeMounts: - - name: configuration - mountPath: data - readOnly: true - volumes: - - name: configuration - configMap: - name: "{{ template "cbf-proto.name" . }}-configuration" - restartPolicy: Never - -{{- $global := . }} -{{- range $deviceserver := .Values.deviceServers }} - ---- -# giving a dummy Service entry ensures that the single pod is DNS addressable -apiVersion: v1 -kind: Service -metadata: - name: {{ template "cbf-proto.name" $global }}-{{ $deviceserver.name }} - namespace: {{ $global.Release.Namespace }} - labels: - {{- include "cbf-proto.labels" $global | indent 4 }} - component: {{ $deviceserver.name }} - function: {{ $deviceserver.function }} - domain: {{ $deviceserver.domain }} - intent: production -spec: - clusterIP: None - ports: - - name: dummy # Actually, no port is needed. - port: 1234 - targetPort: 1234 - selector: - subsystem: {{ $global.Values.subsystem }} - component: {{ $deviceserver.name }} - ---- -# Single Pod separate statefulset per Device Server -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ template "cbf-proto.name" $global }}-{{ $deviceserver.name }} - namespace: {{ $global.Release.Namespace }} - labels: - {{- include "cbf-proto.labels" $global | indent 4 }} - component: {{ $deviceserver.name }} - function: {{ $deviceserver.function }} - domain: {{ $deviceserver.domain }} - intent: production -spec: - selector: - matchLabels: - component: {{ $deviceserver.name }} - subsystem: {{ $global.Values.subsystem }} - serviceName: {{ template "cbf-proto.name" $global }}-{{ $deviceserver.name }} - replicas: 1 - template: - metadata: - labels: - {{- include "cbf-proto.labels" $global | indent 8 }} - component: {{ $deviceserver.name }} - function: {{ $deviceserver.function }} - domain: {{ $deviceserver.domain }} - intent: production - cspServer: {{$deviceserver.name}} - spec: - initContainers: - - name: check-databaseds-ready - image: {{ $global.Values.dsconfig.image.registry }}/{{ $global.Values.dsconfig.image.image }}:{{ $global.Values.dsconfig.image.tag }} - imagePullPolicy: {{ $global.Values.dsconfig.image.pullPolicy }} - # 'tango_admin --check-device' will exit 0 once databaseds is alive and the dsconfig job is complete - command: - - retry - - --max=10 - - -- - - tango_admin - - --check-device - - mid_csp_cbf/sub_elt/master - env: - - name: TANGO_HOST - value: {{ if $global.Values.tangoDatabaseDS -}} {{ $global.Values.tangoDatabaseDS }}:10000 {{- else -}} databaseds-tango-base-{{ $global.Release.Name }}:10000 {{- end }} - containers: - - name: deviceserver - image: "{{ $global.Values.midcbfmcs.image.registry }}/{{ $global.Values.midcbfmcs.image.image }}:{{ $global.Values.midcbfmcs.image.tag }}" - imagePullPolicy: {{ $global.Values.midcbfmcs.image.pullPolicy }} - command: - - sh - args: -{{ toYaml $deviceserver.args | indent 10 }} - env: - - name: TANGO_HOST - value: {{ if $global.Values.tangoDatabaseDS -}} {{ $global.Values.tangoDatabaseDS }}:10000 {{- else -}} databaseds-tango-base-{{ $global.Release.Name }}:10000 {{- end }} - resources: -{{ toYaml $global.Values.resources | indent 10 }} -{{- with $global.Values.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} -{{- end }} -{{- with $global.Values.affinity }} - affinity: -{{ toYaml . | indent 8 }} -{{- end }} -{{- with $global.Values.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} -{{- end }} - -{{- end }} # end of range - -{{ end }} diff --git a/csp-lmc-mid/charts/mid-csp/charts/cbf-proto/values.yaml b/csp-lmc-mid/charts/mid-csp/charts/cbf-proto/values.yaml deleted file mode 100644 index cf475c9..0000000 --- a/csp-lmc-mid/charts/mid-csp/charts/cbf-proto/values.yaml +++ /dev/null @@ -1,155 +0,0 @@ -# Default values for csp-proto. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -display: ":0" -xauthority: "~/.Xauthority" - -system: csp -subsystem: cbfmcs-mid -telescope: SKA-mid - -midcbfmcs: - enabled: true - image: - registry: nexus.engageska-portugal.pt/ska-docker - image: mid-cbf-mcs - tag: 0.4.5-2e83f4c - pullPolicy: IfNotPresent - -dsconfig: - image: - registry: nexus.engageska-portugal.pt/ska-docker - image: tango-dsconfig - tag: 1.2.5.1 - pullPolicy: IfNotPresent - -deviceServers: - - name: cbfmaster - function: cbf-central-control - domain: csp-monitoring - args: - - -c - - "retry --max=10 -- tango_admin --ping-device mid_csp_cbf/vcc/001 &&\ - retry --max=10 -- tango_admin --ping-device mid_csp_cbf/vcc/002 &&\ - retry --max=10 -- tango_admin --ping-device mid_csp_cbf/vcc/003 &&\ - retry --max=10 -- tango_admin --ping-device mid_csp_cbf/vcc/004 &&\ - retry --max=10 -- tango_admin --ping-device mid_csp_cbf/fsp/01 &&\ - retry --max=10 -- tango_admin --ping-device mid_csp_cbf/fsp/02 &&\ - retry --max=10 -- tango_admin --ping-device mid_csp_cbf/fsp/03 &&\ - retry --max=10 -- tango_admin --ping-device mid_csp_cbf/fsp/04 &&\ - /venv/bin/python /app/tangods/CbfMaster/CbfMaster/CbfMaster.py master" - - name: cbfsubarray01 - function: cbf-subarray-observation - domain: subarray - args: - - -c - - "retry --max=5 -- tango_admin --ping-device mid_csp_cbf/sub_elt/master &&\ - /venv/bin/python /app/tangods/CbfSubarray/CbfSubarrayMulti/CbfSubarrayMulti.py cbfSubarray-01" - - name: cbfsubarray02 - function: cbf-subarray-observation - domain: subarray - args: - - -c - - "retry --max=5 -- tango_admin --ping-device mid_csp_cbf/sub_elt/master &&\ - /venv/bin/python /app/tangods/CbfSubarray/CbfSubarrayMulti/CbfSubarrayMulti.py cbfSubarray-02" - - name: cbfsubarray03 - function: cbf-subarray-observation - domain: subarray - args: - - -c - - "retry --max=5 -- tango_admin --ping-device mid_csp_cbf/sub_elt/master &&\ - /venv/bin/python /app/tangods/CbfSubarray/CbfSubarrayMulti/CbfSubarrayMulti.py cbfSubarray-03" - - name: vcc001 - function: coarse-channelisation - domain: sensing - args: - - -c - - "/venv/bin/python /app/tangods/Vcc/VccMulti/VccMulti.py vcc-001" - - name: vcc002 - function: coarse-channelisation - domain: sensing - args: - - -c - - "/venv/bin/python /app/tangods/Vcc/VccMulti/VccMulti.py vcc-002" - - name: vcc003 - function: coarse-channelisation - domain: sensing - args: - - -c - - "/venv/bin/python /app/tangods/Vcc/VccMulti/VccMulti.py vcc-003" - - name: vcc004 - function: coarse-channelisation - domain: sensing - args: - - -c - - "/venv/bin/python /app/tangods/Vcc/VccMulti/VccMulti.py vcc-004" - - name: fsp01 - function: fsp-processing - domain: signal-processing - args: - - -c - - "retry --max=10 -- tango_admin --ping-device mid_csp_cbf/vcc/001 &&\ - retry --max=10 -- tango_admin --ping-device mid_csp_cbf/vcc/002 &&\ - retry --max=10 -- tango_admin --ping-device mid_csp_cbf/vcc/003 &&\ - retry --max=10 -- tango_admin --ping-device mid_csp_cbf/vcc/004 &&\ - /venv/bin/python /app/tangods/Fsp/FspMulti/FspMulti.py fsp-01" - - name: fsp02 - function: fsp-processing - domain: signal-processing - args: - - -c - - "retry --max=10 -- tango_admin --ping-device mid_csp_cbf/vcc/001 &&\ - retry --max=10 -- tango_admin --ping-device mid_csp_cbf/vcc/002 &&\ - retry --max=10 -- tango_admin --ping-device mid_csp_cbf/vcc/003 &&\ - retry --max=10 -- tango_admin --ping-device mid_csp_cbf/vcc/004 &&\ - /venv/bin/python /app/tangods/Fsp/FspMulti/FspMulti.py fsp-02" - - name: fsp03 - function: fsp-processing - domain: signal-processing - args: - - -c - - "retry --max=10 -- tango_admin --ping-device mid_csp_cbf/vcc/001 &&\ - retry --max=10 -- tango_admin --ping-device mid_csp_cbf/vcc/002 &&\ - retry --max=10 -- tango_admin --ping-device mid_csp_cbf/vcc/003 &&\ - retry --max=10 -- tango_admin --ping-device mid_csp_cbf/vcc/004 &&\ - /venv/bin/python /app/tangods/Fsp/FspMulti/FspMulti.py fsp-03" - - name: fsp04 - function: fsp-processing - domain: signal-processing - args: - - -c - - "retry --max=10 -- tango_admin --ping-device mid_csp_cbf/vcc/001 &&\ - retry --max=10 -- tango_admin --ping-device mid_csp_cbf/vcc/002 &&\ - retry --max=10 -- tango_admin --ping-device mid_csp_cbf/vcc/003 &&\ - retry --max=10 -- tango_admin --ping-device mid_csp_cbf/vcc/004 &&\ - /venv/bin/python /app/tangods/Fsp/FspMulti/FspMulti.py fsp-04" - - name: tmcspsubarrayleafnodetest - function: simul-observation - domain: telstate - args: - - -c - - "retry --max=10 -- tango_admin --ping-device mid_csp_cbf/sub_elt/subarray_01 &&\ - /venv/bin/python /app/tangods/TmCspSubarrayLeafNodeTest/TmCspSubarrayLeafNodeTest.py tm" - - name: tmcspsubarrayleafnodetest2 - function: simul-observation - domain: telstate - args: - - -c - - "retry --max=10 -- tango_admin --ping-device mid_csp_cbf/sub_elt/subarray_02 &&\ - /venv/bin/python /app/tangods/TmCspSubarrayLeafNodeTest/TmCspSubarrayLeafNodeTest.py tm2" - - -nodeSelector: {} - -affinity: {} - -tolerations: [] - -resources: - requests: - cpu: 100m # 100m = 0.10 CPU - memory: 128Mi # 128Mi = 0.12 GB mem - limits: - cpu: 200m # 200m = 0.20 CPU - memory: 256Mi # 256Mi = 0.25 GB mem diff --git a/csp-lmc-mid/charts/csp-proto/data/cspconfig.json b/csp-lmc-mid/charts/mid-csp/data/mid-csp-config.json similarity index 100% rename from csp-lmc-mid/charts/csp-proto/data/cspconfig.json rename to csp-lmc-mid/charts/mid-csp/data/mid-csp-config.json diff --git a/csp-lmc-mid/charts/mid-csp/templates/_helpers.tpl b/csp-lmc-mid/charts/mid-csp/templates/_helpers.tpl deleted file mode 100644 index bd04ea7..0000000 --- a/csp-lmc-mid/charts/mid-csp/templates/_helpers.tpl +++ /dev/null @@ -1,62 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "mid-csp.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "mid-csp.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default .Chart.Name .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "mid-csp.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "mid-csp.labels" -}} -helm.sh/chart: {{ include "mid-csp.chart" . }} -{{ include "mid-csp.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "mid-csp.selectorLabels" -}} -app.kubernetes.io/name: {{ include "mid-csp.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "mid-csp.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "mid-csp.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} diff --git a/csp-lmc-mid/charts/mid-csp/values.yaml b/csp-lmc-mid/charts/mid-csp/values.yaml index 5048f33..54d34cd 100644 --- a/csp-lmc-mid/charts/mid-csp/values.yaml +++ b/csp-lmc-mid/charts/mid-csp/values.yaml @@ -1,11 +1,81 @@ -# Default values for mid-csp. -csp-proto: - csplmc: - enabled: true -cbf-proto: - midcbfmcs: - enabled: true -tango-base: - tangodb: - enabled: true - use_pv: false +# Default values for csp-proto. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +display: ":0" +xauthority: "~/.Xauthority" + +system: csp +subsystem: csp-lmc +telescope: SKA-mid + +csplmc: + enabled: true + image: + registry: nexus.engageska-portugal.pt/ska-docker + image: mid-csp-lmc + tag: 0.6.9-dev + pullPolicy: IfNotPresent + +deviceServers: + - name: midcapabilitymonitor + function: csp-capability-monitoring + domain: csp-monitoring + args: + - "-c" + - "/venv/bin/python /app/csp_lmc_mid/MidCspCapabilityMonitor.py monitor" + - name: midcspmaster + function: csp-central-control + domain: csp-monitoring + args: + - "-c" + - "retry --max=20 -- tango_admin --ping-device mid_csp_cbf/sub_elt/master &&\ + retry --max=5 -- tango_admin --ping-device mid_csp/capability_monitor/search_beams &&\ + /venv/bin/python /app/csp_lmc_mid/MidCspMaster.py master" + - name: midcspsubarray01 + function: csp-subarray-observation + domain: subarray + args: + - "-c" + - "retry --max=10 -- tango_admin --ping-device mid_csp/elt/master &&\ + retry --max=10 -- tango_admin --ping-device mid_csp_cbf/sub_elt/subarray_01 &&\ + /venv/bin/python /app/csp_lmc_mid/MidCspSubarray.py subarray1" + - name: midcspsubarray02 + function: csp-subarray-observation + domain: subarray + args: + - "-c" + - "retry --max=10 -- tango_admin --ping-device mid_csp/elt/master &&\ + retry --max=10 -- tango_admin --ping-device mid_csp_cbf/sub_elt/subarray_02 &&\ + /venv/bin/python /app/csp_lmc_mid/MidCspSubarray.py subarray2" + - name: midcspsubarray03 + function: csp-subarray-observation + domain: subarray + args: + - "-c" + - "retry --max=10 -- tango_admin --ping-device mid_csp/elt/master &&\ + retry --max=10 -- tango_admin --ping-device mid_csp_cbf/sub_elt/subarray_03 &&\ + /venv/bin/python /app/csp_lmc_mid/MidCspSubarray.py subarray3" + +dsconfig: + image: + registry: nexus.engageska-portugal.pt/ska-docker + image: tango-dsconfig + tag: 1.2.5.1 + pullPolicy: IfNotPresent + +nodeSelector: {} + +affinity: {} + +tolerations: [] + +resources: + requests: + cpu: 150m # 150m = 0.15 CPU + memory: 128Mi # 128Mi = 0.12 GB mem + ephemeral-storage: 256Mi + limits: + cpu: 250m # 250m = 0.25 CPU + memory: 256Mi # 256Mi = 0.25 GB mem + ephemeral-storage: 512Mi -- GitLab