Skip to content

Commit 02af2e3

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

14 files changed

+61
-61
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: "2024-02-11T03:01:49Z"
3-
build_hash: 3b621aa5580a69c58beee58a9ed63346716f347f
4-
go_version: go1.21.5
5-
version: v0.29.2-6-g3b621aa
2+
build_date: "2024-02-14T03:58:04Z"
3+
build_hash: 947081ffebdeefcf2c61c4ca6d7e68810bdf9d08
4+
go_version: go1.22.0
5+
version: v0.30.0
66
api_directory_checksum: 3dac0a046021e0a9f5828ed93eb269ab4d4420a0
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.50.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/efs-controller
9-
newTag: 0.0.3
9+
newTag: 0.0.4

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ toolchain go1.21.5
77
require (
88
github.com/aws-controllers-k8s/ec2-controller v1.2.2
99
github.com/aws-controllers-k8s/kms-controller v1.0.9
10-
github.com/aws-controllers-k8s/runtime v0.29.2
10+
github.com/aws-controllers-k8s/runtime v0.30.0
1111
github.com/aws/aws-sdk-go v1.49.24
1212
github.com/go-logr/logr v1.4.1
1313
github.com/spf13/pflag v1.0.5
1414
k8s.io/api v0.29.0
1515
k8s.io/apimachinery v0.29.0
1616
k8s.io/client-go v0.29.0
17-
sigs.k8s.io/controller-runtime v0.16.3
17+
sigs.k8s.io/controller-runtime v0.17.0
1818
)
1919

2020
require (

‎go.sum

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ github.com/aws-controllers-k8s/ec2-controller v1.2.2 h1:ek/cGd76XTWQXe6185nxrmEm
22
github.com/aws-controllers-k8s/ec2-controller v1.2.2/go.mod h1:4e2L1aHo1fk3ihVTRmnhA6VJ2NSSoYPEf1GZNYYPwLw=
33
github.com/aws-controllers-k8s/kms-controller v1.0.9 h1:GZHSnuZBoWp9r6RaJ3siyDn5BRhDuaZJXtdBKeAiLSw=
44
github.com/aws-controllers-k8s/kms-controller v1.0.9/go.mod h1:Pnz0d5sly7dUgmYMDJWSRIKASOujJFi/b8N2q1qCLqU=
5-
github.com/aws-controllers-k8s/runtime v0.29.2 h1:t6wwoKqFmtbblMcwFivpWp1FZa0gkczoUsk+maIsiRA=
6-
github.com/aws-controllers-k8s/runtime v0.29.2/go.mod h1:mZa9l+/l+tlbxWVmMWWbUC3oAHUbeTzlI7xTOMdYHpA=
5+
github.com/aws-controllers-k8s/runtime v0.30.0 h1:AibYRdi/7xUA3t8BA0u8g+J+OioaTAT6R4Vq8hxLiYw=
6+
github.com/aws-controllers-k8s/runtime v0.30.0/go.mod h1:Pv1ozlUaO11KO2mwPN/HzhAtZ70ZDE9UP24mjsbkul0=
77
github.com/aws/aws-sdk-go v1.49.24 h1:2ekq9ZvaoB2aRbTDfARzgVGUBB9N8XD2QYhFmTBlp+c=
88
github.com/aws/aws-sdk-go v1.49.24/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
99
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
@@ -97,10 +97,10 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
9797
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
9898
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
9999
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
100-
github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4=
101-
github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
102-
github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg=
103-
github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
100+
github.com/onsi/ginkgo/v2 v2.14.0 h1:vSmGj2Z5YPb9JwCWT6z6ihcUvDhuXLc3sJiqd3jMKAY=
101+
github.com/onsi/ginkgo/v2 v2.14.0/go.mod h1:JkUdW7JkN0V6rFvsHcJ478egV3XH9NxpD27Hal/PhZw=
102+
github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
103+
github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
104104
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
105105
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
106106
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -131,8 +131,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU
131131
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
132132
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
133133
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
134-
go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
135-
go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
134+
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
135+
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
136136
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
137137
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
138138
go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
@@ -176,8 +176,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
176176
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
177177
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
178178
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
179-
golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss=
180-
golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
179+
golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA=
180+
golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
181181
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
182182
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
183183
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -219,8 +219,8 @@ k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/A
219219
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
220220
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
221221
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
222-
sigs.k8s.io/controller-runtime v0.16.3 h1:2TuvuokmfXvDUamSx1SuAOO3eTyye+47mJCigwG62c4=
223-
sigs.k8s.io/controller-runtime v0.16.3/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0=
222+
sigs.k8s.io/controller-runtime v0.17.0 h1:fjJQf8Ukya+VjogLO6/bNX9HE6Y2xpsO5+fyS26ur/s=
223+
sigs.k8s.io/controller-runtime v0.17.0/go.mod h1:+MngTvIQQQhfXtwfdGw/UOQ/aIaqsYywfCINOtwMO/s=
224224
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
225225
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
226226
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=

‎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: efs-chart
33
description: A Helm chart for the ACK service controller for Amazon Elastic File System (EFS)
4-
version: 0.0.3
5-
appVersion: 0.0.3
4+
version: 0.0.4
5+
appVersion: 0.0.4
66
home: https://github.com/aws-controllers-k8s/efs-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/efs-controller:0.0.3".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/efs-controller:0.0.4".
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: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{/* The name of the application this chart installs */}}
2-
{{- define "app.name" -}}
2+
{{- define "ack-efs-controller.app.name" -}}
33
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
44
{{- end -}}
55

