Skip to content

Commit 3796d70

Browse files
authored
Regenerate controller with codegen v0.19.3 (#37)
Issue: N/A Description of changes: - Bump runtime version to 0.19.3 - Regenerate controller with code-generator `v0.19.3` By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 855903f commit 3796d70

File tree

22 files changed

+352
-44
lines changed

22 files changed

+352
-44
lines changed
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
ack_generate_info:
2-
build_date: "2022-05-13T16:30:20Z"
3-
build_hash: 302c31fcf0cb7eacf535af8a65569882b3ee0d7c
2+
build_date: "2022-08-06T23:36:35Z"
3+
build_hash: 87477ae8ca8ac6ddb8c565bbd910cc7e30f55ed0
44
go_version: go1.18.1
5-
version: v0.18.4-3-g302c31f
5+
version: v0.19.3
66
api_directory_checksum: 7c4e0f8971a8ab06389e98b21c00eddad87366f3
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.42.0
99
generator_config_info:
10-
file_checksum: 2559b6bfec9b6a5155e6119d9c649a8a4586b188
10+
file_checksum: f43837f1cc3ff58068b47c6c3a4eb6ada6d534b7
1111
original_file_name: generator.yaml
1212
last_modification:
1313
reason: API generation

apis/v1alpha1/generator.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,19 @@ resources:
6060
is_required: true
6161
FunctionVersion:
6262
is_required: true
63+
tags:
64+
ignore: true
6365
CodeSigningConfig:
6466
fields:
6567
AllowedPublishers:
6668
is_required: true
69+
tags:
70+
ignore: true
6771
EventSourceMapping:
6872
fields:
6973
UUID:
7074
is_primary_key: true
7175
FunctionName:
72-
is_required: true
76+
is_required: true
77+
tags:
78+
ignore: true

cmd/controller/main.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/controller/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ spec:
6666
- name: ACK_LOG_LEVEL
6767
value: "info"
6868
- name: ACK_RESOURCE_TAGS
69-
value: "services.k8s.aws/managed=true,services.k8s.aws/created=%UTCNOW%,services.k8s.aws/namespace=%KUBERNETES_NAMESPACE%"
69+
value: "services.k8s.aws/controller-version=%CONTROLLER_SERVICE%-%CONTROLLER_VERSION%,services.k8s.aws/namespace=%K8S_NAMESPACE%"
7070
securityContext:
7171
allowPrivilegeEscalation: false
7272
privileged: false

generator.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,19 @@ resources:
6060
is_required: true
6161
FunctionVersion:
6262
is_required: true
63+
tags:
64+
ignore: true
6365
CodeSigningConfig:
6466
fields:
6567
AllowedPublishers:
6668
is_required: true
69+
tags:
70+
ignore: true
6771
EventSourceMapping:
6872
fields:
6973
UUID:
7074
is_primary_key: true
7175
FunctionName:
72-
is_required: true
76+
is_required: true
77+
tags:
78+
ignore: true

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/aws-controllers-k8s/lambda-controller
33
go 1.17
44

55
require (
6-
github.com/aws-controllers-k8s/runtime v0.18.5
6+
github.com/aws-controllers-k8s/runtime v0.19.2
77
github.com/aws/aws-sdk-go v1.42.0
88
github.com/go-logr/logr v1.2.0
99
github.com/spf13/pflag v1.0.5

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC
6464
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
6565
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
6666
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
67-
github.com/aws-controllers-k8s/runtime v0.18.5 h1:P8oMQagd45JQaloVQ+duuJzMw4ii8/IXYIgPN2EjU+8=
68-
github.com/aws-controllers-k8s/runtime v0.18.5/go.mod h1:oA8ML1/LL3chPn26P6SzBNu1CUI2nekB+PTqykNs0qU=
67+
github.com/aws-controllers-k8s/runtime v0.19.2 h1:Oar0P5eIIXlA+DolGwurw2+wyY5j+d/dxbisZTsrRLw=
68+
github.com/aws-controllers-k8s/runtime v0.19.2/go.mod h1:oA8ML1/LL3chPn26P6SzBNu1CUI2nekB+PTqykNs0qU=
6969
github.com/aws/aws-sdk-go v1.42.0 h1:BMZws0t8NAhHFsfnT3B40IwD13jVDG5KerlRksctVIw=
7070
github.com/aws/aws-sdk-go v1.42.0/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
7171
github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=

helm/templates/_helpers.tpl

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,13 @@ If release name contains chart name it will be used as a full name.
3636
{{- .Release.Namespace -}}
3737
{{- end -}}
3838
{{- end -}}
39+
40+
{{/* The mount path for the shared credentials file */}}
41+
{{- define "aws.credentials.secret_mount_path" -}}
42+
{{- "/var/run/secrets/aws" -}}
43+
{{- end -}}
44+
45+
{{/* The path the shared credentials file is mounted */}}
46+
{{- define "aws.credentials.path" -}}
47+
{{- printf "%s/%s" (include "aws.credentials.secret_mount_path" .) .Values.aws.credentials.secretKey -}}
48+
{{- end -}}

helm/templates/deployment.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,16 @@ spec:
8080
value: {{ .Values.log.level | quote }}
8181
- name: ACK_RESOURCE_TAGS
8282
value: {{ join "," .Values.resourceTags | quote }}
83+
{{- if .Values.aws.credentials.secretName }}
84+
- name: AWS_SHARED_CREDENTIALS_FILE
85+
value: {{ include "aws.credentials.path" . }}
86+
- name: AWS_PROFILE
87+
value: {{ .Values.aws.credentials.profile }}
88+
volumeMounts:
89+
- name: {{ .Values.aws.credentials.secretName }}
90+
mountPath: {{ include "aws.credentials.secret_mount_path" . }}
91+
readOnly: true
92+
{{- end }}
8393
securityContext:
8494
allowPrivilegeEscalation: false
8595
privileged: false
@@ -101,3 +111,9 @@ spec:
101111
hostIPC: false
102112
hostNetwork: false
103113
hostPID: false
114+
{{ if .Values.aws.credentials.secretName -}}
115+
volumes:
116+
- name: {{ .Values.aws.credentials.secretName }}
117+
secret:
118+
secretName: {{ .Values.aws.credentials.secretName }}
119+
{{ end -}}

helm/values.schema.json

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,21 @@
153153
},
154154
"endpoint": {
155155
"type": "string"
156+
},
157+
"credentials": {
158+
"description": "AWS credentials information",
159+
"properties": {
160+
"secretName": {
161+
"type": "string"
162+
},
163+
"secretKey": {
164+
"type": "string"
165+
},
166+
"profile": {
167+
"type": "string"
168+
}
169+
},
170+
"type": "object"
156171
}
157172
},
158173
"type": "object"
@@ -177,7 +192,7 @@
177192
"type": "array",
178193
"items": {
179194
"type": "string",
180-
"pattern": "^.*=.*$"
195+
"pattern": "(^$|^.*=.*$)"
181196
}
182197
},
183198
"serviceAccount": {

0 commit comments

Comments
 (0)