fluxcd
/
kustomize-controller
mirror of https://github.com/fluxcd/kustomize-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

misc: address theoretical nil pointer dereference 

Signed-off-by: Hidde Beydals <hidde@hhh.computer>
This commit is contained in:
Hidde Beydals 2023-10-09 15:26:30 +02:00
parent 2009190603
commit 77cf93394c
No known key found for this signature in database
GPG Key ID: 979F380FC2341744
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/controller/kustomization_controller.go
View File

@ -747,9 +747,10 @@ func (r *KustomizationReconciler) apply(ctx context.Context,
if err != nil {
return false, nil, err
}
resultSet.Append(changeSet.Entries)
if changeSet != nil && len(changeSet.Entries) > 0 {
resultSet.Append(changeSet.Entries)
log.Info("server-side apply for cluster definitions completed", "output", changeSet.ToMap())
for _, change := range changeSet.Entries {
if HasChanged(change.Action) {
@ -772,9 +773,10 @@ func (r *KustomizationReconciler) apply(ctx context.Context,
if err != nil {
return false, nil, err
}
resultSet.Append(changeSet.Entries)
if changeSet != nil && len(changeSet.Entries) > 0 {
resultSet.Append(changeSet.Entries)
log.Info("server-side apply for cluster class types completed", "output", changeSet.ToMap())
for _, change := range changeSet.Entries {
if HasChanged(change.Action) {
@ -798,9 +800,10 @@ func (r *KustomizationReconciler) apply(ctx context.Context,
if err != nil {
return false, nil, fmt.Errorf("%w\n%s", err, changeSetLog.String())
}
resultSet.Append(changeSet.Entries)
if changeSet != nil && len(changeSet.Entries) > 0 {
resultSet.Append(changeSet.Entries)
log.Info("server-side apply completed", "output", changeSet.ToMap(), "revision", revision)
for _, change := range changeSet.Entries {
if HasChanged(change.Action) {