Skip to content

Ensure we retieve Cluster KafkaVersion from Read operation #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 8, 2025
Merged

Ensure we retieve Cluster KafkaVersion from Read operation #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions apis/v1alpha1/ack-generate-metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ack_generate_info:
build_date: "2025-03-04T23:55:37Z"
build_hash: a326346bd3a6973254d247c9ab2dc76790c36241
build_date: "2025-03-07T23:22:35Z"
build_hash: 5645e51ed3c413f616e1b929f1527a5139c44198
go_version: go1.24.0
version: v0.43.2
version: v0.43.2-3-g5645e51
api_directory_checksum: 36fbfad1e0bff98a14b120ba292a7f6b4e546fb4
api_version: v1alpha1
aws_sdk_go_version: v1.32.6
Expand Down
21 changes: 14 additions & 7 deletions pkg/resource/cluster/hooks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ func (rm *resourceManager) updateNumberOfBrokerNodes(
_, err = rm.sdkapi.UpdateBrokerCount(ctx, &svcsdk.UpdateBrokerCountInput{
ClusterArn: (*string)(latest.ko.Status.ACKResourceMetadata.ARN),
CurrentVersion: latest.ko.Status.CurrentVersion,
TargetNumberOfBrokerNodes: aws.Int32(int32(*desired.ko.Spec.NumberOfBrokerNodes)),
TargetNumberOfBrokerNodes: int32OrNil(desired.ko.Spec.NumberOfBrokerNodes),
})
rm.metrics.RecordAPICall("UPDATE", "UpdateBrokerCount", err)
if err != nil {
Expand All @@ -207,8 +207,7 @@ func (rm *resourceManager) updateNumberOfBrokerNodes(
return desired, requeueAfterAsyncUpdate()
}


// updateBrokerType updates the broker type of the
// updateBrokerType updates the broker type of the
// kafka cluster
func (rm *resourceManager) updateBrokerType(
ctx context.Context,
Expand Down Expand Up @@ -250,7 +249,7 @@ func (rm *resourceManager) updateBrokerStorage(
TargetBrokerEBSVolumeInfo: []svcsdktypes.BrokerEBSVolumeInfo{
{
KafkaBrokerNodeId: aws.String("ALL"),
VolumeSizeGB: aws.Int32(int32(*desired.ko.Spec.BrokerNodeGroupInfo.StorageInfo.EBSStorageInfo.VolumeSize)),
VolumeSizeGB: int32OrNil(desired.ko.Spec.BrokerNodeGroupInfo.StorageInfo.EBSStorageInfo.VolumeSize),
},
},
})
Expand Down Expand Up @@ -327,7 +326,7 @@ func (rm *resourceManager) updateClientAuthentication(
}
message := "kafka is updating the client authentication"
ackcondition.SetSynced(desired, corev1.ConditionFalse, &message, nil)

return desired, err
}

Expand Down Expand Up @@ -415,7 +414,7 @@ func (rm *resourceManager) getAssociatedScramSecrets(
return res, err
}

// unprocessedSecrets is an error returned by the
// unprocessedSecrets is an error returned by the
// BatchAssociateScramSecret or Disassociate. It represents the
// secretArns that could not be associated and the reason
type unprocessedSecrets struct {
Expand All @@ -429,7 +428,7 @@ type unprocessedSecrets struct {
// errorMessages, and failedSecretArns
func (us unprocessedSecrets) Error() string {
// I don't see a case where the lengths will differ
// getting the minimum just in case, so we can avoid
// getting the minimum just in case, so we can avoid
// an index out of bounds
lenErrs := min(len(us.errorCodes), len(us.errorMessages), len(us.secretArns))
errorMessage := ""
Expand Down Expand Up @@ -606,3 +605,11 @@ func customPreCompare(_ *ackcompare.Delta, a, b *resource) {
a.ko.Spec.StorageMode = aws.String(string(svcsdktypes.StorageModeLocal))
}
}

func int32OrNil(num *int64) *int32 {
if num == nil {
return nil
}

return aws.Int32(int32(*num))
}
3 changes: 3 additions & 0 deletions pkg/resource/cluster/sdk.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions templates/hooks/cluster/sdk_read_one_post_set_output.go.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
if resp.ClusterInfo.CurrentBrokerSoftwareInfo != nil && resp.ClusterInfo.CurrentBrokerSoftwareInfo.KafkaVersion != nil {
ko.Spec.KafkaVersion = resp.ClusterInfo.CurrentBrokerSoftwareInfo.KafkaVersion
}
if resp.ClusterInfo.CurrentVersion != nil {
ko.Status.CurrentVersion = resp.ClusterInfo.CurrentVersion
} else {
Expand Down