From f522d05582ac8c32152d8cb53df0a1736ab8946d Mon Sep 17 00:00:00 2001 From: MauAraujo Date: Wed, 7 Aug 2024 15:09:33 +0000 Subject: [PATCH] [create-pull-request] automated change --- addons/aws-cloudwatch-metrics/Chart.yaml | 4 ++-- addons/aws-cloudwatch-metrics/README.md | 1 + addons/aws-cloudwatch-metrics/templates/clusterrole.yaml | 2 +- addons/aws-cloudwatch-metrics/templates/configmap.yaml | 1 + addons/aws-cloudwatch-metrics/values.yaml | 5 ++++- vendored-charts | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/addons/aws-cloudwatch-metrics/Chart.yaml b/addons/aws-cloudwatch-metrics/Chart.yaml index ab789f2a..d6ac4d06 100644 --- a/addons/aws-cloudwatch-metrics/Chart.yaml +++ b/addons/aws-cloudwatch-metrics/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: aws-cloudwatch-metrics description: A Helm chart to deploy aws-cloudwatch-metrics project -version: 0.0.9 -appVersion: "1.247350" +version: 0.0.11 +appVersion: "1.300032.2b361" home: https://github.com/aws/eks-charts icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png sources: diff --git a/addons/aws-cloudwatch-metrics/README.md b/addons/aws-cloudwatch-metrics/README.md index 68550c31..ff0ea14b 100755 --- a/addons/aws-cloudwatch-metrics/README.md +++ b/addons/aws-cloudwatch-metrics/README.md @@ -26,6 +26,7 @@ helm upgrade --install aws-cloudwatch-metrics \ | `image.tag` | Image tag to deploy | `1.247345.36b249270` | `image.pullPolicy` | Pull policy for the image | `IfNotPresent` | ✔ | `clusterName` | Name of your cluster | `cluster_name` | ✔ +| `enhancedContainerInsights` | EKS cluster with enhanced monitoring | `true` | | `serviceAccount.create` | Whether a new service account should be created | `true` | | `serviceAccount.name` | Service account to be used | | | `hostNetwork` | Allow to use the network namespace and network resources of the node | `false` | diff --git a/addons/aws-cloudwatch-metrics/templates/clusterrole.yaml b/addons/aws-cloudwatch-metrics/templates/clusterrole.yaml index 95ead173..be3a6ef5 100755 --- a/addons/aws-cloudwatch-metrics/templates/clusterrole.yaml +++ b/addons/aws-cloudwatch-metrics/templates/clusterrole.yaml @@ -7,7 +7,7 @@ rules: resources: ["pods", "nodes", "endpoints"] verbs: ["list", "watch"] - apiGroups: ["apps"] - resources: ["replicasets"] + resources: ["replicasets", "daemonsets", "deployments", "statefulsets"] verbs: ["list", "watch"] - apiGroups: ["batch"] resources: ["jobs"] diff --git a/addons/aws-cloudwatch-metrics/templates/configmap.yaml b/addons/aws-cloudwatch-metrics/templates/configmap.yaml index bf7b6d64..8710c8d8 100755 --- a/addons/aws-cloudwatch-metrics/templates/configmap.yaml +++ b/addons/aws-cloudwatch-metrics/templates/configmap.yaml @@ -11,6 +11,7 @@ data: "metrics_collected": { "kubernetes": { "cluster_name": "{{ .Values.clusterName }}", + "enhanced_container_insights": {{ .Values.enhancedContainerInsights.enabled }}, "metrics_collection_interval": 60 } }, diff --git a/addons/aws-cloudwatch-metrics/values.yaml b/addons/aws-cloudwatch-metrics/values.yaml index ad58cd19..0967bb13 100644 --- a/addons/aws-cloudwatch-metrics/values.yaml +++ b/addons/aws-cloudwatch-metrics/values.yaml @@ -1,10 +1,13 @@ image: repository: amazon/cloudwatch-agent - tag: 1.247350.0b251780 + tag: 1.300032.2b361 pullPolicy: IfNotPresent clusterName: cluster_name +enhancedContainerInsights: + enabled: true + resources: limits: cpu: 200m diff --git a/vendored-charts b/vendored-charts index 7fd8c0ac..2265de29 100644 --- a/vendored-charts +++ b/vendored-charts @@ -12,6 +12,7 @@ addons/elasticache-chart addons/emrcontainers-chart addons/eventbridge-chart addons/iam-chart +addons/keda-http-add-onaddons/aws-cloudwatch-metrics addons/kms-chart addons/lambda-chart addons/memorydb-chart @@ -25,4 +26,3 @@ addons/sagemaker-chart addons/sfn-chart addons/sns-chart addons/sqs-chart -addons/keda-http-add-on \ No newline at end of file