fix: propagate shardCount to resource status

michaelhtm · michaelhtm · commit 77109f0a4262 · 2025-04-04T14:13:04.000-07:00
diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml
@@ -1,13 +1,13 @@
 ack_generate_info:
-  build_date: "2025-04-03T18:54:15Z"
+  build_date: "2025-04-04T21:04:55Z"
   build_hash: 980cb1e4734f673d16101cf55206b84ca639ec01
   go_version: go1.24.1
   version: v0.44.0
 api_directory_checksum: b08fe6fcd497d00fdd4e069970d4ba14318abcb4
 api_version: v1alpha1
 aws_sdk_go_version: v1.32.6
 generator_config_info:
-  file_checksum: a99b63823035947bb9160bb5f164c925a65accd0
+  file_checksum: 7192633fe2be3555027be5456afef2c1996457b3
   original_file_name: generator.yaml
 last_modification:
   reason: API generation
diff --git a/apis/v1alpha1/generator.yaml b/apis/v1alpha1/generator.yaml
@@ -37,6 +37,8 @@ resources:
     hooks:
       sdk_read_one_post_set_output:
         template_path: hooks/stream/sdk_read_one_post_set_output.go.tpl
+      sdk_update_post_set_output:
+        template_path: hooks/stream/sdk_update_post_set_output.go.tpl
     exceptions:
       errors:
         404:
diff --git a/config/controller/kustomization.yaml b/config/controller/kustomization.yaml
@@ -6,4 +6,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: public.ecr.aws/aws-controllers-k8s/kinesis-controller
-  newTag: 1.0.7
+  newTag: 1.0.6
diff --git a/generator.yaml b/generator.yaml
@@ -37,6 +37,8 @@ resources:
     hooks:
       sdk_read_one_post_set_output:
         template_path: hooks/stream/sdk_read_one_post_set_output.go.tpl
+      sdk_update_post_set_output:
+        template_path: hooks/stream/sdk_update_post_set_output.go.tpl
     exceptions:
       errors:
         404:
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 name: kinesis-chart
 description: A Helm chart for the ACK service controller for Amazon Kinesis (Kinesis)
-version: 1.0.7
-appVersion: 1.0.7
+version: 1.0.6
+appVersion: 1.0.6
 home: https://github.com/aws-controllers-k8s/kinesis-controller
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
 sources:
diff --git a/helm/templates/NOTES.txt b/helm/templates/NOTES.txt
@@ -1,5 +1,5 @@
 {{ .Chart.Name }} has been installed.
-This chart deploys "public.ecr.aws/aws-controllers-k8s/kinesis-controller:1.0.7".
+This chart deploys "public.ecr.aws/aws-controllers-k8s/kinesis-controller:1.0.6".
 
 Check its status by running:
   kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"
diff --git a/helm/values.yaml b/helm/values.yaml
@@ -4,7 +4,7 @@
 
 image:
   repository: public.ecr.aws/aws-controllers-k8s/kinesis-controller
-  tag: 1.0.7
+  tag: 1.0.6
   pullPolicy: IfNotPresent
   pullSecrets: []
 
diff --git a/pkg/resource/stream/sdk.go b/pkg/resource/stream/sdk.go
diff --git a/templates/hooks/stream/sdk_update_post_set_output.go.tpl b/templates/hooks/stream/sdk_update_post_set_output.go.tpl
@@ -0,0 +1,3 @@
+	if resp.TargetShardCount != nil {
+		ko.Status.OpenShardCount = aws.Int64(int64(*resp.TargetShardCount))
+	}
diff --git a/test/e2e/tests/test_stream.py b/test/e2e/tests/test_stream.py
@@ -75,9 +75,12 @@ def test_crud(self):
         k8s.patch_custom_resource(ref, updates)
         time.sleep(MODIFY_WAIT_AFTER_SECONDS)
 
+        cr = k8s.get_resource(ref)
+
         latest = stream.get(stream_name)
         assert latest is not None
         assert int(latest['OpenShardCount']) == int(shard_count)
+        assert int(latest["OpenShardCount"]) == int(cr["status"]["openShardCount"])
 
         k8s.delete_custom_resource(ref)
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+ if resp.TargetShardCount != nil {`
	`2`	`+ ko.Status.OpenShardCount = aws.Int64(int64(*resp.TargetShardCount))`
	`3`	`+ }`