Merge pull request #139 from kooomix/aksVars

added aks cloudProvider support
kubescape · Apr 17, 2023 · 0c52be3 · 0c52be3
2 parents eeba017 + 88bac14
commit 0c52be3
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 16 deletions.
diff --git a/charts/kubescape-cloud-operator/Chart.yaml b/charts/kubescape-cloud-operator/Chart.yaml
@@ -9,14 +9,14 @@ type: application
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 
-version: 1.10.9
+version: 1.10.10
 
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 
-appVersion: 1.10.9
+appVersion: 1.10.10
 
 maintainers:
 - name: Ben Hirschberg

diff --git a/charts/kubescape-cloud-operator/README.md b/charts/kubescape-cloud-operator/README.md
@@ -195,12 +195,12 @@ docker-compose logs uptrace
 | awsIamRoleArn | string | `nil` | AWS IAM arn role |
 | clientID | string | `""` | client ID, [read more](https://hub.armosec.io/docs/authentication) |
 | addRevisionLabel | bool | `true` | Add revision label to the components. This will insure the components will restart when updating the helm |
-| cloudRegion | string | `nil` | cloud region |
-| cloudProviderEngine | string | `nil` | cloud provider engine |
-| gkeProject | string | `nil` | GKE project |
-| gkeServiceAccount | string | `nil` | GKE service account |
-| aksSubscriptionID | string | `nil` | AKS subscription ID |
-| aksResourceGroup | string | `nil` | AKS resource group |
+| cloudProviderMetadata.cloudRegion | string | `nil` | cloud region |
+| cloudProviderMetadata.cloudProviderEngine | string | `nil` | cloud provider engine |
+| cloudProviderMetadata.gkeProject | string | `nil` | GKE project |
+| cloudProviderMetadata.gkeServiceAccount | string | `nil` | GKE service account |
+| cloudProviderMetadata.aksSubscriptionID | string | `nil` | AKS subscription ID |
+| cloudProviderMetadata.aksResourceGroup | string | `nil` | AKS resource group |
 | secretKey | string | `""` | secret key, [read more](https://hub.armosec.io/docs/authentication) |
 | triggerNewImageScan | bool | `false` | enable/disable trigger image scan for new images |
 | volumes | object | `[]` | Additional volumes for all containers |

diff --git a/charts/kubescape-cloud-operator/templates/_helpers.tpl b/charts/kubescape-cloud-operator/templates/_helpers.tpl
@@ -6,6 +6,8 @@
 eks
     {{- else if or (contains "gke" $provider) (contains "gcp" $provider) (contains "google" $provider) -}}
 gke
+    {{- else if or (contains "aks" $provider) (contains "azure" $provider) (contains "microsoft" $provider) -}}
+aks
     {{- end -}}
   {{- end -}}
 {{- end }}

diff --git a/charts/kubescape-prometheus-integrator/Chart.yaml b/charts/kubescape-prometheus-integrator/Chart.yaml
@@ -5,9 +5,9 @@ description:
 
 type: application
 
-version: 0.0.10
+version: 0.0.11
 
-appVersion: "v0.0.10"
+appVersion: "v0.0.11"
 
 maintainers:
 - name: Ben Hirschberg

diff --git a/charts/kubescape-prometheus-integrator/README.md b/charts/kubescape-prometheus-integrator/README.md
@@ -130,12 +130,12 @@ However, we recommend that you give Kubescape no less than 500m CPU no matter th
 | kubescapeHostScanner.volumes | object | `[]` | Additional volumes for the host scanner |
 | kubescapeHostScanner.volumeMounts | object | `[]` | Additional volumeMounts for the host scanner |
 | awsIamRoleArn | string | `nil` | AWS IAM arn role |
-| cloudRegion | string | `nil` | cloud region |
-| cloudProviderEngine | string | `nil` | cloud provider engine |
-| gkeProject | string | `nil` | GKE project |
-| gkeServiceAccount | string | `nil` | GKE service account |
-| aksSubscriptionID | string | `nil` | AKS subscription ID |
-| aksResourceGroup | string | `nil` | AKS resource group |
+| cloudProviderMetadata.cloudRegion | string | `nil` | cloud region |
+| cloudProviderMetadata.cloudProviderEngine | string | `nil` | cloud provider engine |
+| cloudProviderMetadata.gkeProject | string | `nil` | GKE project |
+| cloudProviderMetadata.gkeServiceAccount | string | `nil` | GKE service account |
+| cloudProviderMetadata.aksSubscriptionID | string | `nil` | AKS subscription ID |
+| cloudProviderMetadata.aksResourceGroup | string | `nil` | AKS resource group |
 | volumes | object | `[]` | Additional volumes for all containers |
 | volumeMounts | object | `[]` | Additional volumeMounts for all containers |
 
diff --git a/charts/kubescape-prometheus-integrator/templates/_helpers.tpl b/charts/kubescape-prometheus-integrator/templates/_helpers.tpl
@@ -6,6 +6,8 @@
 eks
     {{- else if or (contains "gke" $provider) (contains "gcp" $provider) (contains "google" $provider) -}}
 gke
+    {{- else if or (contains "aks" $provider) (contains "azure" $provider) (contains "microsoft" $provider) -}}
+aks
     {{- end -}}
   {{- end -}}
 {{- end -}}