Skip to content

Commit

Permalink
Update ACK runtime to v0.18.0 (#71)
Browse files Browse the repository at this point in the history
### 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.
  • Loading branch information
ack-bot authored Mar 22, 2022
1 parent af42651 commit 8424e56
Show file tree
Hide file tree
Showing 20 changed files with 402 additions and 21 deletions.
6 changes: 3 additions & 3 deletions apis/v1alpha1/ack-generate-metadata.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ack_generate_info:
build_date: "2022-03-02T19:33:23Z"
build_hash: ade2429bb444ab635916395ea5773d141ba135e1
build_date: "2022-03-22T20:30:09Z"
build_hash: 6f659f796434e8fd6443c0b3a5b495daae910035
go_version: go1.17.5
version: v0.17.2
version: v0.18.0
api_directory_checksum: 129f62379684f764be26baaa8e217e0c431281e5
api_version: v1alpha1
aws_sdk_go_version: v1.42.0
Expand Down
14 changes: 14 additions & 0 deletions config/controller/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ spec:
args:
- --aws-region
- "$(AWS_REGION)"
- --aws-endpoint-url
- "$(AWS_ENDPOINT_URL)"
- --enable-development-logging
- "$(ACK_ENABLE_DEVELOPMENT_LOGGING)"
- --log-level
Expand All @@ -53,6 +55,18 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: AWS_REGION
value: ""
- name: AWS_ENDPOINT_URL
value: ""
- name: ACK_WATCH_NAMESPACE
value: ""
- name: ACK_ENABLE_DEVELOPMENT_LOGGING
value: "false"
- name: ACK_LOG_LEVEL
value: "info"
- name: ACK_RESOURCE_TAGS
value: "services.k8s.aws/managed=true,services.k8s.aws/created=%UTCNOW%,services.k8s.aws/namespace=%KUBERNETES_NAMESPACE%"
securityContext:
allowPrivilegeEscalation: false
privileged: false
Expand Down
2 changes: 1 addition & 1 deletion config/controller/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ kind: Kustomization
images:
- name: controller
newName: public.ecr.aws/aws-controllers-k8s/s3-controller
newTag: v0.0.15
newTag: v0.0.16
5 changes: 5 additions & 0 deletions config/crd/bases/s3.services.k8s.aws_buckets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1043,8 +1043,13 @@ spec:
description: OwnerAccountID is the AWS Account ID of the account
that owns the backend AWS service API resource.
type: string
region:
description: Region is the AWS region in which the resource exists
or will exist.
type: string
required:
- ownerAccountID
- region
type: object
conditions:
description: All CRS managed by ACK have a common `Status.Conditions`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,8 @@ spec:
type: string
type: object
kubernetes:
description: TargetKubernetesResource provides all the values necessary
to identify a given ACK type and override any metadata values when
creating a resource of that type.
description: ResourceWithMetadata provides the values necessary to
create a Kubernetes resource and override any of its metadata values.
properties:
group:
type: string
Expand Down
137 changes: 137 additions & 0 deletions config/crd/common/bases/services.k8s.aws_fieldexports.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: fieldexports.services.k8s.aws
spec:
group: services.k8s.aws
names:
kind: FieldExport
listKind: FieldExportList
plural: fieldexports
singular: fieldexport
scope: Namespaced
versions:
- name: v1alpha1
schema:
openAPIV3Schema:
description: FieldExport is the schema for the FieldExport API.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: FieldExportSpec defines the desired state of the FieldExport.
properties:
from:
description: ResourceFieldSelector provides the values necessary to
identify an individual field on an individual K8s resource.
properties:
path:
type: string
resource:
description: NamespacedResource provides all the values necessary
to identify an ACK resource of a given type (within the same
namespace as the custom resource containing this type).
properties:
group:
type: string
kind:
type: string
name:
type: string
required:
- group
- kind
- name
type: object
required:
- path
- resource
type: object
to:
description: FieldExportTarget provides the values necessary to identify
the output path for a field export.
properties:
kind:
description: FieldExportOutputType represents all types that can
be produced by a field export operation
enum:
- configmap
- secret
type: string
name:
type: string
namespace:
description: Namespace is marked as optional, so we cannot compose
`NamespacedName`
type: string
required:
- kind
- name
type: object
required:
- from
- to
type: object
status:
description: FieldExportStatus defines the observed status of the FieldExport.
properties:
conditions:
description: A collection of `ackv1alpha1.Condition` objects that
describe the various recoverable states of the field CR
items:
description: Condition is the common struct used by all CRDs managed
by ACK service controllers to indicate terminal states of the
CR and its backend AWS service API resource
properties:
lastTransitionTime:
description: Last time the condition transitioned from one status
to another.
format: date-time
type: string
message:
description: A human readable message indicating details about
the transition.
type: string
reason:
description: The reason for the condition's last transition.
type: string
status:
description: Status of the condition, one of True, False, Unknown.
type: string
type:
description: Type is the type of the Condition
type: string
required:
- status
- type
type: object
type: array
required:
- conditions
type: object
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
3 changes: 2 additions & 1 deletion config/crd/common/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# This file is NOT auto-generated
# Code generated in runtime. DO NOT EDIT.

apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- bases/services.k8s.aws_adoptedresources.yaml
- bases/services.k8s.aws_fieldexports.yaml
30 changes: 30 additions & 0 deletions config/rbac/cluster-role-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ rules:
verbs:
- get
- list
- patch
- watch
- apiGroups:
- ""
Expand All @@ -22,6 +23,15 @@ rules:
- get
- list
- watch
- apiGroups:
- ""
resources:
- secrets
verbs:
- get
- list
- patch
- watch
- apiGroups:
- s3.services.k8s.aws
resources:
Expand Down Expand Up @@ -62,3 +72,23 @@ rules:
- get
- patch
- update
- apiGroups:
- services.k8s.aws
resources:
- fieldexports
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- services.k8s.aws
resources:
- fieldexports/status
verbs:
- get
- patch
- update
6 changes: 4 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/aws-controllers-k8s/s3-controller
go 1.17

require (
github.com/aws-controllers-k8s/runtime v0.17.2
github.com/aws-controllers-k8s/runtime v0.18.0
github.com/aws/aws-sdk-go v1.42.0
github.com/go-logr/logr v1.2.0
github.com/spf13/pflag v1.0.5
Expand All @@ -29,6 +29,8 @@ require (
github.com/google/uuid v1.1.2 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/itchyny/gojq v0.12.6 // indirect
github.com/itchyny/timefmt-go v0.1.3 // indirect
github.com/jaypipes/envutil v1.0.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
Expand All @@ -47,7 +49,7 @@ require (
go.uber.org/zap v1.19.1 // indirect
golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 // indirect
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 // indirect
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
Expand Down
13 changes: 10 additions & 3 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
github.com/aws-controllers-k8s/runtime v0.17.2 h1:8n4ScmbnVDKVTX/74OIqPUUp04CSiNfzth1spy9Ab7M=
github.com/aws-controllers-k8s/runtime v0.17.2/go.mod h1:9c2CL3w0BlVkse+foHlP1SkJRqYWLs9H+4X/z+2kE3w=
github.com/aws-controllers-k8s/runtime v0.18.0 h1:su+L290Agveb9s17aD4GHerqtkcnTNaSaMR6+C8h86Q=
github.com/aws-controllers-k8s/runtime v0.18.0/go.mod h1:pK+LlQRxxWKC9mRHnGz8/WRI8Dcvjg4ZGmK8rVwb51Y=
github.com/aws/aws-sdk-go v1.42.0 h1:BMZws0t8NAhHFsfnT3B40IwD13jVDG5KerlRksctVIw=
github.com/aws/aws-sdk-go v1.42.0/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
Expand Down Expand Up @@ -280,6 +280,10 @@ github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ
github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/itchyny/gojq v0.12.6 h1:VjaFn59Em2wTxDNGcrRkDK9ZHMNa8IksOgL13sLL4d0=
github.com/itchyny/gojq v0.12.6/go.mod h1:ZHrkfu7A+RbZLy5J1/JKpS4poEqrzItSTGDItqsfP0A=
github.com/itchyny/timefmt-go v0.1.3 h1:7M3LGVDsqcd0VZH2U+x393obrzZisp7C0uEe921iRkU=
github.com/itchyny/timefmt-go v0.1.3/go.mod h1:0osSSCQSASBJMsIZnhAaF1C2fCBTJZXrnj37mG8/c+A=
github.com/jaypipes/envutil v1.0.0 h1:u6Vwy9HwruFihoZrL0bxDLCa/YNadGVwKyPElNmZWow=
github.com/jaypipes/envutil v1.0.0/go.mod h1:vgIRDly+xgBq0eeZRcflOHMMobMwgC6MkMbxo/Nw65M=
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
Expand Down Expand Up @@ -322,6 +326,8 @@ github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN
github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI=
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
Expand Down Expand Up @@ -686,8 +692,9 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 h1:M69LAlWZCshgp0QSzyDcSsSIejIEeuaCVpmwcKwyLMk=
golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 h1:TyHqChC80pFkXWraUUf6RuB5IqFdQieMLwwCJokV2pc=
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b h1:9zKuko04nR4gjZ4+DNjHqRlAJqbJETHwiNKDqTfOjfE=
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
Expand Down
4 changes: 2 additions & 2 deletions helm/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
name: s3-chart
description: A Helm chart for the ACK service controller for Amazon Simple Storage Service (S3)
version: v0.0.15
appVersion: v0.0.15
version: v0.0.16
appVersion: v0.0.16
home: https://github.com/aws-controllers-k8s/s3-controller
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
sources:
Expand Down
5 changes: 5 additions & 0 deletions helm/crds/s3.services.k8s.aws_buckets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1043,8 +1043,13 @@ spec:
description: OwnerAccountID is the AWS Account ID of the account
that owns the backend AWS service API resource.
type: string
region:
description: Region is the AWS region in which the resource exists
or will exist.
type: string
required:
- ownerAccountID
- region
type: object
conditions:
description: All CRS managed by ACK have a common `Status.Conditions`
Expand Down
5 changes: 2 additions & 3 deletions helm/crds/services.k8s.aws_adoptedresources.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,8 @@ spec:
type: string
type: object
kubernetes:
description: TargetKubernetesResource provides all the values necessary
to identify a given ACK type and override any metadata values when
creating a resource of that type.
description: ResourceWithMetadata provides the values necessary to
create a Kubernetes resource and override any of its metadata values.
properties:
group:
type: string
Expand Down
Loading

0 comments on commit 8424e56

Please sign in to comment.