From f63f9fd50ea56c4f2a3b538e62562fdd66156843 Mon Sep 17 00:00:00 2001 From: Bryant Biggs Date: Thu, 3 Oct 2024 11:05:58 -0500 Subject: [PATCH] chore: Deprecate cloudwatch metrics in favor of moving to upstream repository --- README.md | 3 + stable/aws-cloudwatch-metrics/.helmignore | 23 ---- stable/aws-cloudwatch-metrics/Chart.yaml | 14 --- stable/aws-cloudwatch-metrics/README.md | 43 -------- .../templates/NOTES.txt | 3 - .../templates/_helpers.tpl | 70 ------------ .../templates/clusterrole.yaml | 24 ----- .../templates/clusterrolebinding.yaml | 12 --- .../templates/configmap.yaml | 40 ------- .../templates/daemonset.yaml | 100 ------------------ .../templates/serviceaccount.yaml | 12 --- stable/aws-cloudwatch-metrics/values.yaml | 45 -------- 12 files changed, 3 insertions(+), 386 deletions(-) delete mode 100644 stable/aws-cloudwatch-metrics/.helmignore delete mode 100644 stable/aws-cloudwatch-metrics/Chart.yaml delete mode 100755 stable/aws-cloudwatch-metrics/README.md delete mode 100644 stable/aws-cloudwatch-metrics/templates/NOTES.txt delete mode 100644 stable/aws-cloudwatch-metrics/templates/_helpers.tpl delete mode 100755 stable/aws-cloudwatch-metrics/templates/clusterrole.yaml delete mode 100755 stable/aws-cloudwatch-metrics/templates/clusterrolebinding.yaml delete mode 100755 stable/aws-cloudwatch-metrics/templates/configmap.yaml delete mode 100755 stable/aws-cloudwatch-metrics/templates/daemonset.yaml delete mode 100644 stable/aws-cloudwatch-metrics/templates/serviceaccount.yaml delete mode 100644 stable/aws-cloudwatch-metrics/values.yaml diff --git a/README.md b/README.md index 1e0139865..e9c2cf49e 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,9 @@ helm repo add eks https://aws.github.io/eks-charts ### AWS CloudWatch Metrics +> [!WARNING] +> This Helm chart is now deprecated. Please see the current chart located in the [aws-cloudwatch-metrics](stable/aws-cloudwatch-metrics) repository which is now published on Public ECR + * [aws-cloudwatch-metrics](stable/aws-cloudwatch-metrics): A helm chart for CloudWatch Agent to Collect Cluster Metrics ### AWS for Fluent Bit diff --git a/stable/aws-cloudwatch-metrics/.helmignore b/stable/aws-cloudwatch-metrics/.helmignore deleted file mode 100644 index 0e8a0eb36..000000000 --- a/stable/aws-cloudwatch-metrics/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/stable/aws-cloudwatch-metrics/Chart.yaml b/stable/aws-cloudwatch-metrics/Chart.yaml deleted file mode 100644 index d6ac4d066..000000000 --- a/stable/aws-cloudwatch-metrics/Chart.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -name: aws-cloudwatch-metrics -description: A Helm chart to deploy aws-cloudwatch-metrics project -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: -- https://github.com/aws/eks-charts -keywords: -- eks -- cloudwatch -- cloudwatch-metrics -- containerinsights diff --git a/stable/aws-cloudwatch-metrics/README.md b/stable/aws-cloudwatch-metrics/README.md deleted file mode 100755 index ff0ea14b3..000000000 --- a/stable/aws-cloudwatch-metrics/README.md +++ /dev/null @@ -1,43 +0,0 @@ -# aws-cloudwatch-metrics - -A helm chart for CloudWatch Agent to Collect Cluster Metrics - -## Installing the Chart - -Add the EKS repository to Helm: - -```sh -helm repo add eks https://aws.github.io/eks-charts -``` - -Install or upgrading aws-cloudwatch-metrics chart with default configuration: - -```sh -helm upgrade --install aws-cloudwatch-metrics \ - --namespace amazon-cloudwatch eks/aws-cloudwatch-metrics \ - --set clusterName=my-eks-cluster -``` - -## Configuration - -| Parameter | Description | Default | Required | -| - | - | - | - -| `image.repository` | Image to deploy | `amazon/cloudwatch-agent` | ✔ -| `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` | -| `nodeSelector` | Node labels for pod assignment | {} | -| `tolerations` | Optional deployment tolerations | {} | -| `annotations` | Optional pod annotations | {} | -| `containerdSockPath` | Path to containerd' socket | /run/containerd/containerd.sock | -| `priorityClassName` | Optional priorityClassName | | -| `statsd.enabled` | Whether the cloudwatch agent should listen for statsd metrics | `false` | -| `statsd.port` | The port listening for statsd metrics | `8125` | -| `statsd.protocol` | The protocol used for statsd metrics | `UDP` | -| `statsd.cloudwatch_namespace` | Optional custom Cloudwatch namespace for statsd metrics | | -| `statsd.metrics_aggregation_interval` | Optional cutom metrics aggregation interval for statsd metrics | | -| `statsd.metrics_collection_interval` | Optional custom metrics collection interval for statsd metrics | | diff --git a/stable/aws-cloudwatch-metrics/templates/NOTES.txt b/stable/aws-cloudwatch-metrics/templates/NOTES.txt deleted file mode 100644 index b71108533..000000000 --- a/stable/aws-cloudwatch-metrics/templates/NOTES.txt +++ /dev/null @@ -1,3 +0,0 @@ -{{ .Release.Name }} has been installed or updated. To check the status of pods, run: - -kubectl get pods -l app.kubernetes.io/name: {{ include "aws-cloudwatch-metrics.name" . }} diff --git a/stable/aws-cloudwatch-metrics/templates/_helpers.tpl b/stable/aws-cloudwatch-metrics/templates/_helpers.tpl deleted file mode 100644 index ab4081507..000000000 --- a/stable/aws-cloudwatch-metrics/templates/_helpers.tpl +++ /dev/null @@ -1,70 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "aws-cloudwatch-metrics.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 "aws-cloudwatch-metrics.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 "aws-cloudwatch-metrics.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Common labels -*/}} -{{- define "aws-cloudwatch-metrics.labels" -}} -helm.sh/chart: {{ include "aws-cloudwatch-metrics.chart" . }} -{{ include "aws-cloudwatch-metrics.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end -}} - -{{/* -Selector labels -*/}} -{{- define "aws-cloudwatch-metrics.selectorLabels" -}} -app.kubernetes.io/name: {{ include "aws-cloudwatch-metrics.name" . }} -{{- end -}} - -{{/* -Create the name of the service account to use -*/}} -{{- define "aws-cloudwatch-metrics.serviceAccountName" -}} - {{ default (include "aws-cloudwatch-metrics.fullname" .) .Values.serviceAccount.name }} -{{- end -}} - -{{/* -Create a config section for StatsD ports. -*/}} -{{- define "aws-cloudwatch-metrics.statsdConfig" -}} -{{- if .Values.statsd.enabled -}} -ports: - - containerPort: {{ .Values.statsd.port }} - hostPort: {{ .Values.statsd.port }} - protocol: {{ .Values.statsd.protocol }} -{{ end -}} -{{- end -}} diff --git a/stable/aws-cloudwatch-metrics/templates/clusterrole.yaml b/stable/aws-cloudwatch-metrics/templates/clusterrole.yaml deleted file mode 100755 index be3a6ef51..000000000 --- a/stable/aws-cloudwatch-metrics/templates/clusterrole.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: {{ include "aws-cloudwatch-metrics.fullname" . }} -rules: -- apiGroups: [""] - resources: ["pods", "nodes", "endpoints"] - verbs: ["list", "watch"] -- apiGroups: ["apps"] - resources: ["replicasets", "daemonsets", "deployments", "statefulsets"] - verbs: ["list", "watch"] -- apiGroups: ["batch"] - resources: ["jobs"] - verbs: ["list", "watch"] -- apiGroups: [""] - resources: ["nodes/proxy"] - verbs: ["get"] -- apiGroups: [""] - resources: ["nodes/stats", "configmaps", "events"] - verbs: ["create"] -- apiGroups: [""] - resources: ["configmaps"] - resourceNames: ["cwagent-clusterleader"] - verbs: ["get","update"] diff --git a/stable/aws-cloudwatch-metrics/templates/clusterrolebinding.yaml b/stable/aws-cloudwatch-metrics/templates/clusterrolebinding.yaml deleted file mode 100755 index cf42603dc..000000000 --- a/stable/aws-cloudwatch-metrics/templates/clusterrolebinding.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: {{ include "aws-cloudwatch-metrics.fullname" . }} -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: {{ include "aws-cloudwatch-metrics.fullname" . }} -subjects: -- kind: ServiceAccount - name: {{ include "aws-cloudwatch-metrics.serviceAccountName" . }} - namespace: {{ .Release.Namespace }} diff --git a/stable/aws-cloudwatch-metrics/templates/configmap.yaml b/stable/aws-cloudwatch-metrics/templates/configmap.yaml deleted file mode 100755 index 8710c8d86..000000000 --- a/stable/aws-cloudwatch-metrics/templates/configmap.yaml +++ /dev/null @@ -1,40 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "aws-cloudwatch-metrics.fullname" . }} - labels: - {{- include "aws-cloudwatch-metrics.labels" . | nindent 4 }} -data: - cwagentconfig.json: | - { - "logs": { - "metrics_collected": { - "kubernetes": { - "cluster_name": "{{ .Values.clusterName }}", - "enhanced_container_insights": {{ .Values.enhancedContainerInsights.enabled }}, - "metrics_collection_interval": 60 - } - }, - "force_flush_interval": 5 -{{- if .Values.statsd.enabled }} - }, - "metrics": { - {{- if .Values.statsd.cloudwatch_namespace }} - "namespace": "{{- .Values.statsd.cloudwatch_namespace -}}", - {{- end }} - "metrics_collected": { - "statsd": { - {{- if .Values.statsd.metrics_aggregation_interval }} - "metrics_aggregation_interval": {{ .Values.statsd.metrics_aggregation_interval }}, - {{- end }} - {{- if .Values.statsd.metrics_collection_interval }} - "metrics_collection_interval": {{ .Values.statsd.metrics_collection_interval }}, - {{- end }} - "service_address": ":{{- .Values.statsd.port -}}" - } - } - } -{{- else }} - } -{{- end }} - } diff --git a/stable/aws-cloudwatch-metrics/templates/daemonset.yaml b/stable/aws-cloudwatch-metrics/templates/daemonset.yaml deleted file mode 100755 index 34ab6b007..000000000 --- a/stable/aws-cloudwatch-metrics/templates/daemonset.yaml +++ /dev/null @@ -1,100 +0,0 @@ -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: {{ include "aws-cloudwatch-metrics.fullname" . }} - labels: - {{- include "aws-cloudwatch-metrics.labels" . | nindent 4 }} -spec: - selector: - matchLabels: - {{- include "aws-cloudwatch-metrics.selectorLabels" . | nindent 6 }} - template: - metadata: - labels: - {{- include "aws-cloudwatch-metrics.selectorLabels" . | nindent 8 }} - spec: - serviceAccountName: {{ include "aws-cloudwatch-metrics.serviceAccountName" . }} - hostNetwork: {{ .Values.hostNetwork }} - containers: - - name: {{ .Chart.Name }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - {{- include "aws-cloudwatch-metrics.statsdConfig" . | nindent 8 -}} - # Please don't change below envs - env: - - name: HOST_IP - valueFrom: - fieldRef: - fieldPath: status.hostIP - - name: HOST_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: CI_VERSION - value: "k8s/1.3.9" - # Please don't change the mountPath - volumeMounts: - - name: cwagentconfig - mountPath: /etc/cwagentconfig - - name: rootfs - mountPath: /rootfs - readOnly: true - - name: dockersock - mountPath: /var/run/docker.sock - readOnly: true - - name: varlibdocker - mountPath: /var/lib/docker - readOnly: true - - name: containerdsock - mountPath: /run/containerd/containerd.sock - readOnly: true - - name: sys - mountPath: /sys - readOnly: true - - name: devdisk - mountPath: /dev/disk - readOnly: true - resources: - {{- toYaml .Values.resources | nindent 10 }} - volumes: - - name: cwagentconfig - configMap: - name: {{ include "aws-cloudwatch-metrics.fullname" . }} - - name: rootfs - hostPath: - path: / - - name: dockersock - hostPath: - path: /var/run/docker.sock - - name: varlibdocker - hostPath: - path: /var/lib/docker - - name: containerdsock - hostPath: - path: {{ .Values.containerdSockPath }} - - name: sys - hostPath: - path: /sys - - name: devdisk - hostPath: - path: /dev/disk/ - terminationGracePeriodSeconds: 60 - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- if .Values.priorityClassName }} - priorityClassName: {{ .Values.priorityClassName }} - {{- end }} diff --git a/stable/aws-cloudwatch-metrics/templates/serviceaccount.yaml b/stable/aws-cloudwatch-metrics/templates/serviceaccount.yaml deleted file mode 100644 index 5e2c40988..000000000 --- a/stable/aws-cloudwatch-metrics/templates/serviceaccount.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if .Values.serviceAccount.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "aws-cloudwatch-metrics.serviceAccountName" . }} - labels: - {{- include "aws-cloudwatch-metrics.labels" . | nindent 4 }} - {{- with .Values.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end -}} diff --git a/stable/aws-cloudwatch-metrics/values.yaml b/stable/aws-cloudwatch-metrics/values.yaml deleted file mode 100644 index 0967bb132..000000000 --- a/stable/aws-cloudwatch-metrics/values.yaml +++ /dev/null @@ -1,45 +0,0 @@ -image: - repository: amazon/cloudwatch-agent - tag: 1.300032.2b361 - pullPolicy: IfNotPresent - -clusterName: cluster_name - -enhancedContainerInsights: - enabled: true - -resources: - limits: - cpu: 200m - memory: 200Mi - requests: - cpu: 200m - memory: 200Mi - -serviceAccount: - create: true - name: - -hostNetwork: false - -nodeSelector: {} - -tolerations: [] - -affinity: {} - -# For bottlerocket OS (https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/ContainerInsights-troubleshooting.html#ContainerInsights-troubleshooting-bottlerocket) -# containerdSockPath: /run/dockershim.sock -containerdSockPath: /run/containerd/containerd.sock - -## Assign a PriorityClassName to pods if set -# priorityClassName: - -statsd: - enabled: false - port: 8125 - protocol: UDP - # Overrides default values in the agent configuration if set - # cloudwatch_namespace: - # metrics_aggregation_interval: - # metrics_collection_interval: