Skip to content

Commit 952e628

Browse files
committed
fix: handle nil maps in flagd-standalone
Signed-off-by: Todd Baert <todd.baert@dynatrace.com>
1 parent c6ccfc1 commit 952e628

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

controllers/core/flagd/resources/deployment.go

+6
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,15 @@ func (r *FlagdDeployment) GetResource(ctx context.Context, flagd *api.Flagd) (cl
111111
// override settings for the injected container for flagd standalone deployment mode
112112
deployment.Spec.Template.Spec.ImagePullSecrets = imagePullSecrets
113113
if len(r.FlagdConfig.Labels) > 0 {
114+
if deployment.Spec.Template.ObjectMeta.Labels == nil {
115+
deployment.Spec.Template.ObjectMeta.Labels = map[string]string{}
116+
}
114117
maps.Copy(deployment.Spec.Template.ObjectMeta.Labels, r.FlagdConfig.Labels)
115118
}
116119
if len(r.FlagdConfig.Annotations) > 0 {
120+
if deployment.Spec.Template.ObjectMeta.Annotations == nil {
121+
deployment.Spec.Template.ObjectMeta.Annotations = map[string]string{}
122+
}
117123
maps.Copy(deployment.Spec.Template.ObjectMeta.Annotations, r.FlagdConfig.Annotations)
118124
}
119125
deployment.Spec.Template.Spec.Containers[0].Image = fmt.Sprintf("%s:%s", r.FlagdConfig.Image, r.FlagdConfig.Tag)

0 commit comments

Comments
 (0)