Skip to content

Commit fe58a7e

Browse files
Update to ACK runtime v0.14.0 (#49)
Fixes aws-controllers-k8s/community#953 Description of changes: Update the `generator.yaml` file according to the new `v0.14.0` changes. Regenerated all files with the newest version of code-generator. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent d828908 commit fe58a7e

15 files changed

+40
-26
lines changed

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ any 'help wanted' issues is a great place to start.
6464

6565
[See the documentation][dev-docs] for detailed development information.
6666

67-
[dev-docs]: https://aws.github.io/aws-controllers-k8s/dev-docs/overview/
67+
[dev-docs]: https://aws-controllers-k8s.github.io/community/docs/contributor-docs/overview/
6868

6969
## Code of Conduct
7070

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
ack_generate_info:
2-
build_date: "2021-09-15T20:51:47Z"
3-
build_hash: 394e8294aabf0b221c35f7a5c7bc7e4e43bc6f10
4-
go_version: go1.15.6 linux/amd64
5-
version: v0.13.2
2+
build_date: "2021-09-21T18:55:51Z"
3+
build_hash: 386373b002204b5a215388c4d91af91fc9372398
4+
go_version: go1.15.6
5+
version: v0.14.0
66
api_directory_checksum: dfcc21d3fc7fcd228ae29942f020128e7a3bdb8e
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.37.10
99
generator_config_info:
10-
file_checksum: 3adc9b830bb3e9ea446ea5ee85ee03f21edc65fd
10+
file_checksum: fc075d7f34ba66f75e207a25f763a5b74de48337
1111
original_file_name: generator.yaml
1212
last_modification:
1313
reason: API generation
14-
timestamp: 2021-09-15 20:51:53.255709113 +0000 UTC

apis/v1alpha1/generator.yaml

+6-3
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,15 @@ ignore:
88
field_paths:
99
# We cannot support MFA, so if it is set we cannot unset
1010
- "VersioningConfiguration.MFADelete"
11-
operations:
12-
ListBuckets:
13-
primary_identifier_field_name: Name
1411
resources:
1512
Bucket:
1613
fields:
14+
Name:
15+
is_primary_key: true
16+
is_required: true
17+
from:
18+
operation: CreateBucket
19+
path: Bucket
1720
Accelerate:
1821
from:
1922
operation: PutBucketAccelerateConfiguration

config/controller/deployment.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ spec:
4141
image: controller:latest
4242
name: controller
4343
ports:
44-
- containerPort: 8080
44+
- name: http
45+
containerPort: 8080
4546
resources:
4647
limits:
4748
cpu: 100m

config/controller/service.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ spec:
99
ports:
1010
- name: metricsport
1111
port: 8080
12-
targetPort: 8080
12+
targetPort: http
1313
protocol: TCP
14-
type: NodePort
14+
type: NodePort

generator.yaml

+6-3
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,15 @@ ignore:
88
field_paths:
99
# We cannot support MFA, so if it is set we cannot unset
1010
- "VersioningConfiguration.MFADelete"
11-
operations:
12-
ListBuckets:
13-
primary_identifier_field_name: Name
1411
resources:
1512
Bucket:
1613
fields:
14+
Name:
15+
is_primary_key: true
16+
is_required: true
17+
from:
18+
operation: CreateBucket
19+
path: Bucket
1720
Accelerate:
1821
from:
1922
operation: PutBucketAccelerateConfiguration

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/aws-controllers-k8s/s3-controller
33
go 1.14
44

55
require (
6-
github.com/aws-controllers-k8s/runtime v0.13.2
6+
github.com/aws-controllers-k8s/runtime v0.14.0
77
github.com/aws/aws-sdk-go v1.37.10
88
github.com/go-logr/logr v0.1.0
99
github.com/spf13/pflag v1.0.5

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo
2323
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
2424
github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
2525
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
26-
github.com/aws-controllers-k8s/runtime v0.13.2 h1:+gVwW4dTndPb4lB0WNLdHeiP7AGBOV+wBHGjpQUOh+w=
27-
github.com/aws-controllers-k8s/runtime v0.13.2/go.mod h1:kG2WM4JAmLgf67cgZV9IZUkY2DsrUzsaNbmhFMfb05c=
26+
github.com/aws-controllers-k8s/runtime v0.14.0 h1:vIoOmMCKjbjzedi26fEoVBYYVdRw+0V3ckMqM8QgvE8=
27+
github.com/aws-controllers-k8s/runtime v0.14.0/go.mod h1:kG2WM4JAmLgf67cgZV9IZUkY2DsrUzsaNbmhFMfb05c=
2828
github.com/aws/aws-sdk-go v1.37.10 h1:LRwl+97B4D69Z7tz+eRUxJ1C7baBaIYhgrn5eLtua+Q=
2929
github.com/aws/aws-sdk-go v1.37.10/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
3030
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=

helm/templates/deployment.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ spec:
5454
image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
5555
name: controller
5656
ports:
57-
- containerPort: {{ .Values.deployment.containerPort }}
57+
- name: http
58+
containerPort: {{ .Values.deployment.containerPort }}
5859
resources:
5960
{{- toYaml .Values.resources | nindent 10 }}
6061
env:
@@ -77,3 +78,4 @@ spec:
7778
- name: ACK_RESOURCE_TAGS
7879
value: {{ join "," .Values.resourceTags | quote }}
7980
terminationGracePeriodSeconds: 10
81+
nodeSelector: {{ toYaml .Values.deployment.nodeSelector | nindent 8 }}

helm/templates/metrics-service.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: v1
33
kind: Service
44
metadata:
5-
name: {{ include "app.fullname" . }}-metrics
5+
name: {{ .Chart.Name | trimSuffix "-chart" | trunc 44 }}-controller-metrics
66
namespace: {{ .Release.Namespace }}
77
labels:
88
app.kubernetes.io/name: {{ include "app.name" . }}
@@ -25,6 +25,6 @@ spec:
2525
ports:
2626
- name: metricsport
2727
port: 8080
28-
targetPort: 8080
28+
targetPort: http
2929
protocol: TCP
30-
{{- end }}
30+
{{- end }}

helm/templates/service-account.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ metadata:
1010
k8s-app: {{ include "app.name" . }}
1111
helm.sh/chart: {{ include "chart.name-version" . }}
1212
name: {{ include "service-account.name" . }}
13+
namespace: {{ .Release.Namespace }}
1314
annotations:
1415
{{- range $key, $value := .Values.serviceAccount.annotations }}
1516
{{ $key }}: {{ $value | quote }}
1617
{{- end }}
17-
{{- end }}
18+
{{- end }}

helm/values.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ deployment:
1515
annotations: {}
1616
labels: {}
1717
containerPort: 8080
18+
nodeSelector:
19+
kubernetes.io/os: linux
1820

1921
metrics:
2022
service:

pkg/resource/bucket/manager.go

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

pkg/resource/bucket/resource.go

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

pkg/resource/bucket/sdk.go

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

0 commit comments

Comments
 (0)