feat(common): add me2 region support (#1591)

aroberts87 · web-flow · commit 0061b52d51f4 · 2024-02-12T20:52:36.000Z
diff --git a/charts/admission-controller/Chart.yaml b/charts/admission-controller/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: admission-controller
 description: Sysdig Admission Controller using Sysdig Secure inline image scanner
 type: application
-version: 0.14.24
+version: 0.15.0
 appVersion: 3.9.37
 home: https://sysdiglabs.github.io/admission-controller/
 icon: https://avatars.githubusercontent.com/u/5068817?s=200&v=4
@@ -11,4 +11,4 @@ maintainers:
 dependencies:
   - name: common
     repository: file://../common
-    version: ~1.2.2
+    version: ~1.3.0
diff --git a/charts/admission-controller/README.md b/charts/admission-controller/README.md
@@ -68,7 +68,7 @@ For example:
 
 ```bash
 helm upgrade --install admission-controller sysdig/admission-controller \
-    --create-namespace -n sysdig-admission-controller --version=0.14.24  \
+    --create-namespace -n sysdig-admission-controller --version=0.15.0  \
     --set sysdig.secureAPIToken=YOUR-KEY-HERE,clusterName=YOUR-CLUSTER-NAME
 ```
 
@@ -80,7 +80,7 @@ For example:
 
 ```bash
 helm upgrade --install admission-controller sysdig/admission-controller \
-     --create-namespace -n sysdig-admission-controller --version=0.14.24  \
+     --create-namespace -n sysdig-admission-controller --version=0.15.0  \
     --values values.yaml
 
 ```
diff --git a/charts/agent/Chart.yaml b/charts/agent/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: 12.20.0
 dependencies:
 - name: common
   repository: file://../common
-  version: ~1.2.2
+  version: ~1.3.0
 description: Sysdig Monitor and Secure agent
 home: https://www.sysdig.com/
 icon: https://avatars.githubusercontent.com/u/5068817?s=200&v=4
@@ -30,4 +30,4 @@ sources:
 - https://app.sysdigcloud.com/#/settings/user
 - https://github.com/draios/sysdig
 type: application
-version: 1.19.5
+version: 1.20.0
diff --git a/charts/agent/tests/api_endpoint_region_test.yaml b/charts/agent/tests/api_endpoint_region_test.yaml
@@ -70,6 +70,18 @@ tests:
           path: data['dragent.yaml']
           pattern: .*ingest\.au1\.sysdig\.com.*
 
+  - it: Checking region 'me2'
+    set:
+      global:
+        sysdig:
+          region: me2
+    asserts:
+      - isKind:
+          of: ConfigMap
+      - matchRegex:
+          path: data['dragent.yaml']
+          pattern: .*ingest\.me2\.sysdig\.com.*
+
   - it: Checking region 'au-syd-monitor'
     set:
       global:
diff --git a/charts/cluster-scanner/Chart.yaml b/charts/cluster-scanner/Chart.yaml
@@ -3,7 +3,7 @@ name: cluster-scanner
 description: Sysdig Cluster Scanner
 
 type: application
-version: 0.8.9
+version: 0.9.0
 appVersion: "0.1.0"
 home: https://www.sysdig.com/
 
@@ -13,4 +13,4 @@ dependencies:
   - name: common
     # repository: https://charts.sysdig.com
     repository: file://../common
-    version: ~1.2.2
+    version: ~1.3.0
diff --git a/charts/cluster-scanner/README.md b/charts/cluster-scanner/README.md
@@ -25,7 +25,7 @@ $ pre-commit run -a
 $ helm repo add sysdig https://charts.sysdig.com
 $ helm repo update
 $ helm upgrade --install sysdig-cluster-scanner sysdig/cluster-scanner \
-      --create-namespace -n sysdig --version=0.8.9  \
+      --create-namespace -n sysdig --version=0.9.0  \
       --set global.clusterConfig.name=CLUSTER_NAME \
       --set global.sysdig.region=SYSDIG_REGION \
       --set global.sysdig.accessKey=YOUR-KEY-HERE
@@ -55,7 +55,7 @@ To install the chart with the release name `cluster-scanner`, run:
 
 ```console
 $ helm upgrade --install sysdig-cluster-scanner sysdig/cluster-scanner \
-       --create-namespace -n sysdig --version=0.8.9 \
+       --create-namespace -n sysdig --version=0.9.0 \
        --set global.clusterConfig.name=CLUSTER_NAME \
        --set global.sysdig.region=SYSDIG_REGION \
        --set global.sysdig.accessKey=YOUR-KEY-HERE
@@ -163,7 +163,7 @@ Specify each parameter using the **`--set key=value[,key=value]`** argument to `
 
 ```console
 $ helm upgrade --install sysdig-cluster-scanner sysdig/cluster-scanner \
-    --create-namespace -n sysdig --version=0.8.9 \
+    --create-namespace -n sysdig --version=0.9.0 \
     --set global.sysdig.region="us1"
 ```
 
@@ -172,7 +172,7 @@ installing the chart. For example:
 
 ```console
 $ helm upgrade --install sysdig-cluster-scanner sysdig/cluster-scanner \
-    --create-namespace -n sysdig --version=0.8.9 \
+    --create-namespace -n sysdig --version=0.9.0 \
     --values values.yaml
 ```
 
diff --git a/charts/cluster-scanner/tests/notes_test.yaml b/charts/cluster-scanner/tests/notes_test.yaml
@@ -54,6 +54,15 @@ tests:
       - matchRegexRaw:
           pattern: https://app.au1.sysdig.com
 
+  - it: Checking region 'me2'
+    set:
+      global:
+        sysdig:
+          region: me2
+    asserts:
+      - matchRegexRaw:
+          pattern: https://app.me2.sysdig.com
+
   - it: Checking region 'au-syd-monitor'
     set:
       global:
diff --git a/charts/common/Chart.yaml b/charts/common/Chart.yaml
@@ -16,7 +16,7 @@ type: library
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.2.2
+version: 1.3.0
 
 maintainers:
   - name: AlbertoBarba
diff --git a/charts/common/templates/_regions.tpl b/charts/common/templates/_regions.tpl
@@ -7,6 +7,10 @@
                                    "monitorApiEndpoint" "eu1.app.sysdig.com"
                                    "secureApiEndpoint"  "eu1.app.sysdig.com"
                                    "secureUi"           "eu1.app.sysdig.com/secure")
