Skip to content

Commit 5de8793

Browse files
authored
Update to ACK runtime v0.28.0, code-generator v0.28.0 (#11)
### Update to ACK runtime `v0.28.0`, code-generator `v0.28.0` ---------- * ACK code-generator `v0.28.0` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.28.0) * ACK runtime `v0.28.0` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.28.0) ---------- #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building organizations-controller ==== Copying common custom resource definitions into organizations Building Kubernetes API objects for organizations Generating deepcopy code for organizations Generating custom resource definitions for organizations Building service controller for organizations Generating RBAC manifests for organizations Running gofmt against generated code for organizations Updating additional GitHub repository maintenance files ==== building organizations-controller release artifacts ==== Building release artifacts for organizations-v0.0.0-non-release-version Generating common custom resource definitions Generating custom resource definitions for organizations Generating RBAC manifests for organizations ``` By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent d365191 commit 5de8793

17 files changed

+248
-529
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: "2023-08-20T21:32:44Z"
3-
build_hash: 8f3ba427974fd6e769926778d54834eaee3b81a3
4-
go_version: go1.20
5-
version: v0.26.1
2+
build_date: "2023-12-22T06:27:46Z"
3+
build_hash: 1f16813c807af6889060b4ce7ded2a69dc027d8c
4+
go_version: go1.21.5
5+
version: v0.28.0
66
api_directory_checksum: 37b933d95cb4cee8d623aa354c10fe43c29575ed
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.44.167

cmd/controller/main.go

Lines changed: 8 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/controller/deployment.yaml

Lines changed: 10 additions & 3 deletions
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
@@ -79,5 +85,6 @@ spec:
7985
terminationGracePeriodSeconds: 10
8086
serviceAccountName: ack-organizations-controller
8187
hostIPC: false
82-
hostNetwork: false
8388
hostPID: false
89+
hostNetwork: false
90+
dnsPolicy: ClusterFirst

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/organizations-controller
9-
newTag: 0.0.0-non-release-version
9+
newTag: 0.0.1

config/rbac/kustomization.yaml

Lines changed: 2 additions & 1 deletion
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
Lines changed: 14 additions & 0 deletions
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: organizations-leader-election-rolebinding
7+
roleRef:
8+
apiGroup: rbac.authorization.k8s.io
9+
kind: Role
10+
name: organizations-leader-election-role
11+
subjects:
12+
- kind: ServiceAccount
13+
name: ack-organizations-controller
14+
namespace: ack-system
Lines changed: 26 additions & 0 deletions
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: organizations-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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
module github.com/aws-controllers-k8s/organizations-controller
22

3-
go 1.17
3+
go 1.19
44

55
require (
6-
github.com/aws-controllers-k8s/runtime v0.26.0
7-
github.com/aws/aws-sdk-go v1.44.167
6+
github.com/aws-controllers-k8s/runtime v0.28.0
7+
github.com/aws/aws-sdk-go v1.49.0
88
github.com/go-logr/logr v1.2.3
99
github.com/spf13/pflag v1.0.5
10-
k8s.io/api v0.26.1
11-
k8s.io/apimachinery v0.26.1
12-
k8s.io/client-go v0.26.1
10+
k8s.io/api v0.26.8
11+
k8s.io/apimachinery v0.26.8
12+
k8s.io/client-go v0.26.8
1313
sigs.k8s.io/controller-runtime v0.14.5
1414
)
1515

@@ -31,7 +31,7 @@ require (
3131
github.com/google/gnostic v0.5.7-v3refs // indirect
3232
github.com/google/go-cmp v0.5.9 // indirect
3333
github.com/google/gofuzz v1.1.0 // indirect
34-
github.com/google/uuid v1.1.2 // indirect
34+
github.com/google/uuid v1.3.0 // indirect
3535
github.com/imdario/mergo v0.3.12 // indirect
3636
github.com/itchyny/gojq v0.12.6 // indirect
3737
github.com/itchyny/timefmt-go v0.1.3 // indirect
@@ -54,11 +54,11 @@ require (
5454
go.uber.org/multierr v1.6.0 // indirect
5555
go.uber.org/zap v1.24.0 // indirect
5656
golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect
57-
golang.org/x/net v0.7.0 // indirect
57+
golang.org/x/net v0.17.0 // indirect
5858
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
59-
golang.org/x/sys v0.5.0 // indirect
60-
golang.org/x/term v0.5.0 // indirect
61-
golang.org/x/text v0.7.0 // indirect
59+
golang.org/x/sys v0.13.0 // indirect
60+
golang.org/x/term v0.13.0 // indirect
61+
golang.org/x/text v0.13.0 // indirect
6262
golang.org/x/time v0.3.0 // indirect
6363
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
6464
google.golang.org/appengine v1.6.7 // indirect

0 commit comments

Comments
 (0)