Skip to content

Commit dc3271f

Browse files
authored
bring in ACK core runtime v0.15.1 (#41)
Brings RDS controller up to ACK runtime v0.15.1 which includes support for some logging fixes and removes the --aws-account-id flag. Signed-off-by: Jay Pipes <[email protected]> By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 8f9abdf commit dc3271f

File tree

13 files changed

+32
-31
lines changed

13 files changed

+32
-31
lines changed
Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
ack_generate_info:
2-
build_date: "2021-09-01T17:48:47Z"
3-
build_hash: 6f22b7b568e25b4ee007bb1ab5f9338c16daf172
4-
go_version: go1.17 linux/amd64
5-
version: v0.13.0
6-
api_directory_checksum: 387f19255122f7e68716af4d6dbce0e7498cfe37
2+
build_date: "2021-10-18T13:05:50Z"
3+
build_hash: 21ee1672e2c1556fd5784a22bc48aa619975cc6f
4+
go_version: go1.17
5+
version: v0.15.1
6+
api_directory_checksum: 00e04ca66417394b3744716ee1c047dff5326ecf
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.37.10
99
generator_config_info:
10-
file_checksum: f5d26ad7ae3f2cdc82f2e08c45f5b0aefafb9fa4
10+
file_checksum: d683ba821488baaa11becafe3049ba9259d2d829
1111
original_file_name: generator.yaml
1212
last_modification:
1313
reason: API generation
14-
timestamp: 2021-09-01 17:48:52.072416982 +0000 UTC

config/controller/deployment.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ spec:
2626
- command:
2727
- ./bin/controller
2828
args:
29-
- --aws-account-id
30-
- "$(AWS_ACCOUNT_ID)"
3129
- --aws-region
3230
- "$(AWS_REGION)"
3331
- --enable-development-logging

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/rds-controller
33
go 1.14
44

55
require (
6-
github.com/aws-controllers-k8s/runtime v0.14.1
6+
github.com/aws-controllers-k8s/runtime v0.15.1
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

Lines changed: 4 additions & 2 deletions
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.14.1 h1:2/hCwost9rmtgsgktCtJH75U74ziWiBs0bHFOB2iaKo=
27-
github.com/aws-controllers-k8s/runtime v0.14.1/go.mod h1:kG2WM4JAmLgf67cgZV9IZUkY2DsrUzsaNbmhFMfb05c=
26+
github.com/aws-controllers-k8s/runtime v0.15.1 h1:3P+6MKWe8ITJynmoxmDnMPlkoI9nuVgn8XD9Pt/XHE8=
27+
github.com/aws-controllers-k8s/runtime v0.15.1/go.mod h1:W0Txdhb1Npx5kg72w2WFwIpGFvSsMxXlJzzNHAwCLeY=
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=
@@ -175,6 +175,8 @@ github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ
175175
github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
176176
github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
177177
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
178+
github.com/jaypipes/envutil v1.0.0 h1:u6Vwy9HwruFihoZrL0bxDLCa/YNadGVwKyPElNmZWow=
179+
github.com/jaypipes/envutil v1.0.0/go.mod h1:vgIRDly+xgBq0eeZRcflOHMMobMwgC6MkMbxo/Nw65M=
178180
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
179181
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
180182
github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=

helm/templates/deployment.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ spec:
3737
- command:
3838
- ./bin/controller
3939
args:
40-
- --aws-account-id
41-
- "$(AWS_ACCOUNT_ID)"
4240
- --aws-region
4341
- "$(AWS_REGION)"
4442
- --aws-endpoint-url
@@ -63,8 +61,6 @@ spec:
6361
valueFrom:
6462
fieldRef:
6563
fieldPath: metadata.namespace
66-
- name: AWS_ACCOUNT_ID
67-
value: {{ .Values.aws.account_id | quote }}
6864
- name: AWS_REGION
6965
value: {{ .Values.aws.region }}
7066
- name: AWS_ENDPOINT_URL

helm/values.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ resources:
3838
aws:
3939
# If specified, use the AWS region for AWS API calls
4040
region: ""
41-
account_id: ""
4241
endpoint_url: ""
4342

4443
# log level for the controller

pkg/resource/db_cluster/descriptor.go

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

pkg/resource/db_cluster_parameter_group/descriptor.go

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

pkg/resource/db_instance/descriptor.go

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

pkg/resource/db_parameter_group/descriptor.go

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

0 commit comments

Comments
 (0)