Skip to content

Commit 8424e56

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

20 files changed

+402
-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:33:23Z"
3-
build_hash: ade2429bb444ab635916395ea5773d141ba135e1
2+
build_date: "2022-03-22T20:30:09Z"
3+
build_hash: 6f659f796434e8fd6443c0b3a5b495daae910035
44
go_version: go1.17.5
5-
version: v0.17.2
5+
version: v0.18.0
66
api_directory_checksum: 129f62379684f764be26baaa8e217e0c431281e5
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/s3-controller
9-
newTag: v0.0.15
9+
newTag: v0.0.16

config/crd/bases/s3.services.k8s.aws_buckets.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,8 +1043,13 @@ spec:
10431043
description: OwnerAccountID is the AWS Account ID of the account
10441044
that owns the backend AWS service API resource.
10451045
type: string
1046+
region:
1047+
description: Region is the AWS region in which the resource exists
1048+
or will exist.
1049+
type: string
10461050
required:
10471051
- ownerAccountID
1052+
- region
10481053
type: object
10491054
conditions:
10501055
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
- s3.services.k8s.aws
2737
resources:
@@ -62,3 +72,23 @@ rules:
6272
- get
6373
- patch
6474
- update
75+
- apiGroups:
76+
- services.k8s.aws
77+
resources:
78+
- fieldexports
79+
verbs:
80+
- create
81+
- delete
82+
- get
83+
- list
84+
- patch
85+
- update
86+
- watch
87+
- apiGroups:
88+
- services.k8s.aws
89+
resources:
90+
- fieldexports/status
91+
verbs:
92+
- get
93+
- patch
94+
- 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/s3-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
@@ -29,6 +29,8 @@ require (
2929
github.com/google/uuid v1.1.2 // indirect
3030
github.com/googleapis/gnostic v0.5.5 // indirect
3131
github.com/imdario/mergo v0.3.12 // indirect
32+
github.com/itchyny/gojq v0.12.6 // indirect
33+
github.com/itchyny/timefmt-go v0.1.3 // indirect
3234
github.com/jaypipes/envutil v1.0.0 // indirect
3335
github.com/jmespath/go-jmespath v0.4.0 // indirect
3436
github.com/json-iterator/go v1.1.12 // indirect
@@ -47,7 +49,7 @@ require (
4749
go.uber.org/zap v1.19.1 // indirect
4850
golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect
4951
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
50-
golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 // indirect
52+
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 // indirect
5153
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
5254
golang.org/x/text v0.3.7 // indirect
5355
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=
@@ -686,8 +692,9 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc
686692
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
687693
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
688694
golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
689-
golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 h1:M69LAlWZCshgp0QSzyDcSsSIejIEeuaCVpmwcKwyLMk=
690695
golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
696+
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 h1:TyHqChC80pFkXWraUUf6RuB5IqFdQieMLwwCJokV2pc=
697+
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
691698
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
692699
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b h1:9zKuko04nR4gjZ4+DNjHqRlAJqbJETHwiNKDqTfOjfE=
693700
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=

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: s3-chart
33
description: A Helm chart for the ACK service controller for Amazon Simple Storage Service (S3)
4-
version: v0.0.15
5-
appVersion: v0.0.15
4+
version: v0.0.16
5+
appVersion: v0.0.16
66
home: https://github.com/aws-controllers-k8s/s3-controller
77
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
88
sources:

helm/crds/s3.services.k8s.aws_buckets.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,8 +1043,13 @@ spec:
10431043
description: OwnerAccountID is the AWS Account ID of the account
10441044
that owns the backend AWS service API resource.
10451045
type: string
1046+
region:
1047+
description: Region is the AWS region in which the resource exists
1048+
or will exist.
1049+
type: string
10461050
required:
10471051
- ownerAccountID
1052+
- region
10481053
type: object
10491054
conditions:
10501055
description: All CRS managed by ACK have a common `Status.Conditions`

helm/crds/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

0 commit comments

Comments
 (0)