Skip to content

Commit 93a52ca

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

25 files changed

+160
-43
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-19T23:02:13Z"
3-
build_hash: f0a0f42d507c550c2b063a192b3b43e4522bdd9c
2+
build_date: "2024-08-06T02:47:49Z"
3+
build_hash: 587b90dc860e91ee9a763e9e3bc4d3f1b2fbddb7
44
go_version: go1.22.5
5-
version: v0.35.0
5+
version: v0.36.0
66
api_directory_checksum: 721d07f7f5c29de8a1c65268e497be355ee1b3fd
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.44.232

‎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/rds-controller
9-
newTag: 1.4.2
9+
newTag: 1.4.3

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

+10
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,8 @@ spec:
229229
properties:
230230
name:
231231
type: string
232+
namespace:
233+
type: string
232234
type: object
233235
type: object
234236
dbSubnetGroupName:
@@ -261,6 +263,8 @@ spec:
261263
properties:
262264
name:
263265
type: string
266+
namespace:
267+
type: string
264268
type: object
265269
type: object
266270
dbSystemID:
@@ -598,6 +602,8 @@ spec:
598602
properties:
599603
name:
600604
type: string
605+
namespace:
606+
type: string
601607
type: object
602608
type: object
603609
manageMasterUserPassword:
@@ -695,6 +701,8 @@ spec:
695701
properties:
696702
name:
697703
type: string
704+
namespace:
705+
type: string
698706
type: object
699707
type: object
700708
masterUsername:
@@ -1153,6 +1161,8 @@ spec:
11531161
properties:
11541162
name:
11551163
type: string
1164+
namespace:
1165+
type: string
11561166
type: object
11571167
type: object
11581168
type: array

‎config/crd/bases/rds.services.k8s.aws_dbclustersnapshots.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ spec:
7474
properties:
7575
name:
7676
type: string
77+
namespace:
78+
type: string
7779
type: object
7880
type: object
7981
dbClusterSnapshotIdentifier:

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

+10
Original file line numberDiff line numberDiff line change
@@ -571,6 +571,8 @@ spec:
571571
properties:
572572
name:
573573
type: string
574+
namespace:
575+
type: string
574576
type: object
575577
type: object
576578
dbSnapshotIdentifier:
@@ -617,6 +619,8 @@ spec:
617619
properties:
618620
name:
619621
type: string
622+
namespace:
623+
type: string
620624
type: object
621625
type: object
622626
deletionProtection:
@@ -963,6 +967,8 @@ spec:
963967
properties:
964968
name:
965969
type: string
970+
namespace:
971+
type: string
966972
type: object
967973
type: object
968974
licenseModel:
@@ -1095,6 +1101,8 @@ spec:
10951101
properties:
10961102
name:
10971103
type: string
1104+
namespace:
1105+
type: string
10981106
type: object
10991107
type: object
11001108
masterUsername:
@@ -1850,6 +1858,8 @@ spec:
18501858
properties:
18511859
name:
18521860
type: string
1861+
namespace:
1862+
type: string
18531863
type: object
18541864
type: object
18551865
type: array

‎config/crd/bases/rds.services.k8s.aws_dbsnapshots.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ spec:
6969
properties:
7070
name:
7171
type: string
72+
namespace:
73+
type: string
7274
type: object
7375
type: object
7476
dbSnapshotIdentifier:

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

+2
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ spec:
8989
properties:
9090
name:
9191
type: string
92+
namespace:
93+
type: string
9294
type: object
9395
type: object
9496
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.1.2
99
github.com/aws-controllers-k8s/kms-controller v1.0.8
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.0
1212
github.com/go-logr/logr v1.4.1
1313
github.com/samber/lo v1.37.0

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ github.com/aws-controllers-k8s/ec2-controller v1.1.2 h1:Bry62L279S7mJofk0sS4o7T7
22
github.com/aws-controllers-k8s/ec2-controller v1.1.2/go.mod h1:XZOZcSk0tzplY+A0dADqD4NK4a8g8Jqwf/Ouv2Sz/eQ=
33
github.com/aws-controllers-k8s/kms-controller v1.0.8 h1:nDPYQhsgD2s14rEMNmGCwkm+e0Emjo/Usl3is7e9EFk=
44
github.com/aws-controllers-k8s/kms-controller v1.0.8/go.mod h1:HjSBjtiljNL1yFzrOizxeQe2+88tW3mHD5fnEGwVYGE=
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.0 h1:g9BkW1fo9GqKfwg2+zCD+TW/D36Ux+vtfJ8guF4AYmY=
88
github.com/aws/aws-sdk-go v1.49.0/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: rds-chart
33
description: A Helm chart for the ACK service controller for Amazon Relational Database Service (RDS)
4-
version: 1.4.2
5-
appVersion: 1.4.2
4+
version: 1.4.3
5+
appVersion: 1.4.3
66
home: https://github.com/aws-controllers-k8s/rds-controller
77
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
88
sources:

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

