Skip to content

Commit ec2c0cf

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

16 files changed

+219
-49
lines changed

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ack_generate_info:
2-
build_date: "2023-05-15T23:30:46Z"
3-
build_hash: 8f3ba427974fd6e769926778d54834eaee3b81a3
4-
go_version: go1.19
5-
version: v0.26.1
2+
build_date: "2023-09-07T02:00:18Z"
3+
build_hash: 2f2b5e916c59ae2a793a1cc9f9d7333b197c9549
4+
go_version: go1.21.0
5+
version: v0.27.0
66
api_directory_checksum: 62a1b01c505efd55545d306c2353b9673ce344fb
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.44.218

‎cmd/controller/main.go

+8-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/controller/deployment.yaml

+8-2
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,16 @@ spec:
2929
- "$(AWS_REGION)"
3030
- --aws-endpoint-url
3131
- "$(AWS_ENDPOINT_URL)"
32-
- --enable-development-logging
33-
- "$(ACK_ENABLE_DEVELOPMENT_LOGGING)"
32+
- --enable-development-logging=$(ACK_ENABLE_DEVELOPMENT_LOGGING)
3433
- --log-level
3534
- "$(ACK_LOG_LEVEL)"
3635
- --resource-tags
3736
- "$(ACK_RESOURCE_TAGS)"
3837
- --watch-namespace
3938
- "$(ACK_WATCH_NAMESPACE)"
39+
- --enable-leader-election=$(ENABLE_LEADER_ELECTION)
40+
- --leader-election-namespace
41+
- "$(LEADER_ELECTION_NAMESPACE)"
4042
image: controller:latest
4143
name: controller
4244
ports:
@@ -66,6 +68,10 @@ spec:
6668
value: "info"
6769
- name: ACK_RESOURCE_TAGS
6870
value: "services.k8s.aws/controller-version=%CONTROLLER_SERVICE%-%CONTROLLER_VERSION%,services.k8s.aws/namespace=%K8S_NAMESPACE%"
71+
- name: ENABLE_LEADER_ELECTION
72+
value: "false"
73+
- name: LEADER_ELECTION_NAMESPACE
74+
value: "ack-system"
6975
securityContext:
7076
allowPrivilegeEscalation: false
7177
privileged: false

‎config/controller/kustomization.yaml

+1-1
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/sagemaker-controller
9-
newTag: 1.2.2
9+
newTag: 1.2.3

‎config/rbac/kustomization.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ resources:
44
- role-reader.yaml
55
- role-writer.yaml
66
- service-account.yaml
7-
7+
- leader-election-role.yaml
8+
- leader-election-role-binding.yaml

‎config/rbac/leader-election-role-binding.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
apiVersion: rbac.authorization.k8s.io/v1
3+
kind: RoleBinding
4+
metadata:
5+
namespace: ack-system
6+
name: sagemaker-leader-election-rolebinding
7+
roleRef:
8+
apiGroup: rbac.authorization.k8s.io
9+
kind: Role
10+
name: sagemaker-leader-election-role
11+
subjects:
12+
- kind: ServiceAccount
13+
name: ack-sagemaker-controller
14+
namespace: ack-system

‎config/rbac/leader-election-role.yaml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
---
2+
apiVersion: rbac.authorization.k8s.io/v1
3+
kind: Role
4+
metadata:
5+
name: sagemaker-leader-election-role
6+
namespace: ack-system
7+
rules:
8+
- apiGroups:
9+
- coordination.k8s.io
10+
resources:
11+
- leases
12+
verbs:
13+
- get
14+
- list
15+
- watch
16+
- create
17+
- update
18+
- patch
19+
- delete
20+
- apiGroups:
21+
- ""
22+
resources:
23+
- events
24+
verbs:
25+
- create
26+
- patch

‎go.mod

+9-9
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ module github.com/aws-controllers-k8s/sagemaker-controller
33
go 1.19
44

