Skip to content

Commit d904d10

Browse files
ack-botack-bot
authored
Update to ACK runtime v0.36.0, code-generator v0.36.0 (#19)
### Update to ACK runtime `v0.36.0`, code-generator `v0.36.0` ---------- * ACK code-generator `v0.36.0` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.36.0) * ACK runtime `v0.36.0` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.36.0) ---------- NOTE: This PR increments the release version of service controller from `v0.0.7` to `v0.0.8` Once this PR is merged, release `v0.0.8` will be automatically created for `documentdb-controller` **Please close this PR, if you do not want the new patch release for `documentdb-controller`** ---------- #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building documentdb-controller ==== Copying common custom resource definitions into documentdb Building Kubernetes API objects for documentdb Generating deepcopy code for documentdb Generating custom resource definitions for documentdb Building service controller for documentdb Generating RBAC manifests for documentdb Running gofmt against generated code for documentdb Updating additional GitHub repository maintenance files ==== building documentdb-controller release artifacts ==== Building release artifacts for documentdb-v0.0.8 Generating common custom resource definitions Generating custom resource definitions for documentdb Generating RBAC manifests for documentdb ``` ---------- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 54745f0 commit d904d10

19 files changed

+88
-25
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ack_generate_info:
2-
build_date: "2024-07-19T22:48:20Z"
3-
build_hash: f0a0f42d507c550c2b063a192b3b43e4522bdd9c
2+
build_date: "2024-08-06T02:43:33Z"
3+
build_hash: 587b90dc860e91ee9a763e9e3bc4d3f1b2fbddb7
44
go_version: go1.22.5
5-
version: v0.35.0
5+
version: v0.36.0
66
api_directory_checksum: ad41ea4266e719ebbe78d5625a0d5a114839f84e
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.50.0

‎config/controller/kustomization.yaml

+1-1
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/documentdb-controller
9-
newTag: 0.0.7
9+
newTag: 0.0.8

‎config/crd/bases/documentdb.services.k8s.aws_dbclusters.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ spec:
112112
properties:
113113
name:
114114
type: string
115+
namespace:
116+
type: string
115117
type: object
116118
type: object
117119
deletionProtection:
@@ -186,6 +188,8 @@ spec:
186188
properties:
187189
name:
188190
type: string
191+
namespace:
192+
type: string
189193
type: object
190194
type: object
191195
masterUserPassword:
@@ -354,6 +358,8 @@ spec:
354358
properties:
355359
name:
356360
type: string
361+
namespace:
362+
type: string
357363
type: object
358364
type: object
359365
type: array

‎config/crd/bases/documentdb.services.k8s.aws_dbinstances.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@ spec:
147147
properties:
148148
name:
149149
type: string
150+
namespace:
151+
type: string
150152
type: object
151153
type: object
152154
preferredMaintenanceWindow:

‎config/crd/bases/documentdb.services.k8s.aws_dbsubnetgroups.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ spec:
7676
properties:
7777
name:
7878
type: string
79+
namespace:
80+
type: string
7981
type: object
8082
type: object
8183
type: array

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ toolchain go1.22.5
77
require (
88
github.com/aws-controllers-k8s/ec2-controller v1.2.2
99
github.com/aws-controllers-k8s/kms-controller v1.0.9
10-
github.com/aws-controllers-k8s/runtime v0.35.0
10+
github.com/aws-controllers-k8s/runtime v0.36.0
1111
github.com/aws/aws-sdk-go v1.49.24
1212
github.com/go-logr/logr v1.4.1
1313
github.com/spf13/pflag v1.0.5

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ github.com/aws-controllers-k8s/ec2-controller v1.2.2 h1:ek/cGd76XTWQXe6185nxrmEm
22
github.com/aws-controllers-k8s/ec2-controller v1.2.2/go.mod h1:4e2L1aHo1fk3ihVTRmnhA6VJ2NSSoYPEf1GZNYYPwLw=
33
github.com/aws-controllers-k8s/kms-controller v1.0.9 h1:GZHSnuZBoWp9r6RaJ3siyDn5BRhDuaZJXtdBKeAiLSw=
44
github.com/aws-controllers-k8s/kms-controller v1.0.9/go.mod h1:Pnz0d5sly7dUgmYMDJWSRIKASOujJFi/b8N2q1qCLqU=
5-
github.com/aws-controllers-k8s/runtime v0.35.0 h1:kLRLFOAcaFJRv/aEiWtb0qhlxFpwvmx6shCWNc1Tuas=
6-
github.com/aws-controllers-k8s/runtime v0.35.0/go.mod h1:gI2pWb20UGLP2SnHf1a1VzTd7iVVy+/I9VAzT0Y+Dew=
5+
github.com/aws-controllers-k8s/runtime v0.36.0 h1:XEMVGfUwsT9QMShihuCLHlape+daJWyYtXj45s/iJiU=
6+
github.com/aws-controllers-k8s/runtime v0.36.0/go.mod h1:gI2pWb20UGLP2SnHf1a1VzTd7iVVy+/I9VAzT0Y+Dew=
77
github.com/aws/aws-sdk-go v1.49.24 h1:2ekq9ZvaoB2aRbTDfARzgVGUBB9N8XD2QYhFmTBlp+c=
88
github.com/aws/aws-sdk-go v1.49.24/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
99
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=

‎helm/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v1
22
name: documentdb-chart
33
description: A Helm chart for the ACK service controller for Amazon DocumentDB (DocumentDB)
4-
version: 0.0.7
5-
appVersion: 0.0.7
4+
version: 0.0.8
5+
appVersion: 0.0.8
66
home: https://github.com/aws-controllers-k8s/documentdb-controller
77
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
88
sources:

‎helm/crds/documentdb.services.k8s.aws_dbclusters.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ spec:
112112
properties:
113113
name:
114114
type: string
115+
namespace:
116+
type: string
115117
type: object
116118
type: object
117119
deletionProtection:
@@ -186,6 +188,8 @@ spec:
186188
properties:
187189
name:
188190
type: string
191+
namespace:
192+
type: string
189193
type: object
190194
type: object
191195
masterUserPassword:
@@ -354,6 +358,8 @@ spec:
354358
properties:
355359
name:
356360
type: string
361+
namespace:
362+
type: string
357363
type: object
358364
type: object
359365
type: array

‎helm/crds/documentdb.services.k8s.aws_dbinstances.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@ spec:
147147
properties:
148148
name:
149149
type: string
150+
namespace:
151+
type: string
150152
type: object
151153
type: object
152154
preferredMaintenanceWindow:

‎helm/crds/documentdb.services.k8s.aws_dbsubnetgroups.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ spec:
7676
properties:
7777
name:
7878
type: string
79+
namespace:
80+
type: string
7981
type: object
8082
type: object
8183
type: array

‎helm/templates/NOTES.txt

+1-1
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/documentdb-controller:0.0.7".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/documentdb-controller:0.0.8".
33

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

‎helm/templates/_helpers.tpl

+10-1
Original file line numberDiff line numberDiff line change
@@ -219,4 +219,13 @@ rules:
219219
- get
220220
- patch
221221
- update
222-
{{- end }}
222+
{{- end }}
223+
224+
{{/* Convert k/v map to string like: "key1=value1,key2=value2,..." */}}
225+
{{- define "ack-documentdb-controller.feature-gates" -}}
226+
{{- $list := list -}}
227+
{{- range $k, $v := .Values.featureGates -}}
228+
{{- $list = append $list (printf "%s=%s" $k ( $v | toString)) -}}
229+
{{- end -}}
230+
{{ join "," $list }}
231+
{{- end -}}

‎helm/templates/deployment.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@ spec:
7979
{{- range $key, $value := .Values.reconcile.resourceMaxConcurrentSyncs }}
8080
- --reconcile-resource-max-concurrent-syncs
8181
- "$(RECONCILE_RESOURCE_MAX_CONCURRENT_SYNCS_{{ $key | upper }})"
82+
{{- end }}
83+
{{- if .Values.featureGates}}
84+
- --feature-gates
85+
- "$(FEATURE_GATES)"
8286
{{- end }}
8387
image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
8488
imagePullPolicy: {{ .Values.image.pullPolicy }}
@@ -122,6 +126,10 @@ spec:
122126
{{- range $key, $value := .Values.reconcile.resourceMaxConcurrentSyncs }}
123127
- name: RECONCILE_RESOURCE_MAX_CONCURRENT_SYNCS_{{ $key | upper }}
124128
value: {{ $key }}={{ $value }}
129+
{{- end }}
130+
{{- if .Values.featureGates}}
131+
- name: FEATURE_GATES
132+
value: {{ include "ack-documentdb-controller.feature-gates" . }}
125133
{{- end }}
126134
{{- if .Values.aws.credentials.secretName }}
127135
- name: AWS_SHARED_CREDENTIALS_FILE

‎helm/values.schema.json

+7
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,13 @@
268268
"type": "object"
269269
}
270270
},
271+
"featureGates": {
272+
"description": "Feature gates settings",
273+
"type": "object",
274+
"additionalProperties": {
275+
"type": "boolean"
276+
}
277+
},
271278
"required": [
272279
"image",
273280
"deployment",

‎helm/values.yaml

+8-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
image:
66
repository: public.ecr.aws/aws-controllers-k8s/documentdb-controller
7-
tag: 0.0.7
7+
tag: 0.0.8
88
pullPolicy: IfNotPresent
99
pullSecrets: []
1010

@@ -153,3 +153,10 @@ leaderElection:
153153
# will attempt to use the namespace of the service account mounted to the Controller
154154
# pod.
155155
namespace: ""
156+
157+
# Configuration for feature gates. These are optional controller features that
158+
# can be individually enabled ("true") or disabled ("false") by adding key/value
159+
# pairs below.
160+
featureGates: {}
161+
# featureGate1: true
162+
# featureGate2: false

‎pkg/resource/db_cluster/references.go

+15-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/resource/db_instance/references.go

+5-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/resource/db_subnet_group/references.go

+5-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)