Skip to content

Commit ed60093

Browse files
ack-botVandita2020
ack-bot
authored and
Vandita2020
committed
Update to ACK runtime v0.25.0, code-generator v0.25.0 (#87)
---------- * ACK code-generator `v0.25.0` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.25.0) * ACK runtime `v0.25.0` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.25.0) ---------- NOTE: This PR increments the release version of service controller from `v0.1.6` to `v0.1.7` Once this PR is merged, release `v0.1.7` will be automatically created for `lambda-controller` **Please close this PR, if you do not want the new patch release for `lambda-controller`** ---------- ``` building ack-generate ... ok. ==== building lambda-controller ==== Copying common custom resource definitions into lambda Building Kubernetes API objects for lambda Generating deepcopy code for lambda Generating custom resource definitions for lambda Building service controller for lambda Generating RBAC manifests for lambda Running gofmt against generated code for lambda Updating additional GitHub repository maintenance files ==== building lambda-controller release artifacts ==== Building release artifacts for lambda-v0.1.7 Generating common custom resource definitions Generating custom resource definitions for lambda Generating RBAC manifests for lambda ``` ---------- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent cb7ff9a commit ed60093

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+920
-869
lines changed

‎apis/v1alpha1/ack-generate-metadata.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
ack_generate_info:
2-
build_date: "2023-02-01T00:38:06Z"
3-
build_hash: 12246c7da82841b351ec7a9e1f139f9338f2784b
2+
build_date: "2023-04-04T19:55:45Z"
3+
build_hash: a6ae2078e57187b2daf47978bc07bd67072d2cba
44
go_version: go1.19
5-
version: v0.23.0
6-
api_directory_checksum: a9fcef68210dd72b4b2e37052f2c1a9e971326c6
5+
version: v0.20.1-70-ga6ae207
6+
api_directory_checksum: 09a0bda876eac49a802be254317710529b6c9f3b
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.44.181
99
generator_config_info:
10-
file_checksum: 095af1082df5c34cdc12296dc085bc6b2b7eadb9
10+
file_checksum: e495db568ae64db031fcfa40b8a53f9866f22302
1111
original_file_name: generator.yaml
1212
last_modification:
1313
reason: API generation

‎apis/v1alpha1/function.go

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

‎apis/v1alpha1/generator.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ resources:
1919
- path: Status.State
2020
in: [ "Active" ]
2121
fields:
22+
CodeS3SHA256:
23+
type: String
24+
compare:
25+
is_ignored: true
2226
Code.S3Bucket:
2327
references:
2428
resource: Bucket

‎apis/v1alpha1/zz_generated.deepcopy.go

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

‎config/controller/kustomization.yaml

+1-1
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/lambda-controller
9-
newTag: v0.1.6
9+
newTag: v0.1.5

‎config/crd/bases/lambda.services.k8s.aws_aliases.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ spec:
4545
function name, it is limited to 64 characters in length."
4646
type: string
4747
functionRef:
48-
description: 'AWSResourceReferenceWrapper provides a wrapper around
48+
description: "AWSResourceReferenceWrapper provides a wrapper around
4949
*AWSResourceReference type to provide more user friendly syntax
50-
for references using ''from'' field Ex: APIIDRef: from: name: my-api'
50+
for references using 'from' field Ex: APIIDRef: \n from: name: my-api"
5151
properties:
5252
from:
5353
description: AWSResourceReference provides all the values necessary

‎config/crd/bases/lambda.services.k8s.aws_eventsourcemappings.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,9 @@ spec:
114114
function name, it's limited to 64 characters in length."
115115
type: string
116116
functionRef:
117-
description: 'AWSResourceReferenceWrapper provides a wrapper around
117+
description: "AWSResourceReferenceWrapper provides a wrapper around
118118
*AWSResourceReference type to provide more user friendly syntax
119-
for references using ''from'' field Ex: APIIDRef: from: name: my-api'
119+
for references using 'from' field Ex: APIIDRef: \n from: name: my-api"
120120
properties:
121121
from:
122122
description: AWSResourceReference provides all the values necessary
@@ -167,10 +167,10 @@ spec:
167167
type: integer
168168
queueRefs:
169169
items:
170-
description: 'AWSResourceReferenceWrapper provides a wrapper around
170+
description: "AWSResourceReferenceWrapper provides a wrapper around
171171
*AWSResourceReference type to provide more user friendly syntax
172-
for references using ''from'' field Ex: APIIDRef: from: name:
173-
my-api'
172+
for references using 'from' field Ex: APIIDRef: \n from: name:
173+
my-api"
174174
properties:
175175
from:
176176
description: AWSResourceReference provides all the values necessary