+                       "me2" (dict "collectorEndpoint"  "ingest.me2.sysdig.com"
+                                   "monitorApiEndpoint" "app.me2.sysdig.com"
+                                   "secureApiEndpoint"  "app.me2.sysdig.com"
+                                   "secureUi"           "app.me2.sysdig.com/secure")
                        "us1" (dict "collectorEndpoint"  "collector.sysdigcloud.com"
                                    "monitorApiEndpoint" "app.sysdigcloud.com"
                                    "secureApiEndpoint"  "secure.sysdig.com"
diff --git a/charts/kspm-collector/Chart.yaml b/charts/kspm-collector/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kspm-collector
 description: Sysdig KSPM collector
 
-version: 0.11.2
+version: 0.12.0
 appVersion: 1.37.1
 
 keywords:
@@ -24,4 +24,4 @@ dependencies:
   - name: common
     # repository: https://charts.sysdig.com
     repository: file://../common
-    version: ~1.2.2
+    version: ~1.3.0
diff --git a/charts/node-analyzer/Chart.yaml b/charts/node-analyzer/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: node-analyzer
 description: Sysdig Node Analyzer
 # currently matching Sysdig's appVersion 1.14.34
-version: 1.22.7
+version: 1.23.0
 appVersion: 12.9.0
 keywords:
   - monitoring
@@ -24,4 +24,4 @@ dependencies:
   - name: common
     # repository: https://charts.sysdig.com
     repository: file://../common
-    version: ~1.2.2
+    version: ~1.3.0
diff --git a/charts/node-analyzer/README.md b/charts/node-analyzer/README.md
@@ -100,7 +100,7 @@ The following table lists the configurable parameters of the Sysdig Node Analyze
 
 | Parameter                                                            | Description                                                                                                                                                                                 | Default                                                                                                                                                               |
 |----------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `global.sysdig.region`                                               | The region where Sysdig Secure is deployed. Valid options are`us1`, `us2`, `us3`, `us4`, `eu1`, `au1`, `custom`.                                                                            | `us1`                                                                                                                                                                 |
+| `global.sysdig.region`                                               | The region where Sysdig Secure is deployed. Valid options are`us1`, `us2`, `us3`, `us4`, `eu1`, `au1`, `me2`, `custom`.                                                                            | `us1`                                                                                                                                                                 |
 | `global.sysdig.tags`                                                 | The list of custom tags to be assigned to the components.                                                                                                                                   | `{}`                                                                                                                                                                  |
 | `global.proxy.httpProxy`                                             | Sets `HTTP_PROXY` on the Node Analyzer containers.                                                                                                                                          | `""`                                                                                                                                                                  |
 | `global.proxy.httpsProxy`                                            | Sets `HTTPS_PROXY` on the Node Analyzer containers.                                                                                                                                         | `""`                                                                                                                                                                  |
diff --git a/charts/node-analyzer/tests/collector_endpoint_region_test.yaml b/charts/node-analyzer/tests/collector_endpoint_region_test.yaml
@@ -70,6 +70,18 @@ tests:
           path: data.collector_endpoint
           value: https://app.au1.sysdig.com
 
+  - it: Checking region 'me2'
+    set:
+      global:
+        sysdig:
+          region: me2
+    asserts:
+      - isKind:
+          of: ConfigMap
+      - equal:
+          path: data.collector_endpoint
+          value: https://app.me2.sysdig.com
+
   - it: Checking region 'au-syd-monitor'
     set:
       global:
diff --git a/charts/rapid-response/Chart.yaml b/charts/rapid-response/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.8.5
+version: 0.9.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -43,4 +43,4 @@ dependencies:
   - name: common
     # repository: https://charts.sysdig.com
     repository: file://../common
-    version: ~1.2.2
+    version: ~1.3.0
diff --git a/charts/sysdig-deploy/Chart.yaml b/charts/sysdig-deploy/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: sysdig-deploy
 description: A chart with various Sysdig components for Kubernetes
 type: application
-version: 1.37.18
+version: 1.38.0
 maintainers:
   - name: AlbertoBarba
     email: alberto.barba@sysdig.com
@@ -20,40 +20,40 @@ dependencies:
   - name: admission-controller
     # repository: https://charts.sysdig.com
     repository: file://../admission-controller
-    version: ~0.14.24
+    version: ~0.15.0
     alias: admissionController
     condition: admissionController.enabled
   - name: agent
     # repository: https://charts.sysdig.com
     repository: file://../agent
-    version: ~1.19.5
+    version: ~1.20.0
     alias: agent
     condition: agent.enabled
   - name: common
     # repository: https://charts.sysdig.com
     repository: file://../common
-    version: ~1.2.2
+    version: ~1.3.0
   - name: node-analyzer
     # repository: https://charts.sysdig.com
     repository: file://../node-analyzer
-    version: ~1.22.7
+    version: ~1.23.0
     alias: nodeAnalyzer
     condition: nodeAnalyzer.enabled
   - name: cluster-scanner
     # repository: https://charts.sysdig.com
     repository: file://../cluster-scanner
-    version: ~0.8.9
+    version: ~0.9.0
     alias: clusterScanner
     condition: clusterScanner.enabled
   - name: kspm-collector
     # repository: https://charts.sysdig.com
     repository: file://../kspm-collector
-    version: ~0.11.2
+    version: ~0.12.0
     alias: kspmCollector
     condition: global.kspm.deploy
   - name: rapid-response
     # repository: https://charts.sysdig.com
     repository: file://../rapid-response
-    version: ~0.8.5
+    version: ~0.9.0
     alias: rapidResponse
     condition: rapidResponse.enabled
diff --git a/charts/sysdig-deploy/README.md b/charts/sysdig-deploy/README.md
@@ -145,7 +145,7 @@ The following table lists the configurable parameters of the sysdig-deploy chart
 | `global.sysdig.accessKeySecret`         | The name of a Kubernetes secret containing an `access-key` entry.                                                     | `""`      |
 | `global.sysdig.secureAPIToken`          | The API Token to access Sysdig Secure.                                                                                  | `""`      |
 | `global.sysdig.secureAPITokenSecret`    | The name of a Kubernetes secret containing API Token to access Sysdig Secure.                                           | `""`      |
-| `global.sysdig.region`                  | The SaaS region for these agents. Possible values: `"us1"`, `"us2"`, `"us3"`, `"us4"`, `"eu1"`, `"au1"`, and `"custom"`. See [Regions and IP Ranges](https://docs.sysdig.com/en/docs/administration/saas-regions-and-ip-ranges/) for more information  | `"us1"`   |
+| `global.sysdig.region`                  | The SaaS region for these agents. Possible values: `"us1"`, `"us2"`, `"us3"`, `"us4"`, `"eu1"`, `"au1"`, `"me2"`, and `"custom"`. See [SaaS Regions and IP Ranges](https://docs.sysdig.com/en/docs/administration/saas-regions-and-ip-ranges/) for more information  | `"us1"`   |
 | `global.sysdig.tags`                    | Sets the global tags which can override agent tags.                                                                     | `{}`      |
 | `global.imageRegistry`                  | The container image registry.                                                                                          | ``        |
 | `global.image.pullSecrets`                  | The global pull secrets.                                                                                          | `[]`        |
diff --git a/charts/sysdig-deploy/tests/notes_test.yaml b/charts/sysdig-deploy/tests/notes_test.yaml
@@ -64,6 +64,17 @@ tests:
       - matchRegexRaw:
           pattern: https://app.au1.sysdig.com/secure/#/data-sources/agents
 
+  - it: Checking region 'me2'
+    set:
+      global:
+        sysdig:
+          region: me2
+    asserts:
+        - matchRegexRaw:
+            pattern: https://app.me2.sysdig.com/#/dashboard-template/view.sysdig.agents\?last=10
+        - matchRegexRaw:
+            pattern: https://app.me2.sysdig.com/secure/#/data-sources/agents
+
   - it: Checking region 'au-syd-monitor'
     set:
       global:
