Skip to content

Commit af6e34e

Browse files
ack-botack-bot
authored
Update to ACK runtime v0.19.1, code-generator v0.19.1 (#82)
### Update to ACK runtime `v0.19.1`, code-generator `v0.19.1` ---------- * ACK code-generator `v0.19.1` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.19.1) * ACK runtime `v0.19.1` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.19.1) ---------- NOTE: This PR increments the release version of service controller from `v0.1.1` to `v0.1.2` Once this PR is merged, release `v0.1.2` will be automatically created for `s3-controller` **Please close this PR, if you do not want the new patch release for `s3-controller`** ---------- #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building s3-controller ==== Copying common custom resource definitions into s3 Building Kubernetes API objects for s3 Generating deepcopy code for s3 Generating custom resource definitions for s3 Building service controller for s3 Generating RBAC manifests for s3 Running gofmt against generated code for s3 Updating additional GitHub repository maintenance files ==== building s3-controller release artifacts ==== Building release artifacts for s3-v0.1.2 Generating common custom resource definitions Generating custom resource definitions for s3 Generating RBAC manifests for s3 ``` ---------- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 4a8d5f6 commit af6e34e

File tree

12 files changed

+74
-14
lines changed

12 files changed

+74
-14
lines changed

‎apis/v1alpha1/ack-generate-metadata.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ack_generate_info:
2-
build_date: "2022-06-14T04:07:34Z"
3-
build_hash: a133935a9a93591a9e1ba9d5ca940cb83a1353b4
2+
build_date: "2022-06-17T18:07:35Z"
3+
build_hash: a45f3b900849ec03c5e16ed2778c0b8e2923ffee
44
go_version: go1.17.5
5-
version: v0.19.0
5+
version: v0.19.1
66
api_directory_checksum: 129f62379684f764be26baaa8e217e0c431281e5
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.42.0

‎config/controller/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ kind: Kustomization
66
images:
77
- name: controller
88
newName: public.ecr.aws/aws-controllers-k8s/s3-controller
9-
newTag: v0.1.1
9+
newTag: v0.1.2

‎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/s3-controller
33
go 1.17
44

55
require (
6-
github.com/aws-controllers-k8s/runtime v0.19.0
6+
github.com/aws-controllers-k8s/runtime v0.19.1
77
github.com/aws/aws-sdk-go v1.42.0
88
github.com/go-logr/logr v1.2.0
99
github.com/pkg/errors v0.9.1

‎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.19.0 h1:+O5a6jBSBAd8XTNMrVCIYu4G+ZUPZe/G5eopVFO18Dc=
68-
github.com/aws-controllers-k8s/runtime v0.19.0/go.mod h1:oA8ML1/LL3chPn26P6SzBNu1CUI2nekB+PTqykNs0qU=
67+
github.com/aws-controllers-k8s/runtime v0.19.1 h1:OBV7vbIbLFRpXdAwJfoPGphhjTa7xSc3pS/kuYlKzRU=
68+
github.com/aws-controllers-k8s/runtime v0.19.1/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/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v1
22
name: s3-chart
33
description: A Helm chart for the ACK service controller for Amazon Simple Storage Service (S3)
4-
version: v0.1.1
5-
appVersion: v0.1.1
4+
version: v0.1.2
5+
appVersion: v0.1.2
66
home: https://github.com/aws-controllers-k8s/s3-controller
77
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
88
sources:

‎helm/templates/NOTES.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{ .Chart.Name }} has been installed.
2-
This chart deploys "public.ecr.aws/aws-controllers-k8s/s3-controller:v0.1.1".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/s3-controller:v0.1.2".
33

44
Check its status by running:
55
kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"

‎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: 15 additions & 0 deletions
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"

‎helm/values.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
image:
66
repository: public.ecr.aws/aws-controllers-k8s/s3-controller
7-
tag: v0.1.1
7+
tag: v0.1.2
88
pullPolicy: IfNotPresent
99
pullSecrets: []
1010

@@ -50,6 +50,13 @@ aws:
5050
# If specified, use the AWS region for AWS API calls
5151
region: ""
5252
endpoint_url: ""
53+
credentials:
54+
# If specified, Secret with shared credentials file to use.
55+
secretName: ""
56+
# Secret stringData key that contains the credentials
57+
secretKey: "credentials"
58+
# Profile used for AWS credentials
59+
profile: "default"
5360

5461
# log level for the controller
5562
log:

0 commit comments

Comments
 (0)