Skip to content

Commit 8108950

Browse files
AlbertoBarbaAlbertoBarba
committed
feat(shield): add support for ca-mon and eu2 regions
1 parent 1973ead commit 8108950

File tree

3 files changed

+118
-4
lines changed

3 files changed

+118
-4
lines changed

‎charts/shield/templates/common/_regions.tpl

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@
1515
"monitor_api_endpoint" "eu1.app.sysdig.com"
1616
"secure_api_endpoint" "eu1.app.sysdig.com"
1717
"secure_ui" "eu1.app.sysdig.com/secure")
18+
"eu2" (dict "collector_endpoint" "ingest.eu2.sysdig.com"
19+
"monitor_api_endpoint" "app.eu2.sysdig.com"
20+
"secure_api_endpoint" "app.eu2.sysdig.com"
21+
"secure_ui" "app.eu2.sysdig.com/secure")
22+
"eu2-alt" (dict "collector_endpoint" "ingest-alt.eu2.sysdig.com"
23+
"monitor_api_endpoint" "app.eu2.sysdig.com"
24+
"secure_api_endpoint" "app.eu2.sysdig.com"
25+
"secure_ui" "app.eu2.sysdig.com/secure")
1826
"in1" (dict "collector_endpoint" "ingest.in1.sysdig.com"
1927
"monitor_api_endpoint" "app.in1.sysdig.com"
2028
"secure_api_endpoint" "app.in1.sysdig.com"
@@ -71,6 +79,10 @@
7179
"monitor_api_endpoint" "br-sao.monitoring.cloud.ibm.com"
7280
"secure_api_endpoint" "br-sao.security-compliance-secure.cloud.ibm.com"
7381
"secure_ui" "br-sao.security-compliance-secure.cloud.ibm.com")
82+
"ca-mon-monitor" (dict "collector_endpoint" "ingest.ca-mon.monitoring.cloud.ibm.com"
83+
"monitor_api_endpoint" "ca-mon.monitoring.cloud.ibm.com"
84+
"secure_api_endpoint" "ca-mon.security-compliance-secure.cloud.ibm.com"
85+
"secure_ui" "ca-mon.security-compliance-secure.cloud.ibm.com")
7486
"ca-tor-monitor" (dict "collector_endpoint" "ingest.ca-tor.monitoring.cloud.ibm.com"
7587
"monitor_api_endpoint" "ca-tor.monitoring.cloud.ibm.com"
7688
"secure_api_endpoint" "ca-tor.security-compliance-secure.cloud.ibm.com"
@@ -107,6 +119,10 @@
107119
"monitor_api_endpoint" "private.br-sao.monitoring.cloud.ibm.com"
108120
"secure_api_endpoint" "private.br-sao.security-compliance-secure.cloud.ibm.com"
109121
"secure_ui" "private.br-sao.security-compliance-secure.cloud.ibm.com")
122+
"ca-mon-private-monitor" (dict "collector_endpoint" "ingest.private.ca-mon.monitoring.cloud.ibm.com"
123+
"monitor_api_endpoint" "private.ca-mon.monitoring.cloud.ibm.com"
124+
"secure_api_endpoint" "private.ca-mon.security-compliance-secure.cloud.ibm.com"
125+
"secure_ui" "private.ca-mon.security-compliance-secure.cloud.ibm.com")
110126
"ca-tor-private-monitor" (dict "collector_endpoint" "ingest.private.ca-tor.monitoring.cloud.ibm.com"
111127
"monitor_api_endpoint" "private.ca-tor.monitoring.cloud.ibm.com"
112128
"secure_api_endpoint" "private.ca-tor.security-compliance-secure.cloud.ibm.com"
@@ -143,6 +159,10 @@
143159
"monitor_api_endpoint" "br-sao.monitoring.cloud.ibm.com"
144160
"secure_api_endpoint" "br-sao.security-compliance-secure.cloud.ibm.com"
145161
"secure_ui" "br-sao.security-compliance-secure.cloud.ibm.com")
162+
"ca-mon-secure" (dict "collector_endpoint" "ingest.ca-mon.security-compliance-secure.cloud.ibm.com"
163+
"monitor_api_endpoint" "ca-mon.monitoring.cloud.ibm.com"
164+
"secure_api_endpoint" "ca-mon.security-compliance-secure.cloud.ibm.com"
165+
"secure_ui" "ca-mon.security-compliance-secure.cloud.ibm.com")
146166
"ca-tor-secure" (dict "collector_endpoint" "ingest.ca-tor.security-compliance-secure.cloud.ibm.com"
147167
"monitor_api_endpoint" "ca-tor.monitoring.cloud.ibm.com"
148168
"secure_api_endpoint" "ca-tor.security-compliance-secure.cloud.ibm.com"
@@ -179,6 +199,10 @@
179199
"monitor_api_endpoint" "private.br-sao.monitoring.cloud.ibm.com"
180200
"secure_api_endpoint" "private.br-sao.security-compliance-secure.cloud.ibm.com"
181201
"secure_ui" "private.br-sao.security-compliance-secure.cloud.ibm.com")
202+
"ca-mon-private-secure" (dict "collector_endpoint" "ingest.private.ca-mon.security-compliance-secure.cloud.ibm.com"
203+
"monitor_api_endpoint" "private.ca-mon.monitoring.cloud.ibm.com"
204+
"secure_api_endpoint" "private.ca-mon.security-compliance-secure.cloud.ibm.com"
205+
"secure_ui" "private.ca-mon.security-compliance-secure.cloud.ibm.com")
182206
"ca-tor-private-secure" (dict "collector_endpoint" "ingest.private.ca-tor.security-compliance-secure.cloud.ibm.com"
183207
"monitor_api_endpoint" "private.ca-tor.monitoring.cloud.ibm.com"
184208
"secure_api_endpoint" "private.ca-tor.security-compliance-secure.cloud.ibm.com"
@@ -250,6 +274,7 @@
250274
{{- $altRegions := list
251275
"au1-alt"
252276
"eu1-alt"
277+
"eu2-alt"
253278
"in1-alt"
254279
"me2-alt"
255280
"us1-alt"

‎charts/shield/tests/common/regions_test.yaml

Lines changed: 87 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,112 @@
11
suite: Common - Regions
22
templates:
33
- templates/host/configmap.yaml
4+
- templates/cluster/configmap.yaml
5+
- templates/host/configmap-windows.yaml
46
release:
57
name: release-name
68
namespace: shield-namespace
79
values:
810
- ../values/base.yaml
911
tests:
10-
- it: Sanity check for regions
12+
- it: Sanity check for regions (host)
1113
set:
1214
sysdig_endpoint:
1315
region: "eu1"
16+
template: host/configmap.yaml
1417
asserts:
1518
- matchRegex:
1619
path: data["dragent.yaml"]
1720
pattern: |
1821
collector: ingest-eu1.app.sysdig.com
1922
collector_port: 6443
23+
- matchRegex:
24+
path: data["dragent.yaml"]
25+
pattern: |
26+
sysdig_api_endpoint: eu1.app.sysdig.com
2027
21-
- it: API endpoint validation
28+
- it: Sanity check for alternate regions (host)
2229
set:
2330
sysdig_endpoint:
24-
region: "us1"
31+
region: "eu1-alt"
32+
template: host/configmap.yaml
2533
asserts:
2634
- matchRegex:
2735
path: data["dragent.yaml"]
2836
pattern: |
29-
sysdig_api_endpoint: secure.sysdig.com
37+
collector: ingest-alt-eu1.app.sysdig.com
38+
collector_port: 443
39+
- matchRegex:
40+
path: data["dragent.yaml"]
41+
pattern: |
42+
sysdig_api_endpoint: eu1.app.sysdig.com
43+
44+
- it: Sanity check for regions (cluster)
45+
set:
46+
sysdig_endpoint:
47+
region: "eu1"
48+
api_url:
49+
collector:
50+
host:
51+
port:
52+
template: cluster/configmap.yaml
53+
asserts:
54+
- matchRegex:
55+
path: data["cluster-shield.yaml"]
56+
pattern: |
57+
sysdig_endpoint:
58+
region: eu1
59+
60+
- it: Sanity check for alternate regions (cluster)
61+
set:
62+
sysdig_endpoint:
63+
region: "eu1-alt"
64+
api_url:
65+
collector:
66+
host:
67+
port:
68+
template: cluster/configmap.yaml
69+
asserts:
70+
- matchRegex:
71+
path: data["cluster-shield.yaml"]
72+
pattern: |
73+
sysdig_endpoint:
74+
region: eu1-alt
75+
76+
- it: Sanity check for regions (host-windows)
77+
set:
78+
host_windows:
79+
enabled: true
80+
sysdig_endpoint:
81+
region: "eu1"
82+
api_url:
83+
collector:
84+
host:
85+
port:
86+
template: host/configmap-windows.yaml
87+
asserts:
88+
- matchRegex:
89+
path: data["host-shield.yaml"]
90+
pattern: |
91+
sysdig_endpoint:
92+
collector: {}
93+
region: eu1
94+
95+
- it: Sanity check for alternate regions (host-windows)
96+
set:
97+
host_windows:
98+
enabled: true
99+
sysdig_endpoint:
100+
region: "eu1-alt"
101+
api_url:
102+
collector:
103+
host:
104+
port:
105+
template: host/configmap-windows.yaml
106+
asserts:
107+
- matchRegex:
108+
path: data["host-shield.yaml"]
109+
pattern: |
110+
sysdig_endpoint:
111+
collector: {}
112+
region: eu1-alt

‎charts/shield/values.schema.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,10 @@
179179
"br-sao-private-monitor",
180180
"br-sao-private-secure",
181181
"br-sao-secure",
182+
"ca-mon-monitor",
183+
"ca-mon-private-monitor",
184+
"ca-mon-private-secure",
185+
"ca-mon-secure",
182186
"ca-tor-monitor",
183187
"ca-tor-private-monitor",
184188
"ca-tor-private-secure",
@@ -193,6 +197,8 @@
193197
"eu-gb-secure",
194198
"eu1",
195199
"eu1-alt",
200+
"eu2",
201+
"eu2-alt",
196202
"in1",
197203
"in1-alt",
198204
"jp-osa-monitor",

0 commit comments

Comments
 (0)