Update agent version to 1.300032.3b392 and k8s version to 1.3.20 (#158)

* Update agent version to 1.300032.3b392 and k8s version to 1.3.20
aws-samples · Jan 22, 2024 · dc88724 · dc88724
1 parent 28dfa48
commit dc88724
Show file tree

Hide file tree

Showing 40 changed files with 53 additions and 53 deletions.
diff --git 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.17"
-agentVersion="public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300030.2b309"
+newK8sVersion="k8s/1.3.20"
+agentVersion="public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392"
 fluentdVersion="fluent/fluentd-kubernetes-daemonset:v1.10.3-debian-cloudwatch-1.0"
 fluentBitVersion="public.ecr.aws/aws-observability/aws-for-fluent-bit:stable"
 

diff --git a/...wagent-ecs-instance-metric/cloudformation-quickstart/cwagent-ecs-instance-metric-cfn.json b/...wagent-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.300030.2b309",
+            "Image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392",
             "MountPoints": [
               {
                 "ReadOnly": true,

diff --git a/...ployment-mode/daemon-service/cwagent-ecs-instance-metric/cwagent-ecs-instance-metric.json b/...ployment-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.300030.2b309",
+      "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392",
       "mountPoints": [
         {
           "readOnly": true,

diff --git a/...wagent-prometheus/cloudformation-quickstart/cwagent-ecs-prometheus-metric-for-awsvpc.yaml b/...wagent-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.300030.2b309
+          Image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392
           Essential: true
           MountPoints: []
           PortMappings: []

diff --git a/...t-prometheus/cloudformation-quickstart/cwagent-ecs-prometheus-metric-for-bridge-host.yaml b/...t-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.300030.2b309
+          Image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392
           Essential: true
           MountPoints: []
           PortMappings: []

diff --git a/...eployment-mode/replica-service/cwagent-prometheus/cwagent-prometheus-task-definition.json b/...eployment-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.300030.2b309",
+      "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392",
       "essential": true,
       "mountPoints": [
       ],

diff --git a/ecs-task-definition-templates/deployment-mode/sidecar/combination/combination-ec2.json b/ecs-task-definition-templates/deployment-mode/sidecar/combination/combination-ec2.json
@@ -22,7 +22,7 @@
         },
         {
             "name": "cloudwatch-agent",
-            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300030.2b309",
+            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392",
             "secrets": [
                 {
                     "name": "CW_CONFIG_CONTENT",

diff --git a/ecs-task-definition-templates/deployment-mode/sidecar/combination/combination-fargate.json b/ecs-task-definition-templates/deployment-mode/sidecar/combination/combination-fargate.json
@@ -19,7 +19,7 @@
         },
         {
             "name": "cloudwatch-agent",
-            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300030.2b309",
+            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392",
             "secrets": [
                 {
                     "name": "CW_CONFIG_CONTENT",

diff --git a/ecs-task-definition-templates/deployment-mode/sidecar/cwagent-emf/cwagent-emf-ec2.json b/ecs-task-definition-templates/deployment-mode/sidecar/cwagent-emf/cwagent-emf-ec2.json
@@ -22,7 +22,7 @@
         },
         {
             "name": "cloudwatch-agent",
-            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300030.2b309",
+            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392",
             "secrets": [
                 {
                     "name": "CW_CONFIG_CONTENT",

diff --git a/ecs-task-definition-templates/deployment-mode/sidecar/cwagent-emf/cwagent-emf-fargate.json b/ecs-task-definition-templates/deployment-mode/sidecar/cwagent-emf/cwagent-emf-fargate.json
@@ -19,7 +19,7 @@
         },
         {
             "name": "cloudwatch-agent",
-            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300030.2b309",
+            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392",
             "secrets": [
                 {
                     "name": "CW_CONFIG_CONTENT",

diff --git a/...finition-templates/deployment-mode/sidecar/cwagent-sdkmetrics/cwagent-sdkmetrics-ec2.json b/...finition-templates/deployment-mode/sidecar/cwagent-sdkmetrics/cwagent-sdkmetrics-ec2.json
@@ -22,7 +22,7 @@
         },
         {
             "name": "cloudwatch-agent",
-            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300030.2b309",
+            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392",
             "secrets": [
                 {
                     "name": "CW_CONFIG_CONTENT",

diff --git a/...tion-templates/deployment-mode/sidecar/cwagent-sdkmetrics/cwagent-sdkmetrics-fargate.json b/...tion-templates/deployment-mode/sidecar/cwagent-sdkmetrics/cwagent-sdkmetrics-fargate.json
@@ -19,7 +19,7 @@
         },
         {
             "name": "cloudwatch-agent",
-            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300030.2b309",
+            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392",
             "secrets": [
                 {
                     "name": "CW_CONFIG_CONTENT",

diff --git a/ecs-task-definition-templates/deployment-mode/sidecar/cwagent-statsd/cwagent-statsd-ec2.json b/ecs-task-definition-templates/deployment-mode/sidecar/cwagent-statsd/cwagent-statsd-ec2.json
@@ -27,7 +27,7 @@
         },
         {
             "name": "cloudwatch-agent",
-            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300030.2b309",
+            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392",
             "secrets": [
                 {
                     "name": "CW_CONFIG_CONTENT",

diff --git a/...k-definition-templates/deployment-mode/sidecar/cwagent-statsd/cwagent-statsd-fargate.json b/...k-definition-templates/deployment-mode/sidecar/cwagent-statsd/cwagent-statsd-fargate.json
@@ -24,7 +24,7 @@
         },
         {
             "name": "cloudwatch-agent",
-            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300030.2b309",
+            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392",
             "secrets": [
                 {
                     "name": "CW_CONFIG_CONTENT",

diff --git a/k8s-deployment-manifest-templates/deployment-mode/daemonset/combination/combination.yaml b/k8s-deployment-manifest-templates/deployment-mode/daemonset/combination/combination.yaml
@@ -115,7 +115,7 @@ spec:
     spec:
       containers:
         - name: cloudwatch-agent
-          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300030.2b309
+          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392
           ports:
             - containerPort: 8125
               hostPort: 8125

diff --git a/...es/deployment-mode/daemonset/container-insights-monitoring/cwagent/cwagent-daemonset.yaml b/...es/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.300030.2b309
+          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392
           #ports:
           #  - containerPort: 8125
           #    hostPort: 8125
@@ -42,7 +42,7 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: CI_VERSION
-              value: "k8s/1.3.17"
+              value: "k8s/1.3.20"
           # Please don't change the mountPath
           volumeMounts:
             - name: cwagentconfig

diff --git a/...oyment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit-compatible.yaml b/...oyment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit-compatible.yaml
@@ -320,7 +320,7 @@ spec:
                 fieldRef:
                   fieldPath: spec.nodeName
             - name: CI_VERSION
-              value: "k8s/1.3.17"
+              value: "k8s/1.3.20"
         resources:
             limits:
               memory: 200Mi

diff --git a/...plates/deployment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit.yaml b/...plates/deployment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit.yaml
@@ -304,7 +304,7 @@ spec:
                   apiVersion: v1
                   fieldPath: metadata.name
             - name: CI_VERSION
-              value: "k8s/1.3.17"
+              value: "k8s/1.3.20"
         resources:
             limits:
               memory: 200Mi

diff --git a/...st-templates/deployment-mode/daemonset/container-insights-monitoring/fluentd/fluentd.yaml b/...st-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.17"
+              value: "k8s/1.3.20"
             - name: FLUENT_CONTAINER_TAIL_PARSER_TYPE
               value: /^(?<time>.+) (?<stream>stdout|stderr) (?<logtag>[FP]) (?<log>.*)$/
           resources:

diff --git a/...nset/container-insights-monitoring/quickstart/cwagent-fluent-bit-quickstart-enhanced.yaml b/...nset/container-insights-monitoring/quickstart/cwagent-fluent-bit-quickstart-enhanced.yaml
@@ -101,7 +101,7 @@ spec:
     spec:
       containers:
         - name: cloudwatch-agent
-          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300030.2b309
+          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392
           #ports:
           #  - containerPort: 8125
           #    hostPort: 8125
@@ -128,7 +128,7 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: CI_VERSION
-              value: "k8s/1.3.17"
+              value: "k8s/1.3.20"
           # Please don't change the mountPath
           volumeMounts:
             - name: cwagentconfig
@@ -504,7 +504,7 @@ spec:
                   apiVersion: v1
                   fieldPath: metadata.name
             - name: CI_VERSION
-              value: "k8s/1.3.17"
+              value: "k8s/1.3.20"
         resources:
             limits:
               memory: 200Mi

diff --git a/...ode/daemonset/container-insights-monitoring/quickstart/cwagent-fluent-bit-quickstart.yaml b/...ode/daemonset/container-insights-monitoring/quickstart/cwagent-fluent-bit-quickstart.yaml
@@ -100,7 +100,7 @@ spec:
     spec:
       containers:
         - name: cloudwatch-agent
-          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300030.2b309
+          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392
           #ports:
           #  - containerPort: 8125
           #    hostPort: 8125
@@ -127,7 +127,7 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: CI_VERSION
-              value: "k8s/1.3.17"
+              value: "k8s/1.3.20"
           # Please don't change the mountPath
           volumeMounts:
             - name: cwagentconfig
@@ -503,7 +503,7 @@ spec:
                   apiVersion: v1
                   fieldPath: metadata.name
             - name: CI_VERSION
-              value: "k8s/1.3.17"
+              value: "k8s/1.3.20"
         resources:
             limits:
               memory: 200Mi

diff --git a/...emonset/container-insights-monitoring/quickstart/cwagent-fluentd-quickstart-enhanced.yaml b/...emonset/container-insights-monitoring/quickstart/cwagent-fluentd-quickstart-enhanced.yaml
@@ -101,7 +101,7 @@ spec:
     spec:
       containers:
         - name: cloudwatch-agent
-          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300030.2b309
+          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392
           #ports:
           #  - containerPort: 8125
           #    hostPort: 8125
@@ -128,7 +128,7 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: CI_VERSION
-              value: "k8s/1.3.17"
+              value: "k8s/1.3.20"
           # Please don't change the mountPath
           volumeMounts:
             - name: cwagentconfig
@@ -592,7 +592,7 @@ spec:
                   name: cluster-info
                   key: cluster.name
             - name: CI_VERSION
-              value: "k8s/1.3.17"
+              value: "k8s/1.3.20"
             - name: FLUENT_CONTAINER_TAIL_PARSER_TYPE
               value: /^(?<time>.+) (?<stream>stdout|stderr) (?<logtag>[FP]) (?<log>.*)$/
           resources:

diff --git a/...t-mode/daemonset/container-insights-monitoring/quickstart/cwagent-fluentd-quickstart.yaml b/...t-mode/daemonset/container-insights-monitoring/quickstart/cwagent-fluentd-quickstart.yaml
@@ -100,7 +100,7 @@ spec:
     spec:
       containers:
         - name: cloudwatch-agent
-          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300030.2b309
+          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392
           #ports:
           #  - containerPort: 8125
           #    hostPort: 8125
@@ -127,7 +127,7 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: CI_VERSION
-              value: "k8s/1.3.17"
+              value: "k8s/1.3.20"
           # Please don't change the mountPath
           volumeMounts:
             - name: cwagentconfig
@@ -591,7 +591,7 @@ spec:
                   name: cluster-info
                   key: cluster.name
             - name: CI_VERSION
-              value: "k8s/1.3.17"
+              value: "k8s/1.3.20"
             - name: FLUENT_CONTAINER_TAIL_PARSER_TYPE
               value: /^(?<time>.+) (?<stream>stdout|stderr) (?<logtag>[FP]) (?<log>.*)$/
           resources:

diff --git a/...lates/deployment-mode/daemonset/cwagent-fluentd-xray/cwagent-fluentd-xray-quickstart.yaml b/...lates/deployment-mode/daemonset/cwagent-fluentd-xray/cwagent-fluentd-xray-quickstart.yaml
@@ -49,7 +49,7 @@ spec:
     spec:
       containers:
         - name: cloudwatch-agent
-          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300030.2b309
+          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392
           ports:
             - containerPort: 25888
               hostPort: 25888

diff --git a/...t-manifest-templates/deployment-mode/daemonset/cwagent-sdkmetrics/cwagent-sdkmetrics.yaml b/...t-manifest-templates/deployment-mode/daemonset/cwagent-sdkmetrics/cwagent-sdkmetrics.yaml
@@ -39,7 +39,7 @@ spec:
     spec:
       containers:
         - name: cloudwatch-agent
-          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300030.2b309
+          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392
           imagePullPolicy: Always
           ports:
             - containerPort: 31000

diff --git a/...eployment-manifest-templates/deployment-mode/daemonset/cwagent-statsd/cwagent-statsd.yaml b/...eployment-manifest-templates/deployment-mode/daemonset/cwagent-statsd/cwagent-statsd.yaml
@@ -25,7 +25,7 @@ spec:
     spec:
       containers:
         - name: cloudwatch-agent
-          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300030.2b309
+          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392
           imagePullPolicy: Always
           ports:
             # containerPort should be consistent with the listen port defined in configmap

diff --git a/k8s-deployment-manifest-templates/deployment-mode/service/combination/combination.yaml b/k8s-deployment-manifest-templates/deployment-mode/service/combination/combination.yaml
@@ -26,7 +26,7 @@ spec:
     spec:
       containers:
         - name: cloudwatch-agent
-          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300030.2b309
+          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392
           imagePullPolicy: Always
           resources:
             limits:

diff --git a/...manifest-templates/deployment-mode/service/cwagent-prometheus/prometheus-eks-fargate.yaml b/...manifest-templates/deployment-mode/service/cwagent-prometheus/prometheus-eks-fargate.yaml
@@ -398,7 +398,7 @@ spec:
     spec:
       containers:
         - name: cloudwatch-agent
-          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300030.2b309
+          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392
           imagePullPolicy: Always
           resources:
             limits:
@@ -410,7 +410,7 @@ spec:
           # Please don't change below envs
           env:
             - name: CI_VERSION
-              value: "k8s/1.3.17"
+              value: "k8s/1.3.20"
             - name: RUN_IN_AWS
               value: "True"
           # Please don't change the mountPath

diff --git a/...loyment-manifest-templates/deployment-mode/service/cwagent-prometheus/prometheus-eks.yaml b/...loyment-manifest-templates/deployment-mode/service/cwagent-prometheus/prometheus-eks.yaml
@@ -449,7 +449,7 @@ spec:
     spec:
       containers:
         - name: cloudwatch-agent
-          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300030.2b309
+          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392
           imagePullPolicy: Always
           resources:
             limits:
@@ -461,7 +461,7 @@ spec:
           # Please don't change below envs
           env:
             - name: CI_VERSION
-              value: "k8s/1.3.17"
+              value: "k8s/1.3.20"
           # Please don't change the mountPath
           volumeMounts:
             - name: prometheus-cwagentconfig

diff --git a/...loyment-manifest-templates/deployment-mode/service/cwagent-prometheus/prometheus-k8s.yaml b/...loyment-manifest-templates/deployment-mode/service/cwagent-prometheus/prometheus-k8s.yaml
@@ -396,7 +396,7 @@ spec:
     spec:
       containers:
         - name: cloudwatch-agent
-          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300030.2b309
+          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392
           imagePullPolicy: Always
           resources:
             limits:
@@ -408,7 +408,7 @@ spec:
           # Please don't change below envs
           env:
             - name: CI_VERSION
-              value: "k8s/1.3.17"
+              value: "k8s/1.3.20"
           # Please don't change the mountPath
           volumeMounts:
             - name: prometheus-cwagentconfig

diff --git a/...ent-manifest-templates/deployment-mode/service/cwagent-sdkmetrics/cwagent-sdkmetrics.yaml b/...ent-manifest-templates/deployment-mode/service/cwagent-sdkmetrics/cwagent-sdkmetrics.yaml
@@ -40,7 +40,7 @@ spec:
     spec:
       containers:
         - name: cloudwatch-agent
-          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300030.2b309
+          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392
           imagePullPolicy: Always
           resources:
             limits:

diff --git a/k8s-deployment-manifest-templates/deployment-mode/service/cwagent-statsd/cwagent-statsd.yaml b/k8s-deployment-manifest-templates/deployment-mode/service/cwagent-statsd/cwagent-statsd.yaml
@@ -26,7 +26,7 @@ spec:
     spec:
       containers:
         - name: cloudwatch-agent
-          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300030.2b309
+          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392
           imagePullPolicy: Always
           resources:
             limits: