Skip to content

Commit 58650dd

Browse files
authored
ignore deploymentid when updating stage with autodeploy (#15)
Issue #, if available: aws-controllers-k8s/community#1033 Description of changes: * Avoid BadRequestException when updating stage with autodeploy 'true' * DeploymentId is present in desired resource after ReadOne call but it should not be set when updating stage with autodeploy=true * update ACK runtime version to v0.15.1 * Generate release artifacts for v0.0.7 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 2e98705 commit 58650dd

File tree

23 files changed

+64
-41
lines changed

23 files changed

+64
-41
lines changed
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
ack_generate_info:
2-
build_date: "2021-09-26T23:12:25Z"
3-
build_hash: 2b0ac062dd6d305434d252b5da5ed718c801b106
2+
build_date: "2021-10-25T21:43:55Z"
3+
build_hash: f37b8ea9fcc401d66018d7849e8c809da5b4c99c
44
go_version: go1.16.5
5-
version: v0.14.1
5+
version: v0.15.1
66
api_directory_checksum: 20625534fa65e1e856fc014ab5de111bbc23bf57
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.37.10
99
generator_config_info:
10-
file_checksum: df7c7fbb497f119ebacb994cab1b242d67dcc201
10+
file_checksum: 341fa96adbf9a1c7319dff1e73b67d98839cb2b2
1111
original_file_name: generator.yaml
1212
last_modification:
1313
reason: API generation

apis/v1alpha1/generator.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ resources:
2727
from:
2828
operation: CreateDomainName
2929
path: DomainName
30+
Stage:
31+
hooks:
32+
sdk_update_post_build_request:
33+
template_path: hooks/stage/sdk_update_post_build_request.go.tpl
3034
operations:
3135
CreateApi:
3236
custom_implementation: customCreateApi

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

generator.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ resources:
2727
from:
2828
operation: CreateDomainName
2929
path: DomainName
30+
Stage:
31+
hooks:
32+
sdk_update_post_build_request:
33+
template_path: hooks/stage/sdk_update_post_build_request.go.tpl
3034
operations:
3135
CreateApi:
3236
custom_implementation: customCreateApi

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/apigatewayv2-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/go-logr/zapr v0.1.1 // indirect

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=
@@ -179,6 +179,8 @@ github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ
179179
github.com/imdario/mergo v0.3.7 h1:Y+UAYTZ7gDEuOfhxKWy+dvb5dRQ6rJjFSdX2HZY1/gI=
180180
github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
181181
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
182+
github.com/jaypipes/envutil v1.0.0 h1:u6Vwy9HwruFihoZrL0bxDLCa/YNadGVwKyPElNmZWow=
183+
github.com/jaypipes/envutil v1.0.0/go.mod h1:vgIRDly+xgBq0eeZRcflOHMMobMwgC6MkMbxo/Nw65M=
182184
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
183185
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
184186
github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=

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: apigatewayv2-chart
33
description: A Helm chart for the ACK service controller for Amazon API Gateway (APIGWv2)
4-
version: v0.0.6
5-
appVersion: v0.0.6
4+
version: v0.0.7
5+
appVersion: v0.0.7
66
home: https://github.com/aws-controllers-k8s/apigatewayv2-controller
77
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
88
sources:

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: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

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

@@ -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/api/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)