Skip to content

Commit

Permalink
configurer-append: Add mergo.WithAppendSlice for VaultConfigurerPodS…
Browse files Browse the repository at this point in the history
…pec to be able to set container spec

Signed-off-by: Mike Luttikhuis <mike.luttikhuis@twint.ch>
  • Loading branch information
Mike Luttikhuis committed Jun 26, 2024
1 parent a31ef05 commit e66d883
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/controller/vault/vault_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -948,7 +948,7 @@ func deploymentForConfigurer(v *vaultv1alpha1.Vault, configmaps corev1.ConfigMap
// merge provided VaultConfigurerPodSpec into the PodSpec defined above
// the values in VaultConfigurerPodSpec will never overwrite fields defined in the PodSpec above
if v.Spec.VaultConfigurerPodSpec != nil {
if err := mergo.Merge(&podSpec, corev1.PodSpec(*v.Spec.VaultConfigurerPodSpec)); err != nil {
if err := mergo.Merge(&podSpec, corev1.PodSpec(*v.Spec.VaultConfigurerPodSpec), mergo.WithAppendSlice); err != nil {
return nil, err
}
}
Expand Down

0 comments on commit e66d883

Please sign in to comment.