diff --git a/pkg/controller/perconaservermongodbrestore/physical.go b/pkg/controller/perconaservermongodbrestore/physical.go index 6f522f907..197d3ee01 100644 --- a/pkg/controller/perconaservermongodbrestore/physical.go +++ b/pkg/controller/perconaservermongodbrestore/physical.go @@ -460,9 +460,11 @@ func (r *ReconcilePerconaServerMongoDBRestore) updateStatefulSetForPhysicalResto } if cluster.CompareVersion("1.19.0") < 0 { for i, v := range pbmEnvVars { - pbmEnvVars[i].ValueFrom.SecretKeyRef.Key = strings.TrimSuffix(v.ValueFrom.SecretKeyRef.Key, "_ESCAPED") - pbmEnvVars[i].ValueFrom.SecretKeyRef.LocalObjectReference.Name = cluster.Spec.Secrets.Users - pbmEnvVars[i].ValueFrom.SecretKeyRef.Optional = nil + if v.ValueFrom != nil && v.ValueFrom.SecretKeyRef != nil { + pbmEnvVars[i].ValueFrom.SecretKeyRef.Key = strings.TrimSuffix(v.ValueFrom.SecretKeyRef.Key, "_ESCAPED") + pbmEnvVars[i].ValueFrom.SecretKeyRef.LocalObjectReference.Name = cluster.Spec.Secrets.Users + pbmEnvVars[i].ValueFrom.SecretKeyRef.Optional = nil + } } } sts.Spec.Template.Spec.Containers[0].Env = append(sts.Spec.Template.Spec.Containers[0].Env, pbmEnvVars...) @@ -819,6 +821,10 @@ func (r *ReconcilePerconaServerMongoDBRestore) updatePBMConfigSecret( } pbmConfig.PITR.Enabled = false + // pbm-config default options 'oplogSpanMin' not support + if cluster.CompareVersion("1.20.0") < 0 { + pbmConfig.Backup = nil + } confBytes, err := yaml.Marshal(pbmConfig) if err != nil {