refactor fluentd-cloudwatch (#5087)

* refactor fluentd-cloudwatch

* Update Chart.yaml

* update image pullpolicy

* Fix readme

* Update Chart.yaml
This commit is contained in:
cheyang
2018-05-17 22:39:50 -07:00
committed by k8s-ci-robot
parent d3e5c5e424
commit 1905e1f612
4 changed files with 27 additions and 28 deletions
+3 -3
View File
@@ -1,9 +1,9 @@
name: fluentd-cloudwatch
version: 0.2.3
appVersion: 0.1.1
version: 0.4.0
appVersion: v0.12.33-cloudwatch
description: A Fluentd CloudWatch Helm chart for Kubernetes.
home: https://www.fluentd.org/
icon: https://raw.githubusercontent.com/fluent/fluentd-docs/master/public/logo/Fluentd_square.png
home: https://github.com/fluent/fluentd-kubernetes-daemonset
keywords:
- fluentd
- cloudwatch
+18 -18
View File
@@ -44,24 +44,24 @@ The command removes all the Kubernetes components associated with the chart and
The following tables lists the configurable parameters of the Fluentd Cloudwatch chart and their default values.
| Parameter | Description | Default |
| ------------------------------- | ------------------------------------------ | ---------------------------------------------------------- |
| `image` | Image | `fluent/fluentd-kubernetes-daemonset` |
| `imageTag` | Image tag | `v0.12.33-cloudwatch` |
| `imagePullPolicy` | Image pull policy | `Always` if `imageTag` is `imagePullPolicy` |
| `resources.limits.cpu` | CPU limit | `100m` |
| `resources.limits.memory` | Memory limit | `200Mi` |
| `resources.requests.cpu` | CPU request | `100m` |
| `resources.requests.memory` | Memory request | `200Mi` |
| `hostNetwork` | Host network | `false` |
| `annotations` (removed for now) | Annotations | `nil` |
| `awsRegion` | AWS Cloudwatch region | `us-east-1` |
| `awsRole` | AWS IAM Role To Use | `nil` |
| `fluentdConfig` | Fluentd configuration | `example configuration` |
| `logGroupName` | AWS Cloudwatch log group | `kubernetes` |
| `rbac.create` | If true, create & use RBAC resources | `false` |
| `rbac.serviceAccountName` | existing ServiceAccount to use (ignored if rbac.create=true) | `default` |
| `tolerations` | Add tolerations | `[]` |
| Parameter | Description | Default |
| ------------------------------- | ------------------------------------------------------------ | --------------------------------------|
| `image.repository` | Image repository | `fluent/fluentd-kubernetes-daemonset` |
| `image.tag` | Image tag | `v0.12.33-cloudwatch` |
| `image.pullPolicy` | Image pull policy | `IfNotPresent` |
| `resources.limits.cpu` | CPU limit | `100m` |
| `resources.limits.memory` | Memory limit | `200Mi` |
| `resources.requests.cpu` | CPU request | `100m` |
| `resources.requests.memory` | Memory request | `200Mi` |
| `hostNetwork` | Host network | `false` |
| `annotations` (removed for now) | Annotations | `nil` |
| `awsRegion` | AWS Cloudwatch region | `us-east-1` |
| `awsRole` | AWS IAM Role To Use | `nil` |
| `fluentdConfig` | Fluentd configuration | `example configuration` |
| `logGroupName` | AWS Cloudwatch log group | `kubernetes` |
| `rbac.create` | If true, create & use RBAC resources | `false` |
| `rbac.serviceAccountName` | existing ServiceAccount to use (ignored if rbac.create=true) | `default` |
| `tolerations` | Add tolerations | `[]` |
Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
@@ -31,8 +31,8 @@ spec:
mountPath: /etc/fluentd
containers:
- name: {{ template "fluentd-cloudwatch.fullname" . }}
image: "{{ .Values.image }}:{{ .Values.imageTag }}"
imagePullPolicy: {{ .Values.imagePullPolicy | quote }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
#hostNetwork: {{ default false .Values.hostNetwork }}
env:
- name: AWS_REGION
+4 -5
View File
@@ -1,11 +1,10 @@
image: fluent/fluentd-kubernetes-daemonset
imageTag: v0.12.33-cloudwatch
image:
repository: fluent/fluentd-kubernetes-daemonset
tag: v0.12.33-cloudwatch
## Specify an imagePullPolicy (Required)
## It's recommended to change this to 'Always' if the image tag is 'latest'
## ref: http://kubernetes.io/docs/user-guide/images/#updating-images
imagePullPolicy: IfNotPresent
pullPolicy: IfNotPresent
## Configure resource requests and limits
## ref: http://kubernetes.io/docs/user-guide/compute-resources/