‎config/crd/bases/lambda.services.k8s.aws_functions.yaml

+10-8
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ spec:
6969
format: byte
7070
type: string
7171
type: object
72+
codeS3SHA256:
73+
type: string
7274
codeSigningConfigARN:
7375
description: To enable code signing for this function, specify the
7476
ARN of a code-signing configuration. A code-signing configuration
@@ -144,9 +146,9 @@ spec:
144146
provided, Lambda uses a default service key.
145147
type: string
146148
kmsKeyRef:
147-
description: 'AWSResourceReferenceWrapper provides a wrapper around
149+
description: "AWSResourceReferenceWrapper provides a wrapper around
148150
*AWSResourceReference type to provide more user friendly syntax
149-
for references using ''from'' field Ex: APIIDRef: from: name: my-api'
151+
for references using 'from' field Ex: APIIDRef: \n from: name: my-api"
150152
properties:
151153
from:
152154
description: AWSResourceReference provides all the values necessary
@@ -239,10 +241,10 @@ spec:
239241
securityGroupRefs:
240242
description: Reference field for SecurityGroupIDs
241243
items:
242-
description: 'AWSResourceReferenceWrapper provides a wrapper
244+
description: "AWSResourceReferenceWrapper provides a wrapper
243245
around *AWSResourceReference type to provide more user friendly
244-
syntax for references using ''from'' field Ex: APIIDRef: from:
245-
name: my-api'
246+
syntax for references using 'from' field Ex: APIIDRef: \n
247+
from: name: my-api"
246248
properties:
247249
from:
248250
description: AWSResourceReference provides all the values
@@ -261,10 +263,10 @@ spec:
261263
subnetRefs:
262264
description: Reference field for SubnetIDs
263265
items:
264-
description: 'AWSResourceReferenceWrapper provides a wrapper
266+
description: "AWSResourceReferenceWrapper provides a wrapper
265267
around *AWSResourceReference type to provide more user friendly
266-
syntax for references using ''from'' field Ex: APIIDRef: from:
267-
name: my-api'
268+
syntax for references using 'from' field Ex: APIIDRef: \n
269+
from: name: my-api"
268270
properties:
269271
from:
270272
description: AWSResourceReference provides all the values

‎config/crd/bases/lambda.services.k8s.aws_functionurlconfigs.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ spec:
7777
function name, it is limited to 64 characters in length."
7878
type: string
7979
functionRef:
80-
description: 'AWSResourceReferenceWrapper provides a wrapper around
80+
description: "AWSResourceReferenceWrapper provides a wrapper around
8181
*AWSResourceReference type to provide more user friendly syntax
82-
for references using ''from'' field Ex: APIIDRef: from: name: my-api'
82+
for references using 'from' field Ex: APIIDRef: \n from: name: my-api"
8383
properties:
8484
from:
8585
description: AWSResourceReference provides all the values necessary

‎config/crd/kustomization.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
3-
bases:
4-
- common
53
resources:
4+
- common
65
- bases/lambda.services.k8s.aws_aliases.yaml
76
- bases/lambda.services.k8s.aws_codesigningconfigs.yaml
87
- bases/lambda.services.k8s.aws_eventsourcemappings.yaml

‎config/default/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#commonLabels:
1313
# someName: someValue
1414

15-
bases:
15+
resources:
1616
- ../crd
1717
- ../rbac
1818
- ../controller

‎generator.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ resources:
1919
- path: Status.State
2020
in: [ "Active" ]
2121
fields:
22+
CodeS3SHA256:
23+
type: String
24+
compare:
25+
is_ignored: true
2226
Code.S3Bucket:
2327
references:
2428
resource: Bucket

‎go.mod

+43-34
Original file line numberDiff line numberDiff line change
@@ -6,67 +6,76 @@ require (
66
github.com/aws-controllers-k8s/ec2-controller v0.0.21
77
github.com/aws-controllers-k8s/kms-controller v0.1.2
88
github.com/aws-controllers-k8s/mq-controller v0.0.22
9-
github.com/aws-controllers-k8s/runtime v0.23.0
9+
github.com/aws-controllers-k8s/runtime v0.25.0
1010
github.com/aws-controllers-k8s/s3-controller v0.1.5
1111
github.com/aws/aws-sdk-go v1.44.181
12-
github.com/go-logr/logr v1.2.0
12+
github.com/go-logr/logr v1.2.3
1313
github.com/spf13/pflag v1.0.5
14-
k8s.io/api v0.23.0
15-
k8s.io/apimachinery v0.23.0
16-
k8s.io/client-go v0.23.0
17-
sigs.k8s.io/controller-runtime v0.11.0
14+
k8s.io/api v0.26.1
15+
k8s.io/apimachinery v0.26.1
16+
k8s.io/client-go v0.26.1
17+
sigs.k8s.io/controller-runtime v0.14.5
1818
)
1919

2020
require (
2121
github.com/beorn7/perks v1.0.1 // indirect
22-
github.com/cenkalti/backoff/v4 v4.1.2 // indirect
23-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
22+
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
23+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
2424
github.com/davecgh/go-spew v1.1.1 // indirect
25-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
26-
github.com/fsnotify/fsnotify v1.5.1 // indirect
27-
github.com/go-logr/zapr v1.2.0 // indirect
25+
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
26+
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
27+
github.com/fsnotify/fsnotify v1.6.0 // indirect
28+
github.com/go-logr/zapr v1.2.3 // indirect
29+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
30+
github.com/go-openapi/jsonreference v0.20.0 // indirect
31+
github.com/go-openapi/swag v0.19.14 // indirect
2832
github.com/gogo/protobuf v1.3.2 // indirect
2933
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3034
github.com/golang/protobuf v1.5.2 // indirect
31-
github.com/google/go-cmp v0.5.5 // indirect
35+
github.com/google/gnostic v0.5.7-v3refs // indirect
36+
github.com/google/go-cmp v0.5.9 // indirect
3237
github.com/google/gofuzz v1.1.0 // indirect
3338
github.com/google/uuid v1.1.2 // indirect
34-
github.com/googleapis/gnostic v0.5.5 // indirect
3539
github.com/imdario/mergo v0.3.12 // indirect
3640
github.com/itchyny/gojq v0.12.6 // indirect
3741
github.com/itchyny/timefmt-go v0.1.3 // indirect
3842
github.com/jaypipes/envutil v1.0.0 // indirect
3943
github.com/jmespath/go-jmespath v0.4.0 // indirect
44+
github.com/josharian/intern v1.0.0 // indirect
4045
github.com/json-iterator/go v1.1.12 // indirect
41-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
46+
github.com/mailru/easyjson v0.7.6 // indirect
47+
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
4248
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4349
github.com/modern-go/reflect2 v1.0.2 // indirect
50+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4451
github.com/pkg/errors v0.9.1 // indirect
45-
github.com/prometheus/client_golang v1.11.0 // indirect
46-
github.com/prometheus/client_model v0.2.0 // indirect
47-
github.com/prometheus/common v0.28.0 // indirect
48-
github.com/prometheus/procfs v0.6.0 // indirect
52+
github.com/prometheus/client_golang v1.14.0 // indirect
53+
github.com/prometheus/client_model v0.3.0 // indirect
54+
github.com/prometheus/common v0.37.0 // indirect
55+
github.com/prometheus/procfs v0.8.0 // indirect
56+
github.com/samber/lo v1.37.0 // indirect
4957
go.uber.org/atomic v1.7.0 // indirect
5058
go.uber.org/multierr v1.6.0 // indirect
51-
go.uber.org/zap v1.19.1 // indirect
52-
golang.org/x/net v0.1.0 // indirect
53-
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
54-
golang.org/x/sys v0.1.0 // indirect
55-
golang.org/x/term v0.1.0 // indirect
56-
golang.org/x/text v0.4.0 // indirect
57-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
59+
go.uber.org/zap v1.24.0 // indirect
60+
golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect
61+
golang.org/x/net v0.7.0 // indirect
62+
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
63+
golang.org/x/sys v0.5.0 // indirect
64+
golang.org/x/term v0.5.0 // indirect
65+
golang.org/x/text v0.7.0 // indirect
66+
golang.org/x/time v0.3.0 // indirect
5867
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
5968
google.golang.org/appengine v1.6.7 // indirect
60-
google.golang.org/protobuf v1.27.1 // indirect
69+
google.golang.org/protobuf v1.28.1 // indirect
6170
gopkg.in/inf.v0 v0.9.1 // indirect
6271
gopkg.in/yaml.v2 v2.4.0 // indirect
63-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
64-
k8s.io/apiextensions-apiserver v0.23.0 // indirect
65-
k8s.io/component-base v0.23.0 // indirect
66-
k8s.io/klog/v2 v2.30.0 // indirect
67-
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
68-
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
69-
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
70-
sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
72+
gopkg.in/yaml.v3 v3.0.1 // indirect
73+
k8s.io/apiextensions-apiserver v0.26.1 // indirect
74+
k8s.io/component-base v0.26.1 // indirect
75+
k8s.io/klog/v2 v2.80.1 // indirect
76+
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
77+
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
78+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
79+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
7180
sigs.k8s.io/yaml v1.3.0 // indirect
7281
)

0 commit comments

Comments
 (0)