Skip to content

Commit f6ebf76

Browse files
committed
fix(tenantresources): nil pointer for additionalmetadata
Signed-off-by: Hristo Hristov <[email protected]>
1 parent f5c7cff commit f6ebf76

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

controllers/resources/processor.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@ type Processor struct {
3535
client client.Client
3636
}
3737

38+
func prepareAdditionalMetadata(m map[string]string) map[string]string {
39+
if m == nil {
40+
return make(map[string]string)
41+
}
42+
return m
43+
}
44+
3845
func (r *Processor) HandlePruning(ctx context.Context, current, desired sets.Set[string]) (updateStatus bool) {
3946
log := ctrllog.FromContext(ctx)
4047

@@ -118,8 +125,8 @@ func (r *Processor) HandleSection(ctx context.Context, tnt capsulev1beta2.Tenant
118125
objAnnotations, objLabels := map[string]string{}, map[string]string{}
119126

120127
if spec.AdditionalMetadata != nil {
121-
objAnnotations = spec.AdditionalMetadata.Annotations
122-
objLabels = spec.AdditionalMetadata.Labels
128+
objAnnotations = prepareAdditionalMetadata(spec.AdditionalMetadata.Annotations)
129+
objLabels = prepareAdditionalMetadata(spec.AdditionalMetadata.Labels)
123130
}
124131

125132
objAnnotations[tenantLabel] = tnt.GetName()

0 commit comments

Comments
 (0)