Skip to content

Commit 645d317

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

Some content is hidden

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

52 files changed

+581
-24
lines changed
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
ack_generate_info:
2-
build_date: "2022-03-15T18:06:47Z"
3-
build_hash: 00cd850c16117752abe18558326a508436565b1a
4-
go_version: go1.17.8
5-
version: v0.17.2
6-
api_directory_checksum: 380fda39b038b24d5cb78d2680fdfd8f3ac42607
2+
build_date: "2022-03-22T20:05:53Z"
3+
build_hash: 6f659f796434e8fd6443c0b3a5b495daae910035
4+
go_version: go1.17.5
5+
version: v0.18.0
6+
api_directory_checksum: c9ac09820420d1c7cbe615b8baa14da9f72aab08
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.42.0
99
generator_config_info:
10-
file_checksum: 8f2761c7fff3c2af0a06aa95685d7a47b8a69345
10+
file_checksum: 8cdcf3f86b878ab3f30b3e102a5a6b1df8dfafb3
1111
original_file_name: generator.yaml
1212
last_modification:
1313
reason: API generation

config/controller/deployment.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ spec:
2828
args:
2929
- --aws-region
3030
- "$(AWS_REGION)"
31+
- --aws-endpoint-url
32+
- "$(AWS_ENDPOINT_URL)"
3133
- --enable-development-logging
3234
- "$(ACK_ENABLE_DEVELOPMENT_LOGGING)"
3335
- --log-level
@@ -53,6 +55,18 @@ spec:
5355
valueFrom:
5456
fieldRef:
5557
fieldPath: metadata.namespace
58+
- name: AWS_REGION
59+
value: ""
60+
- name: AWS_ENDPOINT_URL
61+
value: ""
62+
- name: ACK_WATCH_NAMESPACE
63+
value: ""
64+
- name: ACK_ENABLE_DEVELOPMENT_LOGGING
65+
value: "false"
66+
- name: ACK_LOG_LEVEL
67+
value: "info"
68+
- name: ACK_RESOURCE_TAGS
69+
value: "services.k8s.aws/managed=true,services.k8s.aws/created=%UTCNOW%,services.k8s.aws/namespace=%KUBERNETES_NAMESPACE%"
5670
securityContext:
5771
allowPrivilegeEscalation: false
5872
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/ec2-controller
9-
newTag: v0.0.10
9+
newTag: v0.0.11

config/crd/bases/ec2.services.k8s.aws_dhcpoptions.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,13 @@ spec:
9595
description: OwnerAccountID is the AWS Account ID of the account
9696
that owns the backend AWS service API resource.
9797
type: string
98+
region:
99+
description: Region is the AWS region in which the resource exists
100+
or will exist.
101+
type: string
98102
required:
99103
- ownerAccountID
104+
- region
100105
type: object
101106
conditions:
102107
description: All CRS managed by ACK have a common `Status.Conditions`

config/crd/bases/ec2.services.k8s.aws_elasticipaddresses.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,13 @@ spec:
112112
description: OwnerAccountID is the AWS Account ID of the account
113113
that owns the backend AWS service API resource.
114114
type: string
115+
region:
116+
description: Region is the AWS region in which the resource exists
117+
or will exist.
118+
type: string
115119
required:
116120
- ownerAccountID
121+
- region
117122
type: object
118123
allocationID:
119124
description: '[EC2-VPC] The ID that Amazon Web Services assigns to

config/crd/bases/ec2.services.k8s.aws_internetgateways.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,13 @@ spec:
8181
description: OwnerAccountID is the AWS Account ID of the account
8282
that owns the backend AWS service API resource.
8383
type: string
84+
region:
85+
description: Region is the AWS region in which the resource exists
86+
or will exist.
87+
type: string
8488
required:
8589
- ownerAccountID
90+
- region
8691
type: object
8792
attachments:
8893
description: Any VPCs attached to the internet gateway.

config/crd/bases/ec2.services.k8s.aws_routetables.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,13 @@ spec:
129129
description: OwnerAccountID is the AWS Account ID of the account
130130
that owns the backend AWS service API resource.
131131
type: string
132+
region:
133+
description: Region is the AWS region in which the resource exists
134+
or will exist.
135+
type: string
132136
required:
133137
- ownerAccountID
138+
- region
134139
type: object
135140
associations:
136141
description: The associations between the route table and one or more

config/crd/bases/ec2.services.k8s.aws_securitygroups.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,13 @@ spec:
113113
description: OwnerAccountID is the AWS Account ID of the account
114114
that owns the backend AWS service API resource.
115115
type: string
116+
region:
117+
description: Region is the AWS region in which the resource exists
118+
or will exist.
119+
type: string
116120
required:
117121
- ownerAccountID
122+
- region
118123
type: object
119124
conditions:
120125
description: All CRS managed by ACK have a common `Status.Conditions`

config/crd/bases/ec2.services.k8s.aws_subnets.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,13 @@ spec:
130130
description: OwnerAccountID is the AWS Account ID of the account
131131
that owns the backend AWS service API resource.
132132
type: string
133+
region:
134+
description: Region is the AWS region in which the resource exists
135+
or will exist.
136+
type: string
133137
required:
134138
- ownerAccountID
139+
- region
135140
type: object
136141
assignIPv6AddressOnCreation:
137142
description: Indicates whether a network interface created in this

config/crd/bases/ec2.services.k8s.aws_transitgateways.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,13 @@ spec:
107107
description: OwnerAccountID is the AWS Account ID of the account
108108
that owns the backend AWS service API resource.
109109
type: string
110+
region:
111+
description: Region is the AWS region in which the resource exists
112+
or will exist.
113+
type: string
110114
required:
111115
- ownerAccountID
116+
- region
112117
type: object
113118
conditions:
114119
description: All CRS managed by ACK have a common `Status.Conditions`

config/crd/bases/ec2.services.k8s.aws_vpcendpoints.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,13 @@ spec:
199199
description: OwnerAccountID is the AWS Account ID of the account
200200
that owns the backend AWS service API resource.
201201
type: string
202+
region:
203+
description: Region is the AWS region in which the resource exists
204+
or will exist.
205+
type: string
202206
required:
203207
- ownerAccountID
208+
- region
204209
type: object
205210
conditions:
206211
description: All CRS managed by ACK have a common `Status.Conditions`

config/crd/bases/ec2.services.k8s.aws_vpcs.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,13 @@ spec:
125125
description: OwnerAccountID is the AWS Account ID of the account
126126
that owns the backend AWS service API resource.
127127
type: string
128+
region:
129+
description: Region is the AWS region in which the resource exists
130+
or will exist.
131+
type: string
128132
required:
129133
- ownerAccountID
134+
- region
130135
type: object
131136
cidrBlockAssociationSet:
132137
description: Information about the IPv4 CIDR blocks associated with

config/crd/common/bases/services.k8s.aws_adoptedresources.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,8 @@ spec:
5757
type: string
5858
type: object
5959
kubernetes:
60-
description: TargetKubernetesResource provides all the values necessary
61-
to identify a given ACK type and override any metadata values when
62-
creating a resource of that type.
60+
description: ResourceWithMetadata provides the values necessary to
61+
create a Kubernetes resource and override any of its metadata values.
6362
properties:
6463
group:
6564
type: string
Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
1+
2+
---
3+
apiVersion: apiextensions.k8s.io/v1
4+
kind: CustomResourceDefinition
5+
metadata:
6+
annotations:
7+
controller-gen.kubebuilder.io/version: v0.7.0
8+
creationTimestamp: null
9+
name: fieldexports.services.k8s.aws
10+
spec:
11+
group: services.k8s.aws
12+
names:
13+
kind: FieldExport
14+
listKind: FieldExportList
15+
plural: fieldexports
16+
singular: fieldexport
17+
scope: Namespaced
18+
versions:
19+
- name: v1alpha1
20+
schema:
21+
openAPIV3Schema:
22+
description: FieldExport is the schema for the FieldExport API.
23+
properties:
24+
apiVersion:
25+
description: 'APIVersion defines the versioned schema of this representation
26+
of an object. Servers should convert recognized schemas to the latest
27+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
28+
type: string
29+
kind:
30+
description: 'Kind is a string value representing the REST resource this
31+
object represents. Servers may infer this from the endpoint the client
32+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
33+
type: string
34+
metadata:
35+
type: object
36+
spec:
37+
description: FieldExportSpec defines the desired state of the FieldExport.
38+
properties:
39+
from:
40+
description: ResourceFieldSelector provides the values necessary to
41+
identify an individual field on an individual K8s resource.
42+
properties:
43+
path:
44+
type: string
45+
resource:
46+
description: NamespacedResource provides all the values necessary
47+
to identify an ACK resource of a given type (within the same
48+
namespace as the custom resource containing this type).
49+
properties:
50+
group:
51+
type: string
52+
kind:
53+
type: string
54+
name:
55+
type: string
56+
required:
57+
- group
58+
- kind
59+
- name
60+
type: object
61+
required:
62+
- path
63+
- resource
64+
type: object
65+
to:
66+
description: FieldExportTarget provides the values necessary to identify
67+
the output path for a field export.
68+
properties:
69+
kind:
70+
description: FieldExportOutputType represents all types that can
71+
be produced by a field export operation
72+
enum:
73+
- configmap
74+
- secret
75+
type: string
76+
name:
77+
type: string
78+
namespace:
79+
description: Namespace is marked as optional, so we cannot compose
80+
`NamespacedName`
81+
type: string
82+
required:
83+
- kind
84+
- name
85+
type: object
86+
required:
87+
- from
88+
- to
89+
type: object
90+
status:
91+
description: FieldExportStatus defines the observed status of the FieldExport.
92+
properties:
93+
conditions:
94+
description: A collection of `ackv1alpha1.Condition` objects that
95+
describe the various recoverable states of the field CR
96+
items:
97+
description: Condition is the common struct used by all CRDs managed
98+
by ACK service controllers to indicate terminal states of the
99+
CR and its backend AWS service API resource
100+
properties:
101+
lastTransitionTime:
102+
description: Last time the condition transitioned from one status
103+
to another.
104+
format: date-time
105+
type: string
106+
message:
107+
description: A human readable message indicating details about
108+
the transition.
109+
type: string
110+
reason:
111+
description: The reason for the condition's last transition.
112+
type: string
113+
status:
114+
description: Status of the condition, one of True, False, Unknown.
115+
type: string
116+
type:
117+
description: Type is the type of the Condition
118+
type: string
119+
required:
120+
- status
121+
- type
122+
type: object
123+
type: array
124+
required:
125+
- conditions
126+
type: object
127+
type: object
128+
served: true
129+
storage: true
130+
subresources:
131+
status: {}
132+
status:
133+
acceptedNames:
134+
kind: ""
135+
plural: ""
136+
conditions: []
137+
storedVersions: []

config/crd/common/kustomization.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
# This file is NOT auto-generated
1+
# Code generated in runtime. DO NOT EDIT.
22

33
apiVersion: kustomize.config.k8s.io/v1beta1
44
kind: Kustomization
55
resources:
66
- bases/services.k8s.aws_adoptedresources.yaml
7+
- bases/services.k8s.aws_fieldexports.yaml

config/rbac/cluster-role-controller.yaml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ rules:
1313
verbs:
1414
- get
1515
- list
16+
- patch
1617
- watch
1718
- apiGroups:
1819
- ""
@@ -22,6 +23,15 @@ rules:
2223
- get
2324
- list
2425
- watch
26+
- apiGroups:
27+
- ""
28+
resources:
29+
- secrets
30+
verbs:
31+
- get
32+
- list
33+
- patch
34+
- watch
2535
- apiGroups:
2636
- ec2.services.k8s.aws
2737
resources:
@@ -222,3 +232,23 @@ rules:
222232
- get
223233
- patch
224234
- update
235+
- apiGroups:
236+
- services.k8s.aws
237+
resources:
238+
- fieldexports
239+
verbs:
240+
- create
241+
- delete
242+
- get
243+
- list
244+
- patch
245+
- update
246+
- watch
247+
- apiGroups:
248+
- services.k8s.aws
249+
resources:
250+
- fieldexports/status
251+
verbs:
252+
- get
253+
- patch
254+
- update

0 commit comments

Comments
 (0)