Skip to content

Commit d658882

Browse files
ack-botack-bot
authored
Update to ACK runtime v0.21.0, code-generator v0.21.0 (#54)
### Update to ACK runtime `v0.21.0`, code-generator `v0.21.0` ---------- * ACK code-generator `v0.21.0` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.21.0) * ACK runtime `v0.21.0` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.21.0) ---------- NOTE: This PR increments the release version of service controller from `v0.1.7` to `v0.1.8` Once this PR is merged, release `v0.1.8` 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.8 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 2919800 commit d658882

11 files changed

+34
-27
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ack_generate_info:
2-
build_date: "2022-09-12T19:36:34Z"
3-
build_hash: 2944c8772f216656d84ee02d392eaca501274c1e
2+
build_date: "2022-12-08T18:57:06Z"
3+
build_hash: 12246c7da82841b351ec7a9e1f139f9338f2784b
44
go_version: go1.17.5
5-
version: v0.20.1
5+
version: v0.21.0
66
api_directory_checksum: 9ccbf1f9bf7c5ee745f5b55fe465211dd2bb109a
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.44.93

‎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/eks-controller
9-
newTag: v0.1.7
9+
newTag: v0.1.8

‎config/crd/common/bases/services.k8s.aws_adoptedresources.yaml

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.7.0
6+
controller-gen.kubebuilder.io/version: v0.9.2
87
creationTimestamp: null
98
name: adoptedresources.services.k8s.aws
109
spec:
@@ -170,6 +169,7 @@ spec:
170169
- name
171170
- uid
172171
type: object
172+
x-kubernetes-map-type: atomic
173173
type: array
174174
type: object
175175
required:
@@ -224,9 +224,3 @@ spec:
224224
storage: true
225225
subresources:
226226
status: {}
227-
status:
228-
acceptedNames:
229-
kind: ""
230-
plural: ""
231-
conditions: []
232-
storedVersions: []

‎config/crd/common/bases/services.k8s.aws_fieldexports.yaml

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.7.0
6+
controller-gen.kubebuilder.io/version: v0.9.2
87
creationTimestamp: null
98
name: fieldexports.services.k8s.aws
109
spec:
@@ -133,9 +132,3 @@ spec:
133132
storage: true
134133
subresources:
135134
status: {}
136-
status:
137-
acceptedNames:
138-
kind: ""
139-
plural: ""
140-
conditions: []
141-
storedVersions: []

‎go.mod

+1-1
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.20.1
8+
github.com/aws-controllers-k8s/runtime v0.21.0
99
github.com/aws/aws-sdk-go v1.44.93
1010
github.com/go-logr/logr v1.2.0
1111
github.com/spf13/pflag v1.0.5

‎go.sum

+2-2
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.20.1 h1:L/Huf1shRahx5BqJBCSS5u+vYg3f0Rotsq1jutORpdI=
73-
github.com/aws-controllers-k8s/runtime v0.20.1/go.mod h1:k7z4qlf6aK1Kzd4ff49wzcyhDKHjWaUpqxrwgl4uS1o=
72+
github.com/aws-controllers-k8s/runtime v0.21.0 h1:e9DK88QodwXMLz+QXPXk+8XNetVj4ij+puaVwn9uEVc=
73+
github.com/aws-controllers-k8s/runtime v0.21.0/go.mod h1:k7z4qlf6aK1Kzd4ff49wzcyhDKHjWaUpqxrwgl4uS1o=
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.44.93 h1:hAgd9fuaptBatSft27/5eBMdcA8+cIMqo96/tZ6rKl8=
7676
github.com/aws/aws-sdk-go v1.44.93/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=

‎helm/Chart.yaml

+2-2
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.7
5-
appVersion: v0.1.7
4+
version: v0.1.8
5+
appVersion: v0.1.8
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

+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/eks-controller:v0.1.7".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/eks-controller:v0.1.8".
33

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

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

+8
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,19 @@ kind: ClusterRole
44
metadata:
55
creationTimestamp: null
66
name: ack-eks-controller
7+
labels:
8+
{{- range $key, $value := .Values.role.labels }}
9+
{{ $key }}: {{ $value | quote }}
10+
{{- end }}
711
{{ else }}
812
kind: Role
913
metadata:
1014
creationTimestamp: null
1115
name: ack-eks-controller
16+
labels:
17+
{{- range $key, $value := .Values.role.labels }}
18+
{{ $key }}: {{ $value | quote }}
19+
{{- end }}
1220
namespace: {{ .Release.Namespace }}
1321
{{ end }}
1422
rules:

‎helm/values.schema.json

+8
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,14 @@
6565
],
6666
"type": "object"
6767
},
68+
"role": {
69+
"description": "Role settings",
70+
"properties": {
71+
"labels": {
72+
"type": "object"
73+
}
74+
}
75+
},
6876
"metrics": {
6977
"description": "Metrics settings",
7078
"properties": {

‎helm/values.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
image:
66
repository: public.ecr.aws/aws-controllers-k8s/eks-controller
7-
tag: v0.1.7
7+
tag: v0.1.8
88
pullPolicy: IfNotPresent
99
pullSecrets: []
1010

@@ -28,6 +28,10 @@ deployment:
2828
# Which priorityClassName to set?
2929
# See: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/#pod-priority
3030
priorityClassName: ""
31+
32+
# If "installScope: cluster" then these labels will be applied to ClusterRole
33+
role:
34+
labels: {}
3135

3236
metrics:
3337
service:

0 commit comments

Comments
 (0)