Skip to content

Commit 00d9926

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

30 files changed

+555
-75
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-06-08T19:33:40Z"
3-
build_hash: 6acf40fe3e3cfd97b799ef7cbf1e89e01c3db8f7
4-
go_version: go1.18.3
5-
version: v0.18.4-15-g6acf40f
2+
build_date: "2022-06-17T17:53:56Z"
3+
build_hash: a45f3b900849ec03c5e16ed2778c0b8e2923ffee
4+
go_version: go1.17.5
5+
version: v0.19.1
66
api_directory_checksum: 7b070fe012124ee552759771abc96d313cd2be43
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.42.28

‎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/eks-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
@@ -5,7 +5,7 @@ go 1.17
55
require (
66
github.com/aws-controllers-k8s/ec2-controller v0.0.10
77
github.com/aws-controllers-k8s/iam-controller v0.0.8
8-
github.com/aws-controllers-k8s/runtime v0.18.4
8+
github.com/aws-controllers-k8s/runtime v0.19.1
99
github.com/aws/aws-sdk-go v1.42.28
1010
github.com/go-logr/logr v1.2.0
1111
github.com/spf13/pflag v1.0.5

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ github.com/aws-controllers-k8s/ec2-controller v0.0.10/go.mod h1:N8vii7yTsYHmMjOh
6969
github.com/aws-controllers-k8s/iam-controller v0.0.8 h1:7F4W45I7l30jZZGS8FEesScJmOcnPASCoa1sHBcTLNI=
7070
github.com/aws-controllers-k8s/iam-controller v0.0.8/go.mod h1:IibRVHZc+MEISws4FXQVC0rGwTeePm/O1Pk4kpXq5x0=
7171
github.com/aws-controllers-k8s/runtime v0.17.2/go.mod h1:9c2CL3w0BlVkse+foHlP1SkJRqYWLs9H+4X/z+2kE3w=
72-
github.com/aws-controllers-k8s/runtime v0.18.4 h1:iwLYNwhbuiWZrHPoulGj75oT+alE91wCNkF1FUELiAw=
73-
github.com/aws-controllers-k8s/runtime v0.18.4/go.mod h1:oA8ML1/LL3chPn26P6SzBNu1CUI2nekB+PTqykNs0qU=
72+
github.com/aws-controllers-k8s/runtime v0.19.1 h1:OBV7vbIbLFRpXdAwJfoPGphhjTa7xSc3pS/kuYlKzRU=
73+
github.com/aws-controllers-k8s/runtime v0.19.1/go.mod h1:oA8ML1/LL3chPn26P6SzBNu1CUI2nekB+PTqykNs0qU=
7474
github.com/aws/aws-sdk-go v1.42.0/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
7575
github.com/aws/aws-sdk-go v1.42.28 h1:YJtgL7IGSN41saY4JLW08jya5nU0vGcuAeAa1OL2M6c=
7676
github.com/aws/aws-sdk-go v1.42.28/go.mod h1:OGr6lGMAKGlG9CVrYnWYDKIyb829c6EVBRjxqjmPepc=

‎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: eks-chart
33
description: A Helm chart for the ACK service controller for Amazon Elastic Kubernetes Service (EKS)
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/eks-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/eks-controller:v0.1.1".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/eks-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 -}}

0 commit comments

Comments
 (0)