public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix golangci-lint issues (#2715) 

Signed-off-by: fahed dorgaa <fahed.dorgaa@gmail.com>
Co-authored-by: fahed dorgaa <fahed.dorgaa.ext@corp.ovh.com>
Co-authored-by: Matthias Adler <macedigital@users.noreply.github.com>
This commit is contained in:
fahed dorgaa 2024-08-14 12:54:44 +02:00 committed by GitHub
parent 25ccc87317
commit aad03f71ea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/apis/acid.zalan.do/v1/postgresql_type.go
View File

@ -133,7 +133,7 @@ type Volume struct {
Size string `json:"size"` Size string `json:"size"`
StorageClass string `json:"storageClass,omitempty"` StorageClass string `json:"storageClass,omitempty"`
SubPath string `json:"subPath,omitempty"` SubPath string `json:"subPath,omitempty"`
IsSubPathExpr *bool `json:"isSubPathExpr,omitemtpy"` IsSubPathExpr *bool `json:"isSubPathExpr,omitempty"`
Iops *int64 `json:"iops,omitempty"` Iops *int64 `json:"iops,omitempty"`
Throughput *int64 `json:"throughput,omitempty"` Throughput *int64 `json:"throughput,omitempty"`
VolumeType string `json:"type,omitempty"` VolumeType string `json:"type,omitempty"`
@ -144,7 +144,7 @@ type AdditionalVolume struct {
Name string `json:"name"` Name string `json:"name"`
MountPath string `json:"mountPath"` MountPath string `json:"mountPath"`
SubPath string `json:"subPath,omitempty"` SubPath string `json:"subPath,omitempty"`
IsSubPathExpr *bool `json:"isSubPathExpr,omitemtpy"` IsSubPathExpr *bool `json:"isSubPathExpr,omitempty"`
TargetContainers []string `json:"targetContainers"` TargetContainers []string `json:"targetContainers"`
VolumeSource v1.VolumeSource `json:"volumeSource"` VolumeSource v1.VolumeSource `json:"volumeSource"`
} }

2
pkg/cluster/cluster.go
View File

@ -668,7 +668,7 @@ func compareEnv(a, b []v1.EnvVar) bool {
if len(a) != len(b) { if len(a) != len(b) {
return false return false
} }
equal := true var equal bool
for _, enva := range a { for _, enva := range a {
hasmatch := false hasmatch := false
for _, envb := range b { for _, envb := range b {

4
pkg/cluster/exec.go
View File

@ -15,7 +15,7 @@ import (
"github.com/zalando/postgres-operator/pkg/util/constants" "github.com/zalando/postgres-operator/pkg/util/constants"
) )
//ExecCommand executes arbitrary command inside the pod // ExecCommand executes arbitrary command inside the pod
func (c *Cluster) ExecCommand(podName *spec.NamespacedName, command ...string) (string, error) { func (c *Cluster) ExecCommand(podName *spec.NamespacedName, command ...string) (string, error) {
c.setProcessName("executing command %q", strings.Join(command, " ")) c.setProcessName("executing command %q", strings.Join(command, " "))
@ -59,7 +59,7 @@ func (c *Cluster) ExecCommand(podName *spec.NamespacedName, command ...string) (
return "", fmt.Errorf("failed to init executor: %v", err) return "", fmt.Errorf("failed to init executor: %v", err)
} }
err = exec.Stream(remotecommand.StreamOptions{ err = exec.StreamWithContext(context.TODO(), remotecommand.StreamOptions{
Stdout: &execOut, Stdout: &execOut,
Stderr: &execErr, Stderr: &execErr,
Tty: false, Tty: false,

5
pkg/cluster/k8sres.go
View File

@ -47,11 +47,6 @@ const (
operatorPort = 8080 operatorPort = 8080
) )
type pgUser struct {
Password string `json:"password"`
Options []string `json:"options"`
}
type patroniDCS struct { type patroniDCS struct {
TTL uint32 `json:"ttl,omitempty"` TTL uint32 `json:"ttl,omitempty"`
LoopWait uint32 `json:"loop_wait,omitempty"` LoopWait uint32 `json:"loop_wait,omitempty"`

4
pkg/cluster/util.go
View File

@ -449,10 +449,6 @@ func (c *Cluster) _waitPodLabelsReady(anyReplica bool) error {
return err return err
} }
func (c *Cluster) waitForAnyReplicaLabelReady() error {
return c._waitPodLabelsReady(true)
}
func (c *Cluster) waitForAllPodsLabelReady() error { func (c *Cluster) waitForAllPodsLabelReady() error {
return c._waitPodLabelsReady(false) return c._waitPodLabelsReady(false)
} }

2
pkg/controller/util.go
View File

@ -80,7 +80,7 @@ func (c *Controller) createOperatorCRD(desiredCrd *apiextv1.CustomResourceDefini
c.logger.Infof("customResourceDefinition %q has been registered", crd.Name) c.logger.Infof("customResourceDefinition %q has been registered", crd.Name)
} }
return wait.Poll(c.config.CRDReadyWaitInterval, c.config.CRDReadyWaitTimeout, func() (bool, error) { return wait.PollUntilContextTimeout(context.TODO(), c.config.CRDReadyWaitInterval, c.config.CRDReadyWaitTimeout, false, func(ctx context.Context) (bool, error) {
c, err := c.KubeClient.CustomResourceDefinitions().Get(context.TODO(), desiredCrd.Name, metav1.GetOptions{}) c, err := c.KubeClient.CustomResourceDefinitions().Get(context.TODO(), desiredCrd.Name, metav1.GetOptions{})
if err != nil { if err != nil {
return false, err return false, err

2
pkg/util/util.go
View File

@ -35,7 +35,7 @@ const (
var passwordChars = []byte("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789") var passwordChars = []byte("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")
func init() { func init() {
rand.Seed(time.Now().Unix()) rand.New(rand.NewSource(time.Now().Unix()))
} }
// helper function to get bool pointers // helper function to get bool pointers