Skip to content

Commit 59686ce

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

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

controllers/core/flagd/resources/deployment.go

+2-8
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ func (r *FlagdDeployment) GetResource(ctx context.Context, flagd *api.Flagd) (cl
7777
},
7878
Template: corev1.PodTemplateSpec{
7979
ObjectMeta: metav1.ObjectMeta{
80-
Labels: labels,
80+
Labels: labels,
81+
Annotations: annotations,
8182
},
8283
Spec: corev1.PodSpec{
8384
ServiceAccountName: flagd.Spec.ServiceAccountName,
@@ -110,14 +111,7 @@ func (r *FlagdDeployment) GetResource(ctx context.Context, flagd *api.Flagd) (cl
110111

111112
// override settings for the injected container for flagd standalone deployment mode
112113
deployment.Spec.Template.Spec.ImagePullSecrets = imagePullSecrets
113-
if len(r.FlagdConfig.Labels) > 0 {
114-
maps.Copy(deployment.Spec.Template.ObjectMeta.Labels, r.FlagdConfig.Labels)
115-
}
116-
if len(r.FlagdConfig.Annotations) > 0 {
117-
maps.Copy(deployment.Spec.Template.ObjectMeta.Annotations, r.FlagdConfig.Annotations)
118-
}
119114
deployment.Spec.Template.Spec.Containers[0].Image = fmt.Sprintf("%s:%s", r.FlagdConfig.Image, r.FlagdConfig.Tag)
120-
121115
deployment.Spec.Template.Spec.Containers[0].Ports = []corev1.ContainerPort{
122116
{
123117
Name: "management",

0 commit comments

Comments
 (0)