Skip to content

Commit f7ae8f1

Browse files
ack-botack-bot
authored
Update to ACK runtime v0.22.1, code-generator v0.22.0 (#92)
### Update to ACK runtime `v0.22.1`, code-generator `v0.22.0` ---------- * ACK code-generator `v0.22.0` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.22.0) * ACK runtime `v0.22.1` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.22.1) ---------- NOTE: This PR increments the release version of service controller from `v0.1.6` to `v0.1.7` Once this PR is merged, release `v0.1.7` 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.1.7 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 2e52c4c commit f7ae8f1

File tree

10 files changed

+38
-32
lines changed

10 files changed

+38
-32
lines changed

‎apis/v1alpha1/ack-generate-metadata.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
ack_generate_info:
2-
build_date: "2022-12-08T19:06:14Z"
3-
build_hash: 12246c7da82841b351ec7a9e1f139f9338f2784b
2+
build_date: "2023-01-10T21:53:42Z"
3+
build_hash: 1b20baf45a0b73a11b296050322a384c705fa897
44
go_version: go1.17.5
5-
version: v0.21.0
6-
api_directory_checksum: 3a03f844d62b741556d2ea7ec6b96e5d8775a7c6
5+
version: v0.22.0
6+
api_directory_checksum: f50cdf03c85532166479736d285eaf6330f91d2b
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.44.93
99
generator_config_info:

‎apis/v1alpha1/bucket.go

Lines changed: 12 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎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.1.6
9+
newTag: v0.1.7

‎go.mod

Lines changed: 1 addition & 1 deletion
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.21.0
6+
github.com/aws-controllers-k8s/runtime v0.22.1
77
github.com/aws/aws-sdk-go v1.44.93
88
github.com/go-logr/logr v1.2.0
99
github.com/pkg/errors v0.9.1

‎go.sum

Lines changed: 2 additions & 2 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.21.0 h1:e9DK88QodwXMLz+QXPXk+8XNetVj4ij+puaVwn9uEVc=
68-
github.com/aws-controllers-k8s/runtime v0.21.0/go.mod h1:k7z4qlf6aK1Kzd4ff49wzcyhDKHjWaUpqxrwgl4uS1o=
67+
github.com/aws-controllers-k8s/runtime v0.22.1 h1:V5AKMBjGmq3sblGYrVYvi+6utW4CiIVotWA60Ym9T84=
68+
github.com/aws-controllers-k8s/runtime v0.22.1/go.mod h1:k7z4qlf6aK1Kzd4ff49wzcyhDKHjWaUpqxrwgl4uS1o=
6969
github.com/aws/aws-sdk-go v1.44.93 h1:hAgd9fuaptBatSft27/5eBMdcA8+cIMqo96/tZ6rKl8=
7070
github.com/aws/aws-sdk-go v1.44.93/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
7171
github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=

‎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.1.6
5-
appVersion: v0.1.6
4+
version: v0.1.7
5+
appVersion: v0.1.7
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/templates/NOTES.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{ .Chart.Name }} has been installed.
2-
This chart deploys "public.ecr.aws/aws-controllers-k8s/s3-controller:v0.1.6".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/s3-controller:v0.1.7".
33

44
Check its status by running:
55
kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"

‎helm/templates/deployment.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ spec:
5555
- "$(ACK_RESOURCE_TAGS)"
5656
- --watch-namespace
5757
- "$(ACK_WATCH_NAMESPACE)"
58+
- --deletion-policy
59+
- "$(DELETION_POLICY)"
5860
image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
5961
imagePullPolicy: {{ .Values.image.pullPolicy }}
6062
name: controller
@@ -74,6 +76,8 @@ spec:
7476
value: {{ .Values.aws.endpoint_url | quote }}
7577
- name: ACK_WATCH_NAMESPACE
7678
value: {{ include "watch-namespace" . }}
79+
- name: DELETION_POLICY
80+
value: {{ .Values.deletionPolicy }}
7781
- name: ACK_ENABLE_DEVELOPMENT_LOGGING
7882
value: {{ .Values.log.enable_development_logging | quote }}
7983
- name: ACK_LOG_LEVEL
@@ -89,7 +93,7 @@ spec:
8993
- name: {{ .Values.aws.credentials.secretName }}
9094
mountPath: {{ include "aws.credentials.secret_mount_path" . }}
9195
readOnly: true
92-
{{- end }}
96+
{{- end }}
9397
securityContext:
9498
allowPrivilegeEscalation: false
9599
privileged: false

‎helm/values.schema.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,10 @@
203203
"pattern": "(^$|^.*=.*$)"
204204
}
205205
},
206+
"deletionPolicy": {
207+
"type": "string",
208+
"enum": ["delete", "retain"]
209+
},
206210
"serviceAccount": {
207211
"description": "ServiceAccount settings",
208212
"properties": {

‎helm/values.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
image:
66
repository: public.ecr.aws/aws-controllers-k8s/s3-controller
7-
tag: v0.1.6
7+
tag: v0.1.7
88
pullPolicy: IfNotPresent
99
pullSecrets: []
1010

@@ -78,6 +78,11 @@ resourceTags:
7878
- services.k8s.aws/controller-version=%CONTROLLER_SERVICE%-%CONTROLLER_VERSION%
7979
- services.k8s.aws/namespace=%K8S_NAMESPACE%
8080

81+
# Set to "retain" to keep all AWS resources intact even after the K8s resources
82+
# have been deleted. By default, the ACK controller will delete the AWS resource
83+
# before the K8s resource is removed.
84+
deletionPolicy: delete
85+
8186
serviceAccount:
8287
# Specifies whether a service account should be created
8388
create: true

0 commit comments

Comments
 (0)