Skip to content
Merged
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 config/controller/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ kind: Kustomization
images:
- name: controller
newName: public.ecr.aws/aws-controllers-k8s/lambda-controller
newTag: v0.0.16
newTag: v0.0.17
4 changes: 2 additions & 2 deletions helm/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
name: lambda-chart
description: A Helm chart for the ACK service controller for AWS Lambda (Lambda)
version: v0.0.16
appVersion: v0.0.16
version: v0.0.17
appVersion: v0.0.17
home: https://github.com/aws-controllers-k8s/lambda-controller
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
sources:
Expand Down
2 changes: 1 addition & 1 deletion helm/templates/NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{ .Chart.Name }} has been installed.
This chart deploys "public.ecr.aws/aws-controllers-k8s/lambda-controller:v0.0.16".
This chart deploys "public.ecr.aws/aws-controllers-k8s/lambda-controller:v0.0.17".

Check its status by running:
kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"
Expand Down
10 changes: 10 additions & 0 deletions helm/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,13 @@ If release name contains chart name it will be used as a full name.
{{- .Release.Namespace -}}
{{- end -}}
{{- end -}}

{{/* The mount path for the shared credentials file */}}
{{- define "aws.credentials.secret_mount_path" -}}
{{- "/var/run/secrets/aws" -}}
{{- end -}}

{{/* The path the shared credentials file is mounted */}}
{{- define "aws.credentials.path" -}}
{{- printf "%s/%s" (include "aws.credentials.secret_mount_path" .) .Values.aws.credentials.secretKey -}}
{{- end -}}
16 changes: 16 additions & 0 deletions helm/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,16 @@ spec:
value: {{ .Values.log.level | quote }}
- name: ACK_RESOURCE_TAGS
value: {{ join "," .Values.resourceTags | quote }}
{{- if .Values.aws.credentials.secretName }}
- name: AWS_SHARED_CREDENTIALS_FILE
value: {{ include "aws.credentials.path" . }}
- name: AWS_PROFILE
value: {{ .Values.aws.credentials.profile }}
volumeMounts:
- name: {{ .Values.aws.credentials.secretName }}
mountPath: {{ include "aws.credentials.secret_mount_path" . }}
readOnly: true
{{- end }}
securityContext:
allowPrivilegeEscalation: false
privileged: false
Expand All @@ -101,3 +111,9 @@ spec:
hostIPC: false
hostNetwork: false
hostPID: false
{{ if .Values.aws.credentials.secretName -}}
volumes:
- name: {{ .Values.aws.credentials.secretName }}
secret:
secretName: {{ .Values.aws.credentials.secretName }}
{{ end -}}
17 changes: 16 additions & 1 deletion helm/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,21 @@
},
"endpoint": {
"type": "string"
},
"credentials": {
"description": "AWS credentials information",
"properties": {
"secretName": {
"type": "string"
},
"secretKey": {
"type": "string"
},
"profile": {
"type": "string"
}
},
"type": "object"
}
},
"type": "object"
Expand All @@ -177,7 +192,7 @@
"type": "array",
"items": {
"type": "string",
"pattern": "^.*=.*$"
"pattern": "(^$|^.*=.*$)"
}
},
"serviceAccount": {
Expand Down
14 changes: 10 additions & 4 deletions helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

image:
repository: public.ecr.aws/aws-controllers-k8s/lambda-controller
tag: v0.0.16
tag: v0.0.17
pullPolicy: IfNotPresent
pullSecrets: []

Expand Down Expand Up @@ -50,6 +50,13 @@ aws:
# If specified, use the AWS region for AWS API calls
region: ""
endpoint_url: ""
credentials:
# If specified, Secret with shared credentials file to use.
secretName: ""
# Secret stringData key that contains the credentials
secretKey: "credentials"
# Profile used for AWS credentials
profile: "default"

# log level for the controller
log:
Expand All @@ -64,9 +71,8 @@ installScope: cluster
resourceTags:
# Configures the ACK service controller to always set key/value pairs tags on
# resources that it manages.
- services.k8s.aws/managed=true
- services.k8s.aws/created=%UTCNOW%
- services.k8s.aws/namespace=%KUBERNETES_NAMESPACE%
- services.k8s.aws/controller-version=%CONTROLLER_SERVICE%-%CONTROLLER_VERSION%
- services.k8s.aws/namespace=%K8S_NAMESPACE%

serviceAccount:
# Specifies whether a service account should be created
Expand Down