Skip to content

Commit 0c4f70e

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

File tree

9 files changed

+19
-28
lines changed

9 files changed

+19
-28
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: "2022-11-11T20:17:19Z"
3-
build_hash: a6a8a090765c734c3920de7f21a48bdc62b6d9ce
4-
go_version: go1.18.1
5-
version: v0.20.1-8-ga6a8a09
2+
build_date: "2022-12-08T18:26:54Z"
3+
build_hash: 12246c7da82841b351ec7a9e1f139f9338f2784b
4+
go_version: go1.17.5
5+
version: v0.21.0
66
api_directory_checksum: ca5e128ed4958f48b423d0ccd22a6395b8a44bda
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.44.93

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/emrcontainers-controller
9-
newTag: v0.1.0
9+
newTag: v0.1.1

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: 5 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: fieldexports.services.k8s.aws
109
spec:
@@ -66,6 +65,10 @@ spec:
6665
description: FieldExportTarget provides the values necessary to identify
6766
the output path for a field export.
6867
properties:
68+
key:
69+
description: Key overrides the default value (`<namespace>.<FieldExport-resource-name>`)
70+
for the FieldExport target
71+
type: string
6972
kind:
7073
description: FieldExportOutputType represents all types that can
7174
be produced by a field export operation
@@ -129,9 +132,3 @@ spec:
129132
storage: true
130133
subresources:
131134
status: {}
132-
status:
133-
acceptedNames:
134-
kind: ""
135-
plural: ""
136-
conditions: []
137-
storedVersions: []

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/aws-controllers-k8s/emrcontainers-controller
33
go 1.17
44

55
require (
6-
github.com/aws-controllers-k8s/runtime v0.20.1
6+
github.com/aws-controllers-k8s/runtime v0.21.0
77
github.com/aws/aws-sdk-go v1.44.93
88
github.com/ghodss/yaml v1.0.0
99
github.com/go-logr/logr v1.2.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC
6464
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
6565
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
6666
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
67-
github.com/aws-controllers-k8s/runtime v0.20.1 h1:L/Huf1shRahx5BqJBCSS5u+vYg3f0Rotsq1jutORpdI=
68-
github.com/aws-controllers-k8s/runtime v0.20.1/go.mod h1:k7z4qlf6aK1Kzd4ff49wzcyhDKHjWaUpqxrwgl4uS1o=
67+
github.com/aws-controllers-k8s/runtime v0.21.0 h1:e9DK88QodwXMLz+QXPXk+8XNetVj4ij+puaVwn9uEVc=
68+
github.com/aws-controllers-k8s/runtime v0.21.0/go.mod h1:k7z4qlf6aK1Kzd4ff49wzcyhDKHjWaUpqxrwgl4uS1o=
6969
github.com/aws/aws-sdk-go v1.44.93 h1:hAgd9fuaptBatSft27/5eBMdcA8+cIMqo96/tZ6rKl8=
7070
github.com/aws/aws-sdk-go v1.44.93/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
7171
github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=

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: emrcontainers-chart
33
description: A Helm chart for the ACK service controller for Amazon EMR on EKS (EMRContainers)
4-
version: v0.1.0
5-
appVersion: v0.1.0
4+
version: v0.1.1
5+
appVersion: v0.1.1
66
home: https://github.com/aws-controllers-k8s/emrcontainers-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/emrcontainers-controller:v0.1.0".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/emrcontainers-controller:v0.1.1".
33

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

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/emrcontainers-controller
7-
tag: v0.1.0
7+
tag: v0.1.1
88
pullPolicy: IfNotPresent
99
pullSecrets: []
1010

0 commit comments

Comments
 (0)