Merge pull request #3 from ddrugeon/feature/add_annotations

Feature/add annotations

Author: Jarl Törnroos

README.md

@@ -56,7 +56,10 @@ The following table list the configurable parameters of the chart and their defa
 | kubernetesConf | kubernetes.conf content | Not set |
 | resources | Resources allocation (Requests and Limits) | {} |
 | rbac.create | Whether RBAC resources are created | true |
-
+| instanceProfileCredentials | AWS instance profile credentials | false |
+| instanceProfileIPAddress | IP Address to get instance profile credentials | 169.254.169.254 |
+| instanceProfilePort | Port to get instance profile credentials | 80 |
+| podAnnotations | Annotations | {} |
 ### Overriding configurations
 
 Parameters can be overridden when installing the chart. For example assuming an IAM role for another AWS account were Kinesis Firehose is running:

templates/daemonset.yaml

@@ -18,6 +18,11 @@ spec:
         k8s-app: fluentd-logging
         version: v1
         kubernetes.io/cluster-service: "true"
+      annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/fluent-conf.yaml") . | sha256sum }}
+{{- if .Values.podAnnotations }}
+{{ toYaml .Values.podAnnotations | indent 8 }}
+{{- end }}
     spec:
       serviceAccount: {{ include "helm-fluentd-kinesis-firehose.fullname" . }}
       serviceAccountName: {{ include "helm-fluentd-kinesis-firehose.fullname" . }}
@@ -34,6 +39,12 @@ spec:
             value: "{{ .Values.fluentEnvs.roleARN }}"
           - name:  ROLE_SESSION_NAME
             value: "{{ .Values.fluentEnvs.roleSession }}"
+{{- end}}
+{{- if .Values.fluentEnvs.instanceProfileCredentials }}
+          - name:  INSTANCE_PROFILE_IP_ADDRESS
+            value: "{{ .Values.fluentEnvs.instanceProfileIPAddress }}"
+          - name:  INSTANCE_PROFILE_PORT
+            value: "{{ .Values.fluentEnvs.instanceProfilePort }}"
 {{- end}}
           - name:  FLUENT_KINESIS_STREAMS_REGION
             value: "{{ .Values.fluentEnvs.kinesisRegion }}"

templates/fluent-conf.yaml

@@ -33,6 +33,12 @@ data:
         role_arn "#{ENV['ROLE_ARN']}"
         role_session_name "#{ENV['ROLE_SESSION_NAME']}"
       </assume_role_credentials>
+  {{- end}}
+    {{- if .Values.fluentEnvs.instanceProfileCredentials }}
+      <instance_profile_credentials>
+        ip_address "#{ENV['INSTANCE_PROFILE_IP_ADDRESS']}"
+        port "#{ENV['INSTANCE_PROFILE_PORT']}"
+      </instance_profile_credentials>
   {{- end}}
     </match>
 {{- end}}

values.yaml

@@ -19,6 +19,11 @@ fluentEnvs:
   kinesisIncludeTimeKey: "true"
   bufferChunkLimitSize: "2M"
   bufferQueueLimitLength: "32"
+  instanceProfileCredentials: false
+  instanceProfileIPAddress: "169.254.169.254"
+  instanceProfilePort: "80"
+
+podAnnotations: {}
 
 # The configuration files can be overrided by adding the variables,
 # fluentConf, kubernetesConf and systemdConf. kubernetesConf Example: