Skip to content

Commit 0ebbbe1

Browse files
committed
Define the falcosidekick image in all output config cases
1 parent 1f9eaf7 commit 0ebbbe1

1 file changed

Lines changed: 20 additions & 11 deletions

File tree

pkg/values/falcovalues.go

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -183,30 +183,39 @@ func (c *ConfigBuilder) BuildFalcoValues(ctx context.Context, log logr.Logger, c
183183
}
184184
}
185185

186-
falcosidekickConfig := make(map[string]interface{})
187-
falcosidekickConfig["enabled"] = false
186+
falcoSidekickVersion, err := c.getDefaultFalcosidekickVersion()
187+
if err != nil {
188+
return nil, err
189+
}
190+
191+
falcosidekickImage, err := c.getImageForVersion("falcosidekick", falcoSidekickVersion)
192+
if err != nil {
193+
return nil, err
194+
}
195+
196+
falcosidekickConfig := map[string]any{
197+
"image": map[string]string{
198+
"image": falcosidekickImage,
199+
},
200+
"enabled": false,
201+
}
188202

189203
var falcosidekickCerts map[string]string
190204
if len(falcoOutputConfigs) > 0 {
191205
cas, certs, err := c.getFalcoCertificates(ctx, log, cluster, namespace)
192206
if err != nil {
193207
return nil, err
194208
}
209+
195210
customFields := map[string]string{
196211
"cluster_id": *cluster.Shoot.Status.ClusterIdentity,
197212
}
198-
falcoSidekickVersion, err := c.getDefaultFalcosidekickVersion()
199-
if err != nil {
200-
return nil, err
201-
}
202-
falcosidekickImage, err := c.getImageForVersion("falcosidekick", falcoSidekickVersion)
203-
if err != nil {
204-
return nil, err
205-
}
213+
206214
falcosidekickConfig = c.generateSidekickDefaultValues(falcosidekickImage, cas, certs, customFields)
207215
for _, outputConfig := range falcoOutputConfigs {
208-
falcosidekickConfig["config"].(map[string]interface{})[outputConfig.key] = outputConfig.value
216+
falcosidekickConfig["config"].(map[string]any)[outputConfig.key] = outputConfig.value
209217
}
218+
210219
falcosidekickCerts = map[string]string{
211220
"server_ca_crt": string(secrets.EncodeCertificate(cas.ServerCaCert)),
212221
"client_ca_crt": string(secrets.EncodeCertificate(cas.ClientCaCert)),

0 commit comments

Comments
 (0)