@@ -8,7 +8,7 @@ Create a default fully qualified app name.
88
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
99
If release name contains chart name it will be used as a full name.
1010
*/}}
11-
{{- define "app.fullname" -}}
11+
{{- define "ack-efs-controller.app.fullname" -}}
1212
{{- if .Values.fullnameOverride -}}
1313
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
1414
{{- else -}}
@@ -22,33 +22,33 @@ If release name contains chart name it will be used as a full name.
2222
{{- end -}}
2323

2424
{{/* The name and version as used by the chart label */}}
25-
{{- define "chart.name-version" -}}
25+
{{- define "ack-efs-controller.chart.name-version" -}}
2626
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
2727
{{- end -}}
2828

2929
{{/* The name of the service account to use */}}
30-
{{- define "service-account.name" -}}
30+
{{- define "ack-efs-controller.service-account.name" -}}
3131
{{ default "default" .Values.serviceAccount.name }}
3232
{{- end -}}
3333

34-
{{- define "watch-namespace" -}}
34+
{{- define "ack-efs-controller.watch-namespace" -}}
3535
{{- if eq .Values.installScope "namespace" -}}
3636
{{ .Values.watchNamespace | default .Release.Namespace }}
3737
{{- end -}}
3838
{{- end -}}
3939

4040
{{/* The mount path for the shared credentials file */}}
41-
{{- define "aws.credentials.secret_mount_path" -}}
41+
{{- define "ack-efs-controller.aws.credentials.secret_mount_path" -}}
4242
{{- "/var/run/secrets/aws" -}}
4343
{{- end -}}
4444

4545
{{/* The path the shared credentials file is mounted */}}
46-
{{- define "aws.credentials.path" -}}
46+
{{- define "ack-efs-controller.aws.credentials.path" -}}
4747
{{- printf "%s/%s" (include "aws.credentials.secret_mount_path" .) .Values.aws.credentials.secretKey -}}
4848
{{- end -}}
4949

5050
{{/* The rules a of ClusterRole or Role */}}
51-
{{- define "controller-role-rules" }}
51+
{{- define "ack-efs-controller.rbac-rules" -}}
5252
rules:
5353
- apiGroups:
5454
- ""

‎helm/templates/cluster-role-binding.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRoleBinding
44
metadata:
5-
name: {{ include "app.fullname" . }}
5+
name: {{ include "ack-efs-controller.app.fullname" . }}
66
roleRef:
77
kind: ClusterRole
88
apiGroup: rbac.authorization.k8s.io
99
name: ack-efs-controller
1010
subjects:
1111
- kind: ServiceAccount
12-
name: {{ include "service-account.name" . }}
12+
name: {{ include "ack-efs-controller.service-account.name" . }}
1313
namespace: {{ .Release.Namespace }}
1414
{{ else if eq .Values.installScope "namespace" }}
15-
{{ $wn := include "watch-namespace" . }}
15+
{{ $wn := include "ack-efs-controller.watch-namespace" . }}
1616
{{ $namespaces := split "," $wn }}
17-
{{ $fullname := include "app.fullname" . }}
17+
{{ $fullname := include "ack-efs-controller.app.fullname" . }}
1818
{{ $releaseNamespace := .Release.Namespace }}
19-
{{ $serviceAccountName := include "service-account.name" . }}
19+
{{ $serviceAccountName := include "ack-efs-controller.service-account.name" . }}
2020
{{ range $namespaces }}
2121
---
2222
apiVersion: rbac.authorization.k8s.io/v1

