Skip to content

Commit f94a6ba

Browse files
authored
ACK runtime update to v0.19.0 (#42)
Issue #, if available: aws-controllers-k8s/community#1339 Description of changes: * Update ACK runtime to v0.19.0 * Ignore tags for Authorizer, Deployment, Integration & Route, because these resources do not support AWS tags By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 257adf6 commit f94a6ba

File tree

30 files changed

+484
-31
lines changed

30 files changed

+484
-31
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: "2022-04-15T20:27:58Z"
3-
build_hash: 50c64871bcaf88b9ee200eb8d6b8245fa8f675eb
2+
build_date: "2022-06-15T16:33:46Z"
3+
build_hash: 53ebfaca89abd8cedbeb8e48ac76954a8e1841dd
44
go_version: go1.17.5
5-
version: v0.18.4
5+
version: v0.19.0-2-g53ebfac
66
api_directory_checksum: c69d75f37400a8d4d6eb4362eb743005531a7b2c
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.42.0
99
generator_config_info:
10-
file_checksum: 6ea111ed6683ab7ee07ffd165ae76454bd0fddab
10+
file_checksum: 52b0fd0e1882461d1c0694dd583d1ef7e655c5c1
1111
original_file_name: generator.yaml
1212
last_modification:
1313
reason: API generation

apis/v1alpha1/generator.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,16 @@ resources:
5050
references:
5151
resource: API
5252
path: Status.APIID
53+
tags:
54+
ignore: true
5355
Deployment:
5456
fields:
5557
ApiId:
5658
references:
5759
resource: API
5860
path: Status.APIID
61+
tags:
62+
ignore: true
5963
Integration:
6064
fields:
6165
ApiId:
@@ -66,6 +70,8 @@ resources:
6670
references:
6771
resource: VPCLink
6872
path: Status.VPCLinkID
73+
tags:
74+
ignore: true
6975
Route:
7076
fields:
7177
ApiId:
@@ -83,6 +89,8 @@ resources:
8389
hooks:
8490
references_post_resolve:
8591
template_path: hooks/route/references_post_resolve.go.tpl
92+
tags:
93+
ignore: true
8694
VpcLink:
8795
hooks:
8896
sdk_update_pre_build_request:

cmd/controller/main.go

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

config/controller/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ spec:
6666
- name: ACK_LOG_LEVEL
6767
value: "info"
6868
- name: ACK_RESOURCE_TAGS
69-
value: "services.k8s.aws/managed=true,services.k8s.aws/created=%UTCNOW%,services.k8s.aws/namespace=%KUBERNETES_NAMESPACE%"
69+
value: "services.k8s.aws/controller-version=%CONTROLLER_SERVICE%-%CONTROLLER_VERSION%,services.k8s.aws/namespace=%K8S_NAMESPACE%"
7070
securityContext:
7171
allowPrivilegeEscalation: false
7272
privileged: false

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

generator.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,16 @@ resources:
5050
references:
5151
resource: API
5252
path: Status.APIID
53+
tags:
54+
ignore: true
5355
Deployment:
5456
fields:
5557
ApiId:
5658
references:
5759
resource: API
5860
path: Status.APIID
61+
tags:
62+
ignore: true
5963
Integration:
6064
fields:
6165
ApiId:
@@ -66,6 +70,8 @@ resources:
6670
references:
6771
resource: VPCLink
6872
path: Status.VPCLinkID
73+
tags:
74+
ignore: true
6975
Route:
7076
fields:
7177
ApiId:
@@ -83,6 +89,8 @@ resources:
8389
hooks:
8490
references_post_resolve:
8591
template_path: hooks/route/references_post_resolve.go.tpl
92+
tags:
93+
ignore: true
8694
VpcLink:
8795
hooks:
8896
sdk_update_pre_build_request:

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.17
44

55
require (
6-
github.com/aws-controllers-k8s/runtime v0.18.4
6+
github.com/aws-controllers-k8s/runtime v0.19.0
77
github.com/aws/aws-sdk-go v1.42.0
88
github.com/go-logr/logr v1.2.0
99
github.com/google/go-cmp v0.5.5

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.18.4 h1:iwLYNwhbuiWZrHPoulGj75oT+alE91wCNkF1FUELiAw=
68-
github.com/aws-controllers-k8s/runtime v0.18.4/go.mod h1:oA8ML1/LL3chPn26P6SzBNu1CUI2nekB+PTqykNs0qU=
67+
github.com/aws-controllers-k8s/runtime v0.19.0 h1:+O5a6jBSBAd8XTNMrVCIYu4G+ZUPZe/G5eopVFO18Dc=
68+
github.com/aws-controllers-k8s/runtime v0.19.0/go.mod h1:oA8ML1/LL3chPn26P6SzBNu1CUI2nekB+PTqykNs0qU=
6969
github.com/aws/aws-sdk-go v1.42.0 h1:BMZws0t8NAhHFsfnT3B40IwD13jVDG5KerlRksctVIw=
7070
github.com/aws/aws-sdk-go v1.42.0/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
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: apigatewayv2-chart
33
description: A Helm chart for the ACK service controller for Amazon API Gateway (APIGWv2)
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/apigatewayv2-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/apigatewayv2-controller:v0.1.0".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/apigatewayv2-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 }}"

0 commit comments

Comments
 (0)