Skip to content

Commit dce7a26

Browse files
ack-botci-robot
andauthored
Update ACK runtime to v0.18.0 (#23)
Co-authored-by: ci-robot <[email protected]>
1 parent 60fd502 commit dce7a26

23 files changed

+411
-22
lines changed

apis/v1alpha1/ack-generate-metadata.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ack_generate_info:
2-
build_date: "2022-03-21T20:39:00Z"
3-
build_hash: 0b5dc38297ec74d54da4dd326a3988dc3de68b78
4-
go_version: go1.17
5-
version: v0.17.2
2+
build_date: "2022-03-22T20:23:17Z"
3+
build_hash: 6f659f796434e8fd6443c0b3a5b495daae910035
4+
go_version: go1.17.5
5+
version: v0.18.0
66
api_directory_checksum: 7d8d584cdaec82ab61d867fc030cb9bb45ac706f
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.42.0

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/iam-controller
9-
newTag: v0.0.9
9+
newTag: v0.0.10

config/crd/bases/iam.services.k8s.aws_policies.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,13 @@ spec:
135135
description: OwnerAccountID is the AWS Account ID of the account
136136
that owns the backend AWS service API resource.
137137
type: string
138+
region:
139+
description: Region is the AWS region in which the resource exists
140+
or will exist.
141+
type: string
138142
required:
139143
- ownerAccountID
144+
- region
140145
type: object
141146
attachmentCount:
142147
description: The number of entities (users, groups, and roles) that

config/crd/bases/iam.services.k8s.aws_roles.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,13 @@ spec:
147147
description: OwnerAccountID is the AWS Account ID of the account
148148
that owns the backend AWS service API resource.
149149
type: string
150+
region:
151+
description: Region is the AWS region in which the resource exists
152+
or will exist.
153+
type: string
150154
required:
151155
- ownerAccountID
156+
- region
152157
type: object
153158
conditions:
154159
description: All CRS managed by ACK have a common `Status.Conditions`

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
- iam.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/iam-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/go-logr/logr v1.2.0
99
github.com/spf13/pflag v1.0.5
@@ -28,6 +28,8 @@ require (
2828
github.com/google/uuid v1.1.2 // indirect
2929
github.com/googleapis/gnostic v0.5.5 // indirect
3030
github.com/imdario/mergo v0.3.12 // indirect
31+
github.com/itchyny/gojq v0.12.6 // indirect
32+
github.com/itchyny/timefmt-go v0.1.3 // indirect
3133
github.com/jaypipes/envutil v1.0.0 // indirect
3234
github.com/jmespath/go-jmespath v0.4.0 // indirect
3335
github.com/json-iterator/go v1.1.12 // indirect
@@ -44,7 +46,7 @@ require (
4446
go.uber.org/zap v1.19.1 // indirect
4547
golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect
4648
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
47-
golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 // indirect
49+
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 // indirect
4850
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
4951
golang.org/x/text v0.3.7 // indirect
5052
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect

go.sum

Lines changed: 10 additions & 3 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.17.2 h1:8n4ScmbnVDKVTX/74OIqPUUp04CSiNfzth1spy9Ab7M=
68-
github.com/aws-controllers-k8s/runtime v0.17.2/go.mod h1:9c2CL3w0BlVkse+foHlP1SkJRqYWLs9H+4X/z+2kE3w=
67+
github.com/aws-controllers-k8s/runtime v0.18.0 h1:su+L290Agveb9s17aD4GHerqtkcnTNaSaMR6+C8h86Q=
68+
github.com/aws-controllers-k8s/runtime v0.18.0/go.mod h1:pK+LlQRxxWKC9mRHnGz8/WRI8Dcvjg4ZGmK8rVwb51Y=
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=
@@ -280,6 +280,10 @@ github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ
280280
github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
281281
github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
282282
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
283+
github.com/itchyny/gojq v0.12.6 h1:VjaFn59Em2wTxDNGcrRkDK9ZHMNa8IksOgL13sLL4d0=
284+
github.com/itchyny/gojq v0.12.6/go.mod h1:ZHrkfu7A+RbZLy5J1/JKpS4poEqrzItSTGDItqsfP0A=
285+
github.com/itchyny/timefmt-go v0.1.3 h1:7M3LGVDsqcd0VZH2U+x393obrzZisp7C0uEe921iRkU=
286+
github.com/itchyny/timefmt-go v0.1.3/go.mod h1:0osSSCQSASBJMsIZnhAaF1C2fCBTJZXrnj37mG8/c+A=
283287
github.com/jaypipes/envutil v1.0.0 h1:u6Vwy9HwruFihoZrL0bxDLCa/YNadGVwKyPElNmZWow=
284288
github.com/jaypipes/envutil v1.0.0/go.mod h1:vgIRDly+xgBq0eeZRcflOHMMobMwgC6MkMbxo/Nw65M=
285289
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
@@ -322,6 +326,8 @@ github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN
322326
github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
323327
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
324328
github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
329+
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
330+
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
325331
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
326332
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI=
327333
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
@@ -685,8 +691,9 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc
685691
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
686692
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
687693
golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
688-
golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 h1:M69LAlWZCshgp0QSzyDcSsSIejIEeuaCVpmwcKwyLMk=
689694
golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
695+
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 h1:TyHqChC80pFkXWraUUf6RuB5IqFdQieMLwwCJokV2pc=
696+
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
690697
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
691698
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b h1:9zKuko04nR4gjZ4+DNjHqRlAJqbJETHwiNKDqTfOjfE=
692699
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=

0 commit comments

Comments
 (0)