‎helm/templates/cluster-role-controller.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{ $labels := .Values.role.labels }}
2-
{{ $rules := include "controller-role-rules" . }}
2+
{{ $rbacRules := include "ack-efs-controller.rbac-rules" . }}
33
{{ if eq .Values.installScope "cluster" }}
44
apiVersion: rbac.authorization.k8s.io/v1
55
kind: ClusterRole
@@ -9,9 +9,9 @@ metadata:
99
{{- range $key, $value := $labels }}
1010
{{ $key }}: {{ $value | quote }}
1111
{{- end }}
12-
{{- $rules }}
12+
{{$rbacRules }}
1313
{{ else if eq .Values.installScope "namespace" }}
14-
{{ $wn := include "watch-namespace" . }}
14+
{{ $wn := include "ack-efs-controller.watch-namespace" . }}
1515
{{ $namespaces := split "," $wn }}
1616
{{ range $namespaces }}
1717
---
@@ -24,6 +24,6 @@ metadata:
2424
{{- range $key, $value := $labels }}
2525
{{ $key }}: {{ $value | quote }}
2626
{{- end }}
27-
{{- $rules }}
27+
{{ $rbacRules }}
2828
{{ end }}
2929
{{ end }}

‎helm/templates/deployment.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
4-
name: {{ include "app.fullname" . }}
4+
name: {{ include "ack-efs-controller.app.fullname" . }}
55
namespace: {{ .Release.Namespace }}
66
labels:
7-
app.kubernetes.io/name: {{ include "app.name" . }}
7+
app.kubernetes.io/name: {{ include "ack-efs-controller.app.name" . }}
88
app.kubernetes.io/instance: {{ .Release.Name }}
99
app.kubernetes.io/managed-by: Helm
1010
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
11-
k8s-app: {{ include "app.name" . }}
12-
helm.sh/chart: {{ include "chart.name-version" . }}
11+
k8s-app: {{ include "ack-efs-controller.app.name" . }}
12+
helm.sh/chart: {{ include "ack-efs-controller.chart.name-version" . }}
1313
spec:
1414
replicas: {{ .Values.deployment.replicas }}
1515
selector:
1616
matchLabels:
17-
app.kubernetes.io/name: {{ include "app.name" . }}
17+
app.kubernetes.io/name: {{ include "ack-efs-controller.app.name" . }}
1818
app.kubernetes.io/instance: {{ .Release.Name }}
1919
template:
2020
metadata:
@@ -25,15 +25,15 @@ spec:
2525
{{- end }}
2626
{{- end }}
2727
labels:
28-
app.kubernetes.io/name: {{ include "app.name" . }}
28+
app.kubernetes.io/name: {{ include "ack-efs-controller.app.name" . }}
2929
app.kubernetes.io/instance: {{ .Release.Name }}
3030
app.kubernetes.io/managed-by: Helm
31-
k8s-app: {{ include "app.name" . }}
31+
k8s-app: {{ include "ack-efs-controller.app.name" . }}
3232
{{- range $key, $value := .Values.deployment.labels }}
3333
{{ $key }}: {{ $value | quote }}
3434
{{- end }}
3535
spec:
36-
serviceAccountName: {{ include "service-account.name" . }}
36+
serviceAccountName: {{ include "ack-efs-controller.service-account.name" . }}
3737
{{- if .Values.image.pullSecrets }}
3838
imagePullSecrets:
3939
{{- range .Values.image.pullSecrets }}
@@ -90,7 +90,7 @@ spec:
9090
- name: AWS_ENDPOINT_URL
9191
value: {{ .Values.aws.endpoint_url | quote }}
9292
- name: ACK_WATCH_NAMESPACE
93-
value: {{ include "watch-namespace" . }}
93+
value: {{ include "ack-efs-controller.watch-namespace" . }}
9494
- name: DELETION_POLICY
9595
value: {{ .Values.deletionPolicy }}
9696
- name: LEADER_ELECTION_NAMESPACE
@@ -109,7 +109,7 @@ spec:
109109
{{- end }}
110110
{{- if .Values.aws.credentials.secretName }}
111111
- name: AWS_SHARED_CREDENTIALS_FILE
112-
value: {{ include "aws.credentials.path" . }}
112+
value: {{ include "ack-efs-controller.aws.credentials.path" . }}
113113
- name: AWS_PROFILE
114114
value: {{ .Values.aws.credentials.profile }}
115115
{{- end }}
@@ -119,7 +119,7 @@ spec:
119119
volumeMounts:
120120
{{- if .Values.aws.credentials.secretName }}
121121
- name: {{ .Values.aws.credentials.secretName }}
122-
mountPath: {{ include "aws.credentials.secret_mount_path" . }}
122+
mountPath: {{ include "ack-efs-controller.aws.credentials.secret_mount_path" . }}
123123
readOnly: true
124124
{{- end }}
125125
{{- if .Values.deployment.extraVolumeMounts -}}