55
require (
6-
github.com/aws-controllers-k8s/runtime v0.26.0
6+
github.com/aws-controllers-k8s/runtime v0.27.1
77
github.com/aws/aws-sdk-go v1.44.218
88
github.com/ghodss/yaml v1.0.0
99
github.com/go-logr/logr v1.2.3
1010
github.com/google/go-cmp v0.5.9
1111
github.com/spf13/pflag v1.0.5
1212
github.com/stretchr/testify v1.8.0
1313
go.uber.org/zap v1.24.0
14-
k8s.io/api v0.26.1
15-
k8s.io/apimachinery v0.26.1
16-
k8s.io/client-go v0.26.1
14+
k8s.io/api v0.26.8
15+
k8s.io/apimachinery v0.26.8
16+
k8s.io/client-go v0.26.8
1717
sigs.k8s.io/controller-runtime v0.14.5
1818
)
1919

@@ -34,7 +34,7 @@ require (
3434
github.com/golang/protobuf v1.5.2 // indirect
3535
github.com/google/gnostic v0.5.7-v3refs // indirect
3636
github.com/google/gofuzz v1.1.0 // indirect
37-
github.com/google/uuid v1.1.2 // indirect
37+
github.com/google/uuid v1.3.0 // indirect
3838
github.com/imdario/mergo v0.3.12 // indirect
3939
github.com/itchyny/gojq v0.12.6 // indirect
4040
github.com/itchyny/timefmt-go v0.1.3 // indirect
@@ -58,11 +58,11 @@ require (
5858
go.uber.org/atomic v1.7.0 // indirect
5959
go.uber.org/multierr v1.6.0 // indirect
6060
golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect
61-
golang.org/x/net v0.7.0 // indirect
61+
golang.org/x/net v0.8.0 // indirect
6262
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
63-
golang.org/x/sys v0.5.0 // indirect
64-
golang.org/x/term v0.5.0 // indirect
65-
golang.org/x/text v0.7.0 // indirect
63+
golang.org/x/sys v0.6.0 // indirect
64+
golang.org/x/term v0.6.0 // indirect
65+
golang.org/x/text v0.8.0 // indirect
6666
golang.org/x/time v0.3.0 // indirect
6767
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
6868
google.golang.org/appengine v1.6.7 // indirect

‎go.sum

+18-18
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy
3838
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
3939
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
4040
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
41-
github.com/aws-controllers-k8s/runtime v0.26.0 h1:XKqygFzHSBtM74Ov9IroZbyCVeYei9Eskp4aKbJ2SFw=
42-
github.com/aws-controllers-k8s/runtime v0.26.0/go.mod h1:jizDzKikL09cueIuA9ZxoZ+4pfn5U7oKW5s/ZAqOA6E=
41+
github.com/aws-controllers-k8s/runtime v0.27.1 h1:tvJRQDioBFkob0kF4DwgS7MsoXZKwkG5QCHWxFEh+2o=
42+
github.com/aws-controllers-k8s/runtime v0.27.1/go.mod h1:oSCqCzbzJLUrzv+cx4TIxCuSUvL75ABJmhxBc87IRqc=
4343
github.com/aws/aws-sdk-go v1.44.218 h1:p707+xOCazWhkSpZOeyhtTcg7Z+asxxvueGgYPSitn4=
4444
github.com/aws/aws-sdk-go v1.44.218/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
4545
github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
@@ -165,8 +165,8 @@ github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hf
165165
github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
166166
github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
167167
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
168-
github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
169-
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
168+
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
169+
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
170170
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
171171
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
172172
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
@@ -380,8 +380,8 @@ golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su
380380
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
381381
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
382382
golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
383-
golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
384-
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
383+
golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
384+
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
385385
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
386386
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
387387
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -446,13 +446,13 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
446446
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
447447
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
448448
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
449-
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
450-
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
449+
golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
450+
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
451451
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
452452
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
453453
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
454-
golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
455-
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
454+
golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw=
455+
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
456456
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
457457
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
458458
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -461,8 +461,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
461461
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
462462
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
463463
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
464-
golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
465-
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
464+
golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
465+
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
466466
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
467467
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
468468
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -627,14 +627,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
627627
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
628628
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
629629
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
630-
k8s.io/api v0.26.1 h1:f+SWYiPd/GsiWwVRz+NbFyCgvv75Pk9NK6dlkZgpCRQ=
631-
k8s.io/api v0.26.1/go.mod h1:xd/GBNgR0f707+ATNyPmQ1oyKSgndzXij81FzWGsejg=
630+
k8s.io/api v0.26.8 h1:k2OtFmQPWfDUyAuYAwQPftVygF/vz4BMGSKnd15iddM=
631+
k8s.io/api v0.26.8/go.mod h1:QaflR7cmG3V9lIz0VLBM+ylndNN897OAUAoJDcgwiQw=
632632
k8s.io/apiextensions-apiserver v0.26.1 h1:cB8h1SRk6e/+i3NOrQgSFij1B2S0Y0wDoNl66bn8RMI=
633633
k8s.io/apiextensions-apiserver v0.26.1/go.mod h1:AptjOSXDGuE0JICx/Em15PaoO7buLwTs0dGleIHixSM=
634-
k8s.io/apimachinery v0.26.1 h1:8EZ/eGJL+hY/MYCNwhmDzVqq2lPl3N3Bo8rvweJwXUQ=
635-
k8s.io/apimachinery v0.26.1/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74=
636-
k8s.io/client-go v0.26.1 h1:87CXzYJnAMGaa/IDDfRdhTzxk/wzGZ+/HUQpqgVSZXU=
637-
k8s.io/client-go v0.26.1/go.mod h1:IWNSglg+rQ3OcvDkhY6+QLeasV4OYHDjdqeWkDQZwGE=
634+
k8s.io/apimachinery v0.26.8 h1:SzpGtRX3/j/Ylg8Eg65Iobpxi9Jz4vOvI0qcBZyPVrM=
635+
k8s.io/apimachinery v0.26.8/go.mod h1:qYzLkrQ9lhrZRh0jNKo2cfvf/R1/kQONnSiyB7NUJU0=
636+
k8s.io/client-go v0.26.8 h1:pPuTYaVtLlg/7n6rqs3MsKLi4XgNaJ3rTMyS37Y5CKU=
637+
k8s.io/client-go v0.26.8/go.mod h1:1sBQqKmdy9rWZYQnoedpc0gnRXG7kU3HrKZvBe2QbGM=
638638
k8s.io/component-base v0.26.1 h1:4ahudpeQXHZL5kko+iDHqLj/FSGAEUnSVO0EBbgDd+4=
639639
k8s.io/component-base v0.26.1/go.mod h1:VHrLR0b58oC035w6YQiBSbtsf0ThuSwXP+p5dD/kAWU=
640640
k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=

‎helm/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v1
22
name: sagemaker-chart
33
description: A Helm chart for the ACK service controller for Amazon SageMaker (SageMaker)
4-
version: 1.2.2
5-
appVersion: 1.2.2
4+
version: 1.2.3
5+
appVersion: 1.2.3
66
home: https://github.com/aws-controllers-k8s/sagemaker-controller
77
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
88
sources:

‎helm/templates/NOTES.txt

+1-1
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/sagemaker-controller:1.2.2".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/sagemaker-controller:1.2.3".
33

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

‎helm/templates/deployment.yaml

+23-2
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@ spec:
1818
app.kubernetes.io/instance: {{ .Release.Name }}
1919
template:
2020
metadata:
21+
{{- if .Values.deployment.annotations }}
2122
annotations:
2223
{{- range $key, $value := .Values.deployment.annotations }}
2324
{{ $key }}: {{ $value | quote }}
2425
{{- end }}
26+
{{- end }}
2527
labels:
2628
app.kubernetes.io/name: {{ include "app.name" . }}
2729
app.kubernetes.io/instance: {{ .Release.Name }}
@@ -47,7 +49,7 @@ spec:
4749
- --aws-endpoint-url
4850
- "$(AWS_ENDPOINT_URL)"
4951
- --enable-development-logging
50-
- "$(ACK_ENABLE_DEVELOPMENT_LOGGING)"
52+
- "$(ENABLE_DEVELOPMENT_LOGGING)"
5153
- --log-level
5254
- "$(ACK_LOG_LEVEL)"
5355
- --resource-tags
@@ -56,6 +58,10 @@ spec:
5658
- "$(ACK_WATCH_NAMESPACE)"
5759
- --deletion-policy
5860
- "$(DELETION_POLICY)"
61+
- --enable-leader-election
62+
- "$(ENABLE_LEADER_ELECTION)"
63+
- --leader-election-namespace
64+
- "$(LEADER_ELECTION_NAMESPACE)"
5965
{{- if gt .Values.reconcile.defaultResyncPeriod 0.0 }}
6066
- --reconcile-default-resync-seconds
6167
- "$(RECONCILE_DEFAULT_RESYNC_SECONDS)"
@@ -85,6 +91,10 @@ spec:
8591
value: {{ include "watch-namespace" . }}
8692
- name: DELETION_POLICY
8793
value: {{ .Values.deletionPolicy }}
94+
- name: ENABLED_LEADER_ELECTION
95+
value: {{ .Values.leaderElection.enabled | quote }}
96+
- name: LEADER_ELECTION_NAMESPACE
97+
value: {{ .Values.leaderElection.namespace | quote }}
8898
- name: ACK_ENABLE_DEVELOPMENT_LOGGING
8999
value: {{ .Values.log.enable_development_logging | quote }}
90100
- name: ACK_LOG_LEVEL
@@ -104,11 +114,19 @@ spec:
104114
value: {{ include "aws.credentials.path" . }}
105115
- name: AWS_PROFILE
106116
value: {{ .Values.aws.credentials.profile }}
117+
{{- end }}
118+
{{- if .Values.deployment.extraEnvVars -}}
119+
{{ toYaml .Values.deployment.extraEnvVars | nindent 8 }}
120+
{{- end }}
107121
volumeMounts:
122+
{{- if .Values.aws.credentials.secretName }}
108123
- name: {{ .Values.aws.credentials.secretName }}
109124
mountPath: {{ include "aws.credentials.secret_mount_path" . }}
110125
readOnly: true
111126
{{- end }}
127+
{{- if .Values.deployment.extraVolumeMounts -}}
128+
{{ toYaml .Values.deployment.extraVolumeMounts | nindent 12 }}
129+
{{- end }}
112130
securityContext:
113131
allowPrivilegeEscalation: false
114132
privileged: false
@@ -133,9 +151,12 @@ spec:
133151
hostIPC: false
134152
hostNetwork: false
135153
hostPID: false
136-
{{ if .Values.aws.credentials.secretName -}}
137154
volumes:
155+
{{- if .Values.aws.credentials.secretName -}}
138156
- name: {{ .Values.aws.credentials.secretName }}
139157
secret:
140158
secretName: {{ .Values.aws.credentials.secretName }}
141159
{{ end -}}
160+
{{- if .Values.deployment.extraVolumes }}
161+
{{ toYaml .Values.deployment.extraVolumes | indent 8}}
162+
{{- end }}

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

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{{ if .Values.leaderElection.enabled }}
2+
apiVersion: rbac.authorization.k8s.io/v1
3+
kind: RoleBinding
4+
metadata:
5+
name: sagemaker-leader-election-rolebinding
6+
{{ if .Values.leaderElection.namespace }}
7+
namespace: {{ .Values.leaderElection.namespace }}
8+
{{ else }}
9+
namespace: {{ .Release.Namespace }}
10+
{{ end }}
11+
roleRef:
12+
apiGroup: rbac.authorization.k8s.io
13+
kind: Role
14+
name: sagemaker-leader-election-role
15+
subjects:
16+
- kind: ServiceAccount
17+
name: ack-sagemaker-controller
18+
namespace: {{ .Release.Namespace }}{{- end }}

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

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{{ if .Values.leaderElection.enabled }}
2+
apiVersion: rbac.authorization.k8s.io/v1
3+
kind: Role
4+
metadata:
5+
name: sagemaker-leader-election-role
6+
{{ if .Values.leaderElection.namespace }}
7+
namespace: {{ .Values.leaderElection.namespace }}
8+
{{ else }}
9+
namespace: {{ .Release.Namespace }}
10+
{{ end }}
11+
rules:
12+
- apiGroups:
13+
- coordination.k8s.io
14+
resources:
15+
- leases
16+
verbs:
17+
- get
18+
- list
19+
- watch
20+
- create
21+
- update
22+
- patch
23+
- delete
24+
- apiGroups:
25+
- ""
26+
resources:
27+
- events
28+
verbs:
29+
- create
30+
- patch{{- end }}

0 commit comments

Comments
 (0)