Skip to content

Commit 951a20c

Browse files
committed
fix golangci-lint
1 parent c5bbf87 commit 951a20c

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

pkg/apis/psmdb/v1/psmdb_defaults.go

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -833,7 +833,10 @@ func (nv *NonVotingSpec) SetDefaults(cr *PerconaServerMongoDB, rs *ReplsetSpec)
833833
nv.ServiceAccountName = WorkloadSA
834834
}
835835

836-
nv.MultiAZ.reconcileOpts(cr)
836+
//nolint:staticcheck
837+
if err := nv.MultiAZ.reconcileOpts(cr); err != nil {
838+
return errors.Wrapf(err, "reconcile multiAZ options for replset %s nonVoting", rs.Name)
839+
}
837840

838841
if nv.ContainerSecurityContext == nil {
839842
nv.ContainerSecurityContext = rs.ContainerSecurityContext
@@ -869,22 +872,22 @@ func (h *HiddenSpec) setLivenessProbe(cr *PerconaServerMongoDB, rs *ReplsetSpec)
869872
if h.LivenessProbe.StartupDelaySeconds < 1 {
870873
h.LivenessProbe.StartupDelaySeconds = rs.LivenessProbe.StartupDelaySeconds
871874
}
872-
if h.LivenessProbe.ProbeHandler.Exec == nil {
873-
h.LivenessProbe.Probe.ProbeHandler.Exec = &corev1.ExecAction{
875+
if h.LivenessProbe.Exec == nil {
876+
h.LivenessProbe.Exec = &corev1.ExecAction{
874877
Command: []string{"/opt/percona/mongodb-healthcheck", "k8s", "liveness"},
875878
}
876879

877880
if cr.TLSEnabled() {
878-
h.LivenessProbe.Probe.ProbeHandler.Exec.Command = append(
879-
h.LivenessProbe.Probe.ProbeHandler.Exec.Command,
881+
h.LivenessProbe.Exec.Command = append(
882+
h.LivenessProbe.Exec.Command,
880883
"--ssl", "--sslInsecure", "--sslCAFile", "/etc/mongodb-ssl/ca.crt", "--sslPEMKeyFile", "/tmp/tls.pem",
881884
)
882885
}
883886
}
884887
startupDelaySecondsFlag := "--startupDelaySeconds"
885888
if !h.LivenessProbe.CommandHas(startupDelaySecondsFlag) {
886-
h.LivenessProbe.ProbeHandler.Exec.Command = append(
887-
h.LivenessProbe.ProbeHandler.Exec.Command,
889+
h.LivenessProbe.Exec.Command = append(
890+
h.LivenessProbe.Exec.Command,
888891
startupDelaySecondsFlag, strconv.Itoa(h.LivenessProbe.StartupDelaySeconds))
889892
}
890893
}
@@ -937,7 +940,10 @@ func (h *HiddenSpec) SetDefaults(cr *PerconaServerMongoDB, rs *ReplsetSpec) erro
937940
h.ServiceAccountName = WorkloadSA
938941
}
939942

940-
h.MultiAZ.reconcileOpts(cr)
943+
//nolint:staticcheck
944+
if err := h.MultiAZ.reconcileOpts(cr); err != nil {
945+
return errors.Wrapf(err, "reconcile multiAZ options for replset %s-hidden", rs.Name)
946+
}
941947

942948
if h.ContainerSecurityContext == nil {
943949
h.ContainerSecurityContext = rs.ContainerSecurityContext

0 commit comments

Comments
 (0)