‎helm/templates/leader-election-role-binding.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ roleRef:
1414
name: efs-leader-election-role
1515
subjects:
1616
- kind: ServiceAccount
17-
name: {{ include "service-account.name" . }}
17+
name: {{ include "ack-efs-controller.service-account.name" . }}
1818
namespace: {{ .Release.Namespace }}{{- end }}

‎helm/templates/metrics-service.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ metadata:
55
name: {{ .Chart.Name | trimSuffix "-chart" | trunc 44 }}-controller-metrics
66
namespace: {{ .Release.Namespace }}
77
labels:
8-
app.kubernetes.io/name: {{ include "app.name" . }}
8+
app.kubernetes.io/name: {{ include "ack-efs-controller.app.name" . }}
99
app.kubernetes.io/instance: {{ .Release.Name }}
1010
app.kubernetes.io/managed-by: Helm
1111
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
12-
k8s-app: {{ include "app.name" . }}
13-
helm.sh/chart: {{ include "chart.name-version" . }}
12+
k8s-app: {{ include "ack-efs-controller.app.name" . }}
13+
helm.sh/chart: {{ include "ack-efs-controller.chart.name-version" . }}
1414
spec:
1515
selector:
16-
app.kubernetes.io/name: {{ include "app.name" . }}
16+
app.kubernetes.io/name: {{ include "ack-efs-controller.app.name" . }}
1717
app.kubernetes.io/instance: {{ .Release.Name }}
1818
app.kubernetes.io/managed-by: Helm
19-
k8s-app: {{ include "app.name" . }}
19+
k8s-app: {{ include "ack-efs-controller.app.name" . }}
2020
{{- range $key, $value := .Values.deployment.labels }}
2121
{{ $key }}: {{ $value | quote }}
2222
{{- end }}

‎helm/templates/service-account.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ apiVersion: v1
33
kind: ServiceAccount
44
metadata:
55
labels:
6-
app.kubernetes.io/name: {{ include "app.name" . }}
6+
app.kubernetes.io/name: {{ include "ack-efs-controller.app.name" . }}
77
app.kubernetes.io/instance: {{ .Release.Name }}
88
app.kubernetes.io/managed-by: Helm
99
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
10-
k8s-app: {{ include "app.name" . }}
11-
helm.sh/chart: {{ include "chart.name-version" . }}
12-
name: {{ include "service-account.name" . }}
10+
k8s-app: {{ include "ack-efs-controller.app.name" . }}
11+
helm.sh/chart: {{ include "ack-efs-controller.chart.name-version" . }}
12+
name: {{ include "ack-efs-controller.service-account.name" . }}
1313
namespace: {{ .Release.Namespace }}
1414
annotations:
1515
{{- range $key, $value := .Values.serviceAccount.annotations }}

‎helm/values.yaml

Lines changed: 1 addition & 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/efs-controller
7-
tag: 0.0.3
7+
tag: 0.0.4
88
pullPolicy: IfNotPresent
99
pullSecrets: []
1010

0 commit comments

Comments
 (0)