+10
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,8 @@ spec:
229229
properties:
230230
name:
231231
type: string
232+
namespace:
233+
type: string
232234
type: object
233235
type: object
234236
dbSubnetGroupName:
@@ -261,6 +263,8 @@ spec:
261263
properties:
262264
name:
263265
type: string
266+
namespace:
267+
type: string
264268
type: object
265269
type: object
266270
dbSystemID:
@@ -598,6 +602,8 @@ spec:
598602
properties:
599603
name:
600604
type: string
605+
namespace:
606+
type: string
601607
type: object
602608
type: object
603609
manageMasterUserPassword:
@@ -695,6 +701,8 @@ spec:
695701
properties:
696702
name:
697703
type: string
704+
namespace:
705+
type: string
698706
type: object
699707
type: object
700708
masterUsername:
@@ -1153,6 +1161,8 @@ spec:
11531161
properties:
11541162
name:
11551163
type: string
1164+
namespace:
1165+
type: string
11561166
type: object
11571167
type: object
11581168
type: array

‎helm/crds/rds.services.k8s.aws_dbclustersnapshots.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ spec:
7474
properties:
7575
name:
7676
type: string
77+
namespace:
78+
type: string
7779
type: object
7880
type: object
7981
dbClusterSnapshotIdentifier:

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

+10
Original file line numberDiff line numberDiff line change
@@ -571,6 +571,8 @@ spec:
571571
properties:
572572
name:
573573
type: string
574+
namespace:
575+
type: string
574576
type: object
575577
type: object
576578
dbSnapshotIdentifier:
@@ -617,6 +619,8 @@ spec:
617619
properties:
618620
name:
619621
type: string
622+
namespace:
623+
type: string
620624
type: object
621625
type: object
622626
deletionProtection:
@@ -963,6 +967,8 @@ spec:
963967
properties:
964968
name:
965969
type: string
970+
namespace:
971+
type: string
966972
type: object
967973
type: object
968974
licenseModel:
@@ -1095,6 +1101,8 @@ spec:
10951101
properties:
10961102
name:
10971103
type: string
1104+
namespace:
1105+
type: string
10981106
type: object
10991107
type: object
11001108
masterUsername:
@@ -1850,6 +1858,8 @@ spec:
18501858
properties:
18511859
name:
18521860
type: string
1861+
namespace:
1862+
type: string
18531863
type: object
18541864
type: object
18551865
type: array

‎helm/crds/rds.services.k8s.aws_dbsnapshots.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ spec:
6969
properties:
7070
name:
7171
type: string
72+
namespace:
73+
type: string
7274
type: object
7375
type: object
7476
dbSnapshotIdentifier:

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

+2
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ spec:
8989
properties:
9090
name:
9191
type: string
92+
namespace:
93+
type: string
9294
type: object
9395
type: object
9496
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/rds-controller:1.4.2".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/rds-controller:1.4.3".
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
@@ -339,4 +339,13 @@ rules:
339339
- get
340340
- patch
341341
- update
342-
{{- end }}
342+
{{- end }}
343+
344+
{{/* Convert k/v map to string like: "key1=value1,key2=value2,..." */}}
345+
{{- define "ack-rds-controller.feature-gates" -}}
346+
{{- $list := list -}}
347+
{{- range $k, $v := .Values.featureGates -}}
348+
{{- $list = append $list (printf "%s=%s" $k ( $v | toString)) -}}
349+
{{- end -}}
350+
{{ join "," $list }}
351+
{{- 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-rds-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/rds-controller
7-
tag: 1.4.2
7+
tag: 1.4.3
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

0 commit comments

Comments
 (0)