Skip to content

Commit ea8b003

Browse files
rushmash91rushmash91
committed
restructure controller - user compile issues(codegen issue?)
1 parent d7e75a4 commit ea8b003

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+2158
-2363
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
ack_generate_info:
2-
build_date: "2025-02-07T19:16:11Z"
3-
build_hash: 3d74f13b9de7134b4c76ab7526a9c578c4857602
4-
go_version: go1.23.4
5-
version: v0.41.0-18-g3d74f13
6-
api_directory_checksum: eb643965cba3c68f76c1b45f100874d07d39c935
2+
build_date: "2025-02-11T03:41:28Z"
3+
build_hash: 8762917215d9902b2011a2b0b1b0c776855a683e
4+
go_version: go1.22.5
5+
version: v0.42.0
6+
api_directory_checksum: f1abc2ecc0831421b484ff2a1c8744468f4a0289
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.32.6
99
generator_config_info:
10-
file_checksum: 3c359b3f45716af86c99ab2ea0f2ab50eeae5dc9
10+
file_checksum: 7f7cba17d34c1113ba034f4bd7c3c2e6763ecdf2
1111
original_file_name: generator.yaml
1212
last_modification:
1313
reason: API generation

‎apis/v1alpha1/generator.yaml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,19 @@ resources:
3737
add_synced_column: true
3838
order_by: index
3939
additional_columns:
40-
- name: VERSION
41-
json_path: .spec.engineVersion
42-
type: string
43-
index: 10
44-
- name: STATUS
45-
json_path: .status.cacheClusterStatus
46-
type: string
47-
index: 20
48-
- name: ENDPOINT
49-
json_path: .status.configurationEndpoint.address
50-
type: string
51-
index: 30
52-
priority: 1
40+
- name: VERSION
41+
json_path: .spec.engineVersion
42+
type: string
43+
index: 10
44+
- name: STATUS
45+
json_path: .status.cacheClusterStatus
46+
type: string
47+
index: 20
48+
- name: ENDPOINT
49+
json_path: .status.configurationEndpoint.address
50+
type: string
51+
index: 30
52+
priority: 1
5353
exceptions:
5454
errors:
5555
404:
@@ -189,7 +189,7 @@ resources:
189189
sdk_file_end:
190190
template_path: hooks/replication_group/sdk_file_end.go.tpl
191191
sdk_file_end_set_output_post_populate:
192-
code: "rm.customSetOutput(obj, ko) // custom set output from obj"
192+
template_path: hooks/replication_group/sdk_file_end_set_output_post_populate.go.tpl
193193
renames:
194194
operations:
195195
CreateReplicationGroup:
@@ -303,7 +303,7 @@ operations:
303303
custom_implementation: CustomModifyReplicationGroup
304304
set_output_custom_method_name: CustomModifyReplicationGroupSetOutput
305305
override_values:
306-
ApplyImmediately: true
306+
ApplyImmediately: aws.Bool(true)
307307
CreateSnapshot:
308308
custom_implementation: CustomCreateSnapshot
309309
set_output_custom_method_name: CustomCreateSnapshotSetOutput
@@ -327,7 +327,7 @@ operations:
327327
ModifyCacheCluster:
328328
set_output_custom_method_name: customModifyCacheClusterSetOutput
329329
override_values:
330-
ApplyImmediately: true
330+
ApplyImmediately: aws.Bool(true)
331331
ignore:
332332
resource_names:
333333
- ServerlessCache
@@ -348,4 +348,4 @@ ignore:
348348
- CreateReplicationGroupInput.AutoMinorVersionUpgrade
349349
- CreateReplicationGroupInput.NumCacheClusters
350350
- CacheCluster.LogDeliveryConfigurations
351-
- PendingModifiedValues.LogDeliveryConfigurations
351+
- PendingModifiedValues.LogDeliveryConfigurations

‎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/elasticache-controller
9-
newTag: 1.6.0
9+
newTag: 0.0.0-non-release-version

‎config/crd/bases/elasticache.services.k8s.aws_cacheclusters.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,8 @@ spec:
195195
properties:
196196
name:
197197
type: string
198+
namespace:
199+
type: string
198200
type: object
199201
type: object
200202
cacheSecurityGroupNames:
@@ -230,6 +232,8 @@ spec:
230232
properties:
231233
name:
232234
type: string
235+
namespace:
236+
type: string
233237
type: object
234238
type: object
235239
engine:
@@ -319,6 +323,8 @@ spec:
319323
properties:
320324
name:
321325
type: string
326+
namespace:
327+
type: string
322328
type: object
323329
type: object
324330
numCacheNodes:
@@ -413,6 +419,8 @@ spec:
413419
properties:
414420
name:
415421
type: string
422+
namespace:
423+
type: string
416424
type: object
417425
type: object
418426
securityGroupIDs:
@@ -458,6 +466,8 @@ spec:
458466
properties:
459467
name:
460468
type: string
469+
namespace:
470+
type: string
461471
type: object
462472
type: object
463473
snapshotRetentionLimit:

‎config/crd/bases/elasticache.services.k8s.aws_cachesubnetgroups.yaml‎

Lines changed: 2 additions & 0 deletions
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

‎config/crd/bases/elasticache.services.k8s.aws_replicationgroups.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,8 @@ spec:
188188
properties:
189189
name:
190190
type: string
191+
namespace:
192+
type: string
191193
type: object
192194
type: object
193195
cacheSecurityGroupNames:
@@ -217,6 +219,8 @@ spec:
217219
properties:
218220
name:
219221
type: string
222+
namespace:
223+
type: string
220224
type: object
221225
type: object
222226
clusterMode:
@@ -468,6 +472,8 @@ spec:
468472
properties:
469473
name:
470474
type: string
475+
namespace:
476+
type: string
471477
type: object
472478
type: object
473479
type: array

‎generator.yaml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,19 @@ resources:
3737
add_synced_column: true
3838
order_by: index
3939
additional_columns:
40-
- name: VERSION
41-
json_path: .spec.engineVersion
42-
type: string
43-
index: 10
44-
- name: STATUS
45-
json_path: .status.cacheClusterStatus
46-
type: string
47-
index: 20
48-
- name: ENDPOINT
49-
json_path: .status.configurationEndpoint.address
50-
type: string
51-
index: 30
52-
priority: 1
40+
- name: VERSION
41+
json_path: .spec.engineVersion
42+
type: string
43+
index: 10
44+
- name: STATUS
45+
json_path: .status.cacheClusterStatus
46+
type: string
47+
index: 20
48+
- name: ENDPOINT
49+
json_path: .status.configurationEndpoint.address
50+
type: string
51+
index: 30
52+
priority: 1
5353
exceptions:
5454
errors:
5555
404:
@@ -189,7 +189,7 @@ resources:
189189
sdk_file_end:
190190
template_path: hooks/replication_group/sdk_file_end.go.tpl
191191
sdk_file_end_set_output_post_populate:
192-
code: "rm.customSetOutput(obj, ko) // custom set output from obj"
192+
template_path: hooks/replication_group/sdk_file_end_set_output_post_populate.go.tpl
193193
renames:
194194
operations:
195195
CreateReplicationGroup:
@@ -303,7 +303,7 @@ operations:
303303
custom_implementation: CustomModifyReplicationGroup
304304
set_output_custom_method_name: CustomModifyReplicationGroupSetOutput
305305
override_values:
306-
ApplyImmediately: true
306+
ApplyImmediately: aws.Bool(true)
307307
CreateSnapshot:
308308
custom_implementation: CustomCreateSnapshot
309309
set_output_custom_method_name: CustomCreateSnapshotSetOutput
@@ -327,7 +327,7 @@ operations:
327327
ModifyCacheCluster:
328328
set_output_custom_method_name: customModifyCacheClusterSetOutput
329329
override_values:
330-
ApplyImmediately: true
330+
ApplyImmediately: aws.Bool(true)
331331
ignore:
332332
resource_names:
333333
- ServerlessCache
@@ -348,4 +348,4 @@ ignore:
348348
- CreateReplicationGroupInput.AutoMinorVersionUpgrade
349349
- CreateReplicationGroupInput.NumCacheClusters
350350
- CacheCluster.LogDeliveryConfigurations
351-
- PendingModifiedValues.LogDeliveryConfigurations
351+
- PendingModifiedValues.LogDeliveryConfigurations

‎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: elasticache-chart
33
description: A Helm chart for the ACK service controller for Amazon ElastiCache (ElastiCache)
4-
version: 1.6.0
5-
appVersion: 1.6.0
4+
version: 0.0.0-non-release-version
5+
appVersion: 0.0.0-non-release-version
66
home: https://github.com/aws-controllers-k8s/elasticache-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/elasticache-controller:1.6.0".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/elasticache-controller:0.0.0-non-release-version".
33

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

‎helm/values.yaml‎

Lines changed: 1 addition & 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/elasticache-controller
7-
tag: 1.6.0
7+
tag: 0.0.0-non-release-version
88
pullPolicy: IfNotPresent
99
pullSecrets: []
1010

0 commit comments

Comments
 (0)