Skip to content

Commit 3f87444

Browse files
authored
Update ACK runtime to v0.18.0 (#76)
### 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.2.6` to `v0.2.7` Once this PR is merged, release `v0.2.7` will be automatically created for `applicationautoscaling-controller` **Please close this PR, if you do not want the new patch release for `applicationautoscaling-controller`** ---------- #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building applicationautoscaling-controller ==== Copying common custom resource definitions into applicationautoscaling Building Kubernetes API objects for applicationautoscaling Generating deepcopy code for applicationautoscaling Generating custom resource definitions for applicationautoscaling Building service controller for applicationautoscaling Generating RBAC manifests for applicationautoscaling Running gofmt against generated code for applicationautoscaling Updating additional GitHub repository maintenance files ==== building applicationautoscaling-controller release artifacts ==== Building release artifacts for applicationautoscaling-v0.2.7 Generating common custom resource definitions Generating custom resource definitions for applicationautoscaling Generating RBAC manifests for applicationautoscaling ``` ---------- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent aa1ca1a commit 3f87444

33 files changed

+433
-21
lines changed

apis/v1alpha1/ack-generate-metadata.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ack_generate_info:
2-
build_date: "2022-03-02T19:03:24Z"
3-
build_hash: ade2429bb444ab635916395ea5773d141ba135e1
2+
build_date: "2022-03-22T20:16:27Z"
3+
build_hash: 6f659f796434e8fd6443c0b3a5b495daae910035
44
go_version: go1.17.5
5-
version: v0.17.2
5+
version: v0.18.0
66
api_directory_checksum: 6a10685980ee0dfddcf83fb3555f58e31d1e24c1
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.42.0

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/applicationautoscaling-controller
9-
newTag: v0.2.6
9+
newTag: v0.2.7

config/crd/bases/applicationautoscaling.services.k8s.aws_scalabletargets.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,13 @@ spec:
211211
description: OwnerAccountID is the AWS Account ID of the account
212212
that owns the backend AWS service API resource.
213213
type: string
214+
region:
215+
description: Region is the AWS region in which the resource exists
216+
or will exist.
217+
type: string
214218
required:
215219
- ownerAccountID
220+
- region
216221
type: object
217222
conditions:
218223
description: All CRS managed by ACK have a common `Status.Conditions`

config/crd/bases/applicationautoscaling.services.k8s.aws_scalingpolicies.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,13 @@ spec:
289289
description: OwnerAccountID is the AWS Account ID of the account
290290
that owns the backend AWS service API resource.
291291
type: string
292+
region:
293+
description: Region is the AWS region in which the resource exists
294+
or will exist.
295+
type: string
292296
required:
293297
- ownerAccountID
298+
- region
294299
type: object
295300
alarms:
296301
description: The CloudWatch alarms created for the target tracking

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
- applicationautoscaling.services.k8s.aws
2737
resources:
@@ -82,3 +92,23 @@ rules:
8292
- get
8393
- patch
8494
- update
95+
- apiGroups:
96+
- services.k8s.aws
97+
resources:
98+
- fieldexports
99+
verbs:
100+
- create
101+
- delete
102+
- get
103+
- list
104+
- patch
105+
- update
106+
- watch
107+
- apiGroups:
108+
- services.k8s.aws
109+
resources:
110+
- fieldexports/status
111+
verbs:
112+
- get
113+
- patch
114+
- update

go.mod

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/aws-controllers-k8s/applicationautoscaling-controller
33
go 1.17
44

55
require (
6-
github.com/aws-controllers-k8s/runtime v0.17.2
6+
github.com/aws-controllers-k8s/runtime v0.18.0
77
github.com/aws/aws-sdk-go v1.42.0
88
github.com/ghodss/yaml v1.0.0
99
github.com/go-logr/logr v1.2.0
@@ -31,6 +31,8 @@ require (
3131
github.com/google/uuid v1.1.2 // indirect
3232
github.com/googleapis/gnostic v0.5.5 // indirect
3333
github.com/imdario/mergo v0.3.12 // indirect
34+
github.com/itchyny/gojq v0.12.6 // indirect
35+
github.com/itchyny/timefmt-go v0.1.3 // indirect
3436
github.com/jaypipes/envutil v1.0.0 // indirect
3537
github.com/jmespath/go-jmespath v0.4.0 // indirect
3638
github.com/json-iterator/go v1.1.12 // indirect
@@ -48,7 +50,7 @@ require (
4850
go.uber.org/multierr v1.6.0 // indirect
4951
golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect
5052
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
51-
golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 // indirect
53+
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 // indirect
5254
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
5355
golang.org/x/text v0.3.7 // indirect
5456
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect

0 commit comments

Comments
 (0)