Skip to content

Commit 8ae3a19

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

File tree

17 files changed

+71
-52
lines changed

17 files changed

+71
-52
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
ack_generate_info:
2-
build_date: "2022-09-12T19:27:20Z"
3-
build_hash: 2944c8772f216656d84ee02d392eaca501274c1e
2+
build_date: "2022-12-08T18:49:51Z"
3+
build_hash: 12246c7da82841b351ec7a9e1f139f9338f2784b
44
go_version: go1.17.5
5-
version: v0.20.1
6-
api_directory_checksum: c701c444da9d673651a14b0629e923dec45ec4fa
5+
version: v0.21.0
6+
api_directory_checksum: 3e7c861e84c4a2e053006aaa89a6b4aa3c7fe7f4
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.44.93
99
generator_config_info:

‎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/rds-controller
9-
newTag: v0.1.1
9+
newTag: v0.1.2

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

Lines changed: 2 additions & 8 deletions
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

Lines changed: 1 addition & 8 deletions
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

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.16
77
github.com/aws-controllers-k8s/kms-controller v0.0.15
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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ github.com/aws-controllers-k8s/kms-controller v0.0.15 h1:v9LLAE2Q517CvlP80EgXNq2
7070
github.com/aws-controllers-k8s/kms-controller v0.0.15/go.mod h1:EbxvdZDS2n3JCMmhfjhavSutzt/9J0jXSvGj2bufS68=
7171
github.com/aws-controllers-k8s/runtime v0.18.4/go.mod h1:oA8ML1/LL3chPn26P6SzBNu1CUI2nekB+PTqykNs0qU=
7272
github.com/aws-controllers-k8s/runtime v0.19.2/go.mod h1:oA8ML1/LL3chPn26P6SzBNu1CUI2nekB+PTqykNs0qU=
73-
github.com/aws-controllers-k8s/runtime v0.20.1 h1:L/Huf1shRahx5BqJBCSS5u+vYg3f0Rotsq1jutORpdI=
74-
github.com/aws-controllers-k8s/runtime v0.20.1/go.mod h1:k7z4qlf6aK1Kzd4ff49wzcyhDKHjWaUpqxrwgl4uS1o=
73+
github.com/aws-controllers-k8s/runtime v0.21.0 h1:e9DK88QodwXMLz+QXPXk+8XNetVj4ij+puaVwn9uEVc=
74+
github.com/aws-controllers-k8s/runtime v0.21.0/go.mod h1:k7z4qlf6aK1Kzd4ff49wzcyhDKHjWaUpqxrwgl4uS1o=
7575
github.com/aws/aws-sdk-go v1.42.0/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
7676
github.com/aws/aws-sdk-go v1.44.93 h1:hAgd9fuaptBatSft27/5eBMdcA8+cIMqo96/tZ6rKl8=
7777
github.com/aws/aws-sdk-go v1.44.93/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=

‎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: rds-chart
33
description: A Helm chart for the ACK service controller for Amazon Relational Database Service (RDS)
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/rds-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/rds-controller:v0.1.1".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/rds-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/cluster-role-controller.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,19 @@ kind: ClusterRole
44
metadata:
55
creationTimestamp: null
66
name: ack-rds-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-rds-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

Lines changed: 8 additions & 0 deletions
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": {

0 commit comments

Comments
 (0)