Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion container-insights-manifest-update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ecsDirPrefix="./ecs-task-definition-templates/deployment-mode/daemon-service/cwa

newK8sVersion="k8s/1.3.5"
agentVersion="amazon/cloudwatch-agent:1.247347.5b250583"
fluentdVersion="fluent/fluentd-kubernetes-daemonset:v1.7.3-debian-cloudwatch-1.0"
fluentdVersion="fluent/fluentd-kubernetes-daemonset:v1.12.2-debian-cloudwatch-1.3"
fluentBitVersion="amazon/aws-for-fluent-bit:2.10.0"

k8sPrometheusDirPrefix="./k8s-deployment-manifest-templates/deployment-mode/service/cwagent-prometheus"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ spec:
command: ['sh','-c','']
containers:
- name: fluentd-cloudwatch
image: fluent/fluentd-kubernetes-daemonset:v1.7.3-debian-cloudwatch-1.0
image: fluent/fluentd-kubernetes-daemonset:v1.12.2-debian-cloudwatch-1.3
env:
- name: REGION
valueFrom:
Expand All @@ -592,6 +592,11 @@ spec:
configMapKeyRef:
name: cluster-info
key: cluster.name
- name: K8S_NODE_NAME
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: spec.nodeName
resources:
limits:
memory: 400Mi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ spec:
command: ['sh','-c','']
containers:
- name: fluentd-cloudwatch
image: fluent/fluentd-kubernetes-daemonset:v1.7.3-debian-cloudwatch-1.0
image: fluent/fluentd-kubernetes-daemonset:v1.12.2-debian-cloudwatch-1.3
env:
- name: AWS_REGION
valueFrom:
Expand All @@ -392,6 +392,11 @@ spec:
key: cluster.name
- name: CI_VERSION
value: "k8s/1.3.5"
- name: K8S_NODE_NAME
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: spec.nodeName
resources:
limits:
memory: 400Mi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ spec:
command: ['sh','-c','']
containers:
- name: fluentd-cloudwatch
image: fluent/fluentd-kubernetes-daemonset:v1.7.3-debian-cloudwatch-1.0
image: fluent/fluentd-kubernetes-daemonset:v1.12.2-debian-cloudwatch-1.3
env:
- name: AWS_REGION
valueFrom:
Expand All @@ -575,6 +575,11 @@ spec:
key: cluster.name
- name: CI_VERSION
value: "k8s/1.3.5"
- name: K8S_NODE_NAME
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: spec.nodeName
resources:
limits:
memory: 400Mi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ spec:
command: ['sh','-c','']
containers:
- name: fluentd-cloudwatch
image: fluent/fluentd-kubernetes-daemonset:v1.7.3-debian-cloudwatch-1.0
image: fluent/fluentd-kubernetes-daemonset:v1.12.2-debian-cloudwatch-1.3
env:
- name: REGION
valueFrom:
Expand All @@ -483,6 +483,11 @@ spec:
configMapKeyRef:
name: cluster-info
key: cluster.name
- name: K8S_NODE_NAME
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: spec.nodeName
resources:
limits:
memory: 400Mi
Expand Down
7 changes: 6 additions & 1 deletion k8s-yaml-templates/fluentd/fluentd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ spec:
command: ['sh','-c','']
containers:
- name: fluentd-cloudwatch
image: fluent/fluentd-kubernetes-daemonset:v1.7.3-debian-cloudwatch-1.0
image: fluent/fluentd-kubernetes-daemonset:v1.12.2-debian-cloudwatch-1.3
env:
- name: REGION
valueFrom:
Expand All @@ -392,6 +392,11 @@ spec:
key: cluster.name
- name: CI_VERSION
value: "k8s/1.0.1"
- name: K8S_NODE_NAME
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: spec.nodeName
resources:
limits:
memory: 400Mi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ spec:
command: ['sh','-c','']
containers:
- name: fluentd-cloudwatch
image: fluent/fluentd-kubernetes-daemonset:v1.7.3-debian-cloudwatch-1.0
image: fluent/fluentd-kubernetes-daemonset:v1.12.2-debian-cloudwatch-1.3
env:
- name: REGION
valueFrom:
Expand All @@ -576,6 +576,11 @@ spec:
key: cluster.name
- name: CI_VERSION
value: "k8s/1.0.1"
- name: K8S_NODE_NAME
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: spec.nodeName
resources:
limits:
memory: 400Mi
Expand Down