From b9861332dfce4919929f6189adff60f9c2efdd25 Mon Sep 17 00:00:00 2001 From: Khanh Nguyen <91758108+khanhntd@users.noreply.github.com> Date: Wed, 15 Mar 2023 15:55:13 -0400 Subject: [PATCH] Increment k8s version with cloudwatch agent for releasing (#127) --- .github/PULL_REQUEST_TEMPLATE.md | 6 ++--- container-insights-manifest-update.sh | 26 +++++++++---------- .../cwagent-ecs-instance-metric-cfn.json | 2 +- .../cwagent-ecs-instance-metric.json | 2 +- ...gent-ecs-prometheus-metric-for-awsvpc.yaml | 2 +- ...ecs-prometheus-metric-for-bridge-host.yaml | 2 +- .../cwagent-prometheus-task-definition.json | 2 +- .../cwagent/cwagent-daemonset.yaml | 4 +-- .../fluent-bit/fluent-bit-compatible.yaml | 2 +- .../fluent-bit/fluent-bit.yaml | 2 +- .../fluentd/fluentd.yaml | 2 +- .../cwagent-fluent-bit-quickstart.yaml | 6 ++--- .../cwagent-fluentd-quickstart.yaml | 6 ++--- .../prometheus-eks-fargate.yaml | 4 +-- .../cwagent-prometheus/prometheus-eks.yaml | 4 +-- .../cwagent-prometheus/prometheus-k8s.yaml | 4 +-- .../cwagent-daemonset.yaml | 2 +- k8s-yaml-templates/fluentd/fluentd.yaml | 2 +- .../cwagent-fluentd-quickstart.yaml | 6 ++--- 19 files changed, 43 insertions(+), 43 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 6bdaa99..1e1b327 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,6 +1,6 @@ -*Issue #, if available:* - -*Description of changes:* +# Issue +# Description of changes: +# License By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice. diff --git a/container-insights-manifest-update.sh b/container-insights-manifest-update.sh index f6d9c4d..c9508f4 100755 --- a/container-insights-manifest-update.sh +++ b/container-insights-manifest-update.sh @@ -4,8 +4,8 @@ cd "$(dirname "$0")" k8sDirPrefix="./k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring" ecsDirPrefix="./ecs-task-definition-templates/deployment-mode/daemon-service/cwagent-ecs-instance-metric" -newK8sVersion="k8s/1.3.12" -agentVersion="public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.247357.0b252275" +newK8sVersion="k8s/1.3.13" +agentVersion="public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.247358.0b252413" fluentdVersion="fluent/fluentd-kubernetes-daemonset:v1.7.3-debian-cloudwatch-1.0" fluentBitVersion="public.ecr.aws/aws-observability/aws-for-fluent-bit:stable" @@ -13,40 +13,40 @@ k8sPrometheusDirPrefix="./k8s-deployment-manifest-templates/deployment-mode/serv ecsPrometheusDirPrefix="./ecs-task-definition-templates/deployment-mode/replica-service/cwagent-prometheus" # replace agent version for ECS Prometheus -sed -i'.bak' "s|public\.ecr\.aws/cloudwatch-agent/cloudwatch-agent:[0-9]*\.[0-9]*\.[0-9a-z]*\(-prometheus\)\?|${agentVersion}|g" ${ecsPrometheusDirPrefix}/cwagent-prometheus-task-definition.json +sed -i'.bak' "s|public\.ecr\.aws/cloudwatch-agent/cloudwatch-agent:[0-9]*\.[0-9]*\.[0-9a-z]*|${agentVersion}|g" ${ecsPrometheusDirPrefix}/cwagent-prometheus-task-definition.json rm ${ecsPrometheusDirPrefix}/cwagent-prometheus-task-definition.json.bak -sed -i'.bak' "s|public\.ecr\.aws/cloudwatch-agent/cloudwatch-agent:[0-9]*\.[0-9]*\.[0-9a-z]*\(-prometheus\)\?|${agentVersion}|g" ${ecsPrometheusDirPrefix}/cloudformation-quickstart/cwagent-ecs-prometheus-metric-for-awsvpc.yaml +sed -i'.bak' "s|public\.ecr\.aws/cloudwatch-agent/cloudwatch-agent:[0-9]*\.[0-9]*\.[0-9a-z]*|${agentVersion}|g" ${ecsPrometheusDirPrefix}/cloudformation-quickstart/cwagent-ecs-prometheus-metric-for-awsvpc.yaml rm ${ecsPrometheusDirPrefix}/cloudformation-quickstart/cwagent-ecs-prometheus-metric-for-awsvpc.yaml.bak -sed -i'.bak' "s|public.ecr.aws/cloudwatch-agentcloudwatch-agent:[0-9]*\.[0-9]*\.[0-9a-z]*\(-prometheus\)\?|${agentVersion}|g" ${ecsPrometheusDirPrefix}/cloudformation-quickstart/cwagent-ecs-prometheus-metric-for-bridge-host.yaml +sed -i'.bak' "s|public\.ecr\.aws/cloudwatch-agent/cloudwatch-agent:[0-9]*\.[0-9]*\.[0-9a-z]*|${agentVersion}|g" ${ecsPrometheusDirPrefix}/cloudformation-quickstart/cwagent-ecs-prometheus-metric-for-bridge-host.yaml rm ${ecsPrometheusDirPrefix}/cloudformation-quickstart/cwagent-ecs-prometheus-metric-for-bridge-host.yaml.bak # replace agent and k8s version for K8s Prometheus -sed -i'.bak' "s|k8s/[0-9]*\.[0-9]*\.[0-9a-z]*\(-prometheus\)\?|${newK8sVersion}|g;s|public.ecr.aws/cloudwatch-agentcloudwatch-agent:[0-9]*\.[0-9]*\.[0-9a-z]*\(-prometheus\)\?|${agentVersion}|g" ${k8sPrometheusDirPrefix}/prometheus-eks.yaml +sed -i'.bak' "s|k8s/[0-9]*\.[0-9]*\.[0-9a-z]*|${newK8sVersion}|g;s|public\.ecr\.aws/cloudwatch-agent/cloudwatch-agent:[0-9]*\.[0-9]*\.[0-9a-z]*|${agentVersion}|g" ${k8sPrometheusDirPrefix}/prometheus-eks.yaml rm ${k8sPrometheusDirPrefix}/prometheus-eks.yaml.bak -sed -i'.bak' "s|k8s/[0-9]*\.[0-9]*\.[0-9a-z]*\(-prometheus\)\?|${newK8sVersion}|g;s|public.ecr.aws/cloudwatch-agentcloudwatch-agent:[0-9]*\.[0-9]*\.[0-9a-z]*\(-prometheus\)\?|${agentVersion}|g" ${k8sPrometheusDirPrefix}/prometheus-eks-fargate.yaml +sed -i'.bak' "s|k8s/[0-9]*\.[0-9]*\.[0-9a-z]*|${newK8sVersion}|g;s|public\.ecr\.aws/cloudwatch-agent/cloudwatch-agent:[0-9]*\.[0-9]*\.[0-9a-z]*|${agentVersion}|g" ${k8sPrometheusDirPrefix}/prometheus-eks-fargate.yaml rm ${k8sPrometheusDirPrefix}/prometheus-eks-fargate.yaml.bak -sed -i'.bak' "s|k8s/[0-9]*\.[0-9]*\.[0-9a-z]*\(-prometheus\)\?|${newK8sVersion}|g;s|public.ecr.aws/cloudwatch-agentcloudwatch-agent:[0-9]*\.[0-9]*\.[0-9a-z]*\(-prometheus\)\?|${agentVersion}|g" ${k8sPrometheusDirPrefix}/prometheus-k8s.yaml +sed -i'.bak' "s|k8s/[0-9]*\.[0-9]*\.[0-9a-z]*|${newK8sVersion}|g;s|public\.ecr\.aws/cloudwatch-agent/cloudwatch-agent:[0-9]*\.[0-9]*\.[0-9a-z]*|${agentVersion}|g" ${k8sPrometheusDirPrefix}/prometheus-k8s.yaml rm ${k8sPrometheusDirPrefix}/prometheus-k8s.yaml.bak # replace agent version for ECS -sed -i'.bak' "s|public.ecr.aws/cloudwatch-agentcloudwatch-agent:[0-9]*\.[0-9]*\.[0-9a-z]*|${agentVersion}|g" ${ecsDirPrefix}/cwagent-ecs-instance-metric.json +sed -i'.bak' "s|public\.ecr\.aws/cloudwatch-agent/cloudwatch-agent:[0-9]*\.[0-9]*\.[0-9a-z]*|${agentVersion}|g" ${ecsDirPrefix}/cwagent-ecs-instance-metric.json rm ${ecsDirPrefix}/cwagent-ecs-instance-metric.json.bak -sed -i'.bak' "s|public.ecr.aws/cloudwatch-agentcloudwatch-agent:[0-9]*\.[0-9]*\.[0-9a-z]*|${agentVersion}|g" ${ecsDirPrefix}/cloudformation-quickstart/cwagent-ecs-instance-metric-cfn.json +sed -i'.bak' "s|public\.ecr\.aws/cloudwatch-agent/cloudwatch-agent:[0-9]*\.[0-9]*\.[0-9a-z]*|${agentVersion}|g" ${ecsDirPrefix}/cloudformation-quickstart/cwagent-ecs-instance-metric-cfn.json rm ${ecsDirPrefix}/cloudformation-quickstart/cwagent-ecs-instance-metric-cfn.json.bak # replace agent, fluentD and fluent-bit version for K8s -sed -i'.bak' "s|k8s/[0-9]*\.[0-9]*\.[0-9a-z]*|${newK8sVersion}|g;s|public.ecr.aws/cloudwatch-agentcloudwatch-agent:[0-9]*\.[0-9]*\.[0-9a-z]*|${agentVersion}|g" ${k8sDirPrefix}/cwagent/cwagent-daemonset.yaml +sed -i'.bak' "s|k8s/[0-9]*\.[0-9]*\.[0-9a-z]*|${newK8sVersion}|g;s|public\.ecr\.aws/cloudwatch-agent/cloudwatch-agent:[0-9]*\.[0-9]*\.[0-9a-z]*|${agentVersion}|g" ${k8sDirPrefix}/cwagent/cwagent-daemonset.yaml rm ${k8sDirPrefix}/cwagent/cwagent-daemonset.yaml.bak sed -i'.bak' "s|k8s/[0-9]*\.[0-9]*\.[0-9a-z]*|${newK8sVersion}|g;s|fluent/fluentd-kubernetes-daemonset:.*|${fluentdVersion}|g" ${k8sDirPrefix}/fluentd/fluentd.yaml rm ${k8sDirPrefix}/fluentd/fluentd.yaml.bak -sed -i'.bak' "s|k8s/[0-9]*\.[0-9]*\.[0-9a-z]*|${newK8sVersion}|g;s|public.ecr.aws/aws-observability/aws-for-fluent-bit.*|${fluentBitVersion}|g" ${k8sDirPrefix}/fluent-bit/fluent-bit.yaml +sed -i'.bak' "s|k8s/[0-9]*\.[0-9]*\.[0-9a-z]*|${newK8sVersion}|g;s|public\.ecr\.aws/aws-observability/aws-for-fluent-bit.*|${fluentBitVersion}|g" ${k8sDirPrefix}/fluent-bit/fluent-bit.yaml rm ${k8sDirPrefix}/fluent-bit/fluent-bit.yaml.bak -sed -i'.bak' "s|k8s/[0-9]*\.[0-9]*\.[0-9a-z]*|${newK8sVersion}|g;s|public.ecr.aws/aws-observability/aws-for-fluent-bit.*|${fluentBitVersion}|g" ${k8sDirPrefix}/fluent-bit/fluent-bit-compatible.yaml +sed -i'.bak' "s|k8s/[0-9]*\.[0-9]*\.[0-9a-z]*|${newK8sVersion}|g;s|public\.ecr\.aws/aws-observability/aws-for-fluent-bit.*|${fluentBitVersion}|g" ${k8sDirPrefix}/fluent-bit/fluent-bit-compatible.yaml rm ${k8sDirPrefix}/fluent-bit/fluent-bit-compatible.yaml.bak # generate quickstart manifest for K8s diff --git a/ecs-task-definition-templates/deployment-mode/daemon-service/cwagent-ecs-instance-metric/cloudformation-quickstart/cwagent-ecs-instance-metric-cfn.json b/ecs-task-definition-templates/deployment-mode/daemon-service/cwagent-ecs-instance-metric/cloudformation-quickstart/cwagent-ecs-instance-metric-cfn.json index 6db2043..b2ad080 100644 --- a/ecs-task-definition-templates/deployment-mode/daemon-service/cwagent-ecs-instance-metric/cloudformation-quickstart/cwagent-ecs-instance-metric-cfn.json +++ b/ecs-task-definition-templates/deployment-mode/daemon-service/cwagent-ecs-instance-metric/cloudformation-quickstart/cwagent-ecs-instance-metric-cfn.json @@ -105,7 +105,7 @@ "ContainerDefinitions": [ { "Name": "cloudwatch-agent", - "Image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.247357.0b252275", + "Image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.247358.0b252413", "MountPoints": [ { "ReadOnly": true, diff --git a/ecs-task-definition-templates/deployment-mode/daemon-service/cwagent-ecs-instance-metric/cwagent-ecs-instance-metric.json b/ecs-task-definition-templates/deployment-mode/daemon-service/cwagent-ecs-instance-metric/cwagent-ecs-instance-metric.json index e8064af..0a321c4 100644 --- a/ecs-task-definition-templates/deployment-mode/daemon-service/cwagent-ecs-instance-metric/cwagent-ecs-instance-metric.json +++ b/ecs-task-definition-templates/deployment-mode/daemon-service/cwagent-ecs-instance-metric/cwagent-ecs-instance-metric.json @@ -6,7 +6,7 @@ "containerDefinitions": [ { "name": "cloudwatch-agent", - "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.247357.0b252275", + "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.247358.0b252413", "mountPoints": [ { "readOnly": true, diff --git a/ecs-task-definition-templates/deployment-mode/replica-service/cwagent-prometheus/cloudformation-quickstart/cwagent-ecs-prometheus-metric-for-awsvpc.yaml b/ecs-task-definition-templates/deployment-mode/replica-service/cwagent-prometheus/cloudformation-quickstart/cwagent-ecs-prometheus-metric-for-awsvpc.yaml index d301ba8..5a1be9f 100644 --- a/ecs-task-definition-templates/deployment-mode/replica-service/cwagent-prometheus/cloudformation-quickstart/cwagent-ecs-prometheus-metric-for-awsvpc.yaml +++ b/ecs-task-definition-templates/deployment-mode/replica-service/cwagent-prometheus/cloudformation-quickstart/cwagent-ecs-prometheus-metric-for-awsvpc.yaml @@ -224,7 +224,7 @@ Resources: NetworkMode: awsvpc ContainerDefinitions: - Name: cloudwatch-agent-prometheus - Image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.247357.0b252275 + Image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.247358.0b252413 Essential: true MountPoints: [] PortMappings: [] diff --git a/ecs-task-definition-templates/deployment-mode/replica-service/cwagent-prometheus/cloudformation-quickstart/cwagent-ecs-prometheus-metric-for-bridge-host.yaml b/ecs-task-definition-templates/deployment-mode/replica-service/cwagent-prometheus/cloudformation-quickstart/cwagent-ecs-prometheus-metric-for-bridge-host.yaml index 8f63f50..0a0761d 100644 --- a/ecs-task-definition-templates/deployment-mode/replica-service/cwagent-prometheus/cloudformation-quickstart/cwagent-ecs-prometheus-metric-for-bridge-host.yaml +++ b/ecs-task-definition-templates/deployment-mode/replica-service/cwagent-prometheus/cloudformation-quickstart/cwagent-ecs-prometheus-metric-for-bridge-host.yaml @@ -219,7 +219,7 @@ Resources: NetworkMode: !Ref ECSNetworkMode ContainerDefinitions: - Name: cloudwatch-agent-prometheus - Image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.247357.0b252275 + Image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.247358.0b252413 Essential: true MountPoints: [] PortMappings: [] diff --git a/ecs-task-definition-templates/deployment-mode/replica-service/cwagent-prometheus/cwagent-prometheus-task-definition.json b/ecs-task-definition-templates/deployment-mode/replica-service/cwagent-prometheus/cwagent-prometheus-task-definition.json index 51580c7..d0ba4bb 100644 --- a/ecs-task-definition-templates/deployment-mode/replica-service/cwagent-prometheus/cwagent-prometheus-task-definition.json +++ b/ecs-task-definition-templates/deployment-mode/replica-service/cwagent-prometheus/cwagent-prometheus-task-definition.json @@ -6,7 +6,7 @@ "containerDefinitions": [ { "name": "cloudwatch-agent-prometheus", - "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.247357.0b252275", + "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.247358.0b252413", "essential": true, "mountPoints": [ ], diff --git a/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/cwagent/cwagent-daemonset.yaml b/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/cwagent/cwagent-daemonset.yaml index 4e7c1ac..399b35c 100644 --- a/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/cwagent/cwagent-daemonset.yaml +++ b/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/cwagent/cwagent-daemonset.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: cloudwatch-agent - image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.247357.0b252275 + image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.247358.0b252413 #ports: # - containerPort: 8125 # hostPort: 8125 @@ -42,7 +42,7 @@ spec: fieldRef: fieldPath: metadata.namespace - name: CI_VERSION - value: "k8s/1.3.12" + value: "k8s/1.3.13" # Please don't change the mountPath volumeMounts: - name: cwagentconfig diff --git a/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit-compatible.yaml b/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit-compatible.yaml index 7d1de4b..72d9f03 100644 --- a/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit-compatible.yaml +++ b/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit-compatible.yaml @@ -319,7 +319,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: CI_VERSION - value: "k8s/1.3.12" + value: "k8s/1.3.13" resources: limits: memory: 200Mi diff --git a/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit.yaml b/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit.yaml index d4d7641..3552556 100644 --- a/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit.yaml +++ b/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit.yaml @@ -303,7 +303,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: CI_VERSION - value: "k8s/1.3.12" + value: "k8s/1.3.13" resources: limits: memory: 200Mi diff --git a/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/fluentd/fluentd.yaml b/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/fluentd/fluentd.yaml index 0e4429a..84f52b6 100644 --- a/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/fluentd/fluentd.yaml +++ b/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/fluentd/fluentd.yaml @@ -398,7 +398,7 @@ spec: name: cluster-info key: cluster.name - name: CI_VERSION - value: "k8s/1.3.12" + value: "k8s/1.3.13" - name: FLUENT_CONTAINER_TAIL_PARSER_TYPE value: /^(?