Skip to content

Commit e64606b

Browse files
ack-botack-bot
authored
Update to ACK runtime v0.19.1, code-generator v0.19.1 (#93)
### 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.0.18` to `v0.0.19` Once this PR is merged, release `v0.0.19` will be automatically created for `elasticache-controller` **Please close this PR, if you do not want the new patch release for `elasticache-controller`** ---------- #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building elasticache-controller ==== Copying common custom resource definitions into elasticache Building Kubernetes API objects for elasticache Generating deepcopy code for elasticache Generating custom resource definitions for elasticache Building service controller for elasticache Generating RBAC manifests for elasticache Running gofmt against generated code for elasticache Updating additional GitHub repository maintenance files ==== building elasticache-controller release artifacts ==== Building release artifacts for elasticache-v0.0.19 Generating common custom resource definitions Generating custom resource definitions for elasticache Generating RBAC manifests for elasticache ``` ---------- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 029de90 commit e64606b

File tree

30 files changed

+737
-50
lines changed

30 files changed

+737
-50
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ack_generate_info:
2-
build_date: "2022-04-12T21:36:10Z"
3-
build_hash: 9191f9d8912cf9c413cc45285cd0ea8bedd944f5
4-
go_version: go1.17.8
5-
version: v0.18.3-1-g9191f9d-dirty
2+
build_date: "2022-06-17T17:56:13Z"
3+
build_hash: a45f3b900849ec03c5e16ed2778c0b8e2923ffee
4+
go_version: go1.17.5
5+
version: v0.19.1
66
api_directory_checksum: 7087207d90a71ce286e3c45edad16bb89b0a8eb3
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.42.0

‎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

‎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/elasticache-controller
9-
newTag: v0.0.18
9+
newTag: v0.0.19

‎go.mod‎

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

55
require (
6-
github.com/aws-controllers-k8s/runtime v0.18.1
6+
github.com/aws-controllers-k8s/runtime v0.19.1
77
github.com/aws/aws-sdk-go v1.42.0
88
github.com/ghodss/yaml v1.0.0
99
github.com/go-logr/logr v1.2.0
@@ -20,6 +20,7 @@ require (
2020

2121
require (
2222
github.com/beorn7/perks v1.0.1 // indirect
23+
github.com/cenkalti/backoff/v4 v4.1.2 // indirect
2324
github.com/cespare/xxhash/v2 v2.1.1 // indirect
2425
github.com/davecgh/go-spew v1.1.1 // indirect
2526
github.com/evanphx/json-patch v4.12.0+incompatible // indirect

‎go.sum‎

Lines changed: 4 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.1 h1:eHmW7ObuGqnz/QpOKnZqHY2QuZmk8uROyXOvqKc7WjY=
68-
github.com/aws-controllers-k8s/runtime v0.18.1/go.mod h1:pK+LlQRxxWKC9mRHnGz8/WRI8Dcvjg4ZGmK8rVwb51Y=
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=
@@ -79,6 +79,8 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB
7979
github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
8080
github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM=
8181
github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
82+
github.com/cenkalti/backoff/v4 v4.1.2 h1:6Yo7N8UP2K6LWZnW94DLVSSrbobcWdVzAYOisuDPIFo=
83+
github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
8284
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
8385
github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
8486
github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=

‎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: elasticache-chart
33
description: A Helm chart for the ACK service controller for Amazon ElastiCache (ElastiCache)
4-
version: v0.0.18
5-
appVersion: v0.0.18
4+
version: v0.0.19
5+
appVersion: v0.0.19
66
home: https://github.com/aws-controllers-k8s/elasticache-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/elasticache-controller:v0.0.18".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/elasticache-controller:v0.0.19".
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 -}}

0 commit comments

Comments
 (0)