Skip to content

K8SPG-1019 Apply Go 1.26 code improvements using go fix #1585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hors merged 9 commits into from
May 11, 2026
Merged

K8SPG-1019 Apply Go 1.26 code improvements using go fix #1585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5d48239
K8SPG-1019 Apply Go 1.26 code improvements using go fix
gkech May 5, 2026
c58059e
more fixes
gkech May 5, 2026
479abbd
Merge branch 'main' into K8SPG-1019-gofix
gkech May 7, 2026
c70ed39
remove reference for // K8SPG-714 on imports that do not exist anymore
gkech May 7, 2026
fe06cc1
some clenaups
gkech May 7, 2026
1c1d7a0
linting issues fix
gkech May 7, 2026
da816b2
Merge branch 'main' into K8SPG-1019-gofix
gkech May 7, 2026
f606450
Merge branch 'main' into K8SPG-1019-gofix
hors May 11, 2026
8f90261
Merge branch 'main' into K8SPG-1019-gofix
hors May 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions cmd/postgres-operator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ import (
"github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime"
"github.com/percona/percona-postgresql-operator/v2/internal/controller/standalone_pgadmin"
"github.com/percona/percona-postgresql-operator/v2/internal/feature"
"github.com/percona/percona-postgresql-operator/v2/internal/initialize"
"github.com/percona/percona-postgresql-operator/v2/internal/logging"
"github.com/percona/percona-postgresql-operator/v2/internal/naming"
"github.com/percona/percona-postgresql-operator/v2/internal/upgradecheck"
Expand Down Expand Up @@ -289,7 +288,7 @@ func initManager(ctx context.Context) (runtime.Options, error) {
log := logging.FromContext(ctx)

options := runtime.Options{}
options.Cache.SyncPeriod = initialize.Pointer(time.Hour)
options.Cache.SyncPeriod = new(time.Hour)

options.HealthProbeBindAddress = ":8081"

Expand Down
8 changes: 4 additions & 4 deletions internal/bridge/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ type ClusterApiResource struct {
Network string `json:"network_id,omitempty"`
Parent string `json:"parent_id,omitempty"`
Plan string `json:"plan_id,omitempty"`
PostgresVersion intstr.IntOrString `json:"postgres_version_id,omitempty"`
PostgresVersion intstr.IntOrString `json:"postgres_version_id"`
Provider string `json:"provider_id,omitempty"`
Region string `json:"region_id,omitempty"`
Replicas []*ClusterApiResource `json:"replicas,omitempty"`
Expand Down Expand Up @@ -187,7 +187,7 @@ type PostClustersRequestPayload struct {
IsHA bool `json:"is_ha,omitempty"`
Keychain string `json:"keychain_id,omitempty"`
Network string `json:"network_id,omitempty"`
PostgresVersion intstr.IntOrString `json:"postgres_version_id,omitempty"`
PostgresVersion intstr.IntOrString `json:"postgres_version_id"`
Provider string `json:"provider_id,omitempty"`
Region string `json:"region_id,omitempty"`
Storage int64 `json:"storage,omitempty"`
Expand All @@ -197,7 +197,7 @@ type PostClustersRequestPayload struct {
// changing its plan, upgrading its major version, or increasing its storage size.
type PostClustersUpgradeRequestPayload struct {
Plan string `json:"plan_id,omitempty"`
PostgresVersion intstr.IntOrString `json:"postgres_version_id,omitempty"`
PostgresVersion intstr.IntOrString `json:"postgres_version_id"`
UpgradeStartTime string `json:"starting_from,omitempty"`
Storage int64 `json:"storage,omitempty"`
}
Expand All @@ -206,7 +206,7 @@ type PostClustersUpgradeRequestPayload struct {
// TODO: Implement the ability to update an upgrade (this isn't currently being used)
type PutClustersUpgradeRequestPayload struct {
Plan string `json:"plan_id,omitempty"`
PostgresVersion intstr.IntOrString `json:"postgres_version_id,omitempty"`
PostgresVersion intstr.IntOrString `json:"postgres_version_id"`
UpgradeStartTime string `json:"starting_from,omitempty"`
Storage int64 `json:"storage,omitempty"`
UseMaintenanceWindow *bool `json:"use_cluster_maintenance_window,omitempty"`
Expand Down
4 changes: 1 addition & 3 deletions internal/bridge/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ import (
gocmpopts "github.com/google/go-cmp/cmp/cmpopts"
"gotest.tools/v3/assert"
"k8s.io/apimachinery/pkg/util/intstr"

"github.com/percona/percona-postgresql-operator/v2/internal/initialize"
)

var testApiKey = "9012"
Expand Down Expand Up @@ -1155,7 +1153,7 @@ func TestUpdateCluster(t *testing.T) {
ClusterName: "new-cluster-name",
}
clusterUpdateRequestPayload := &PatchClustersRequestPayload{
IsProtected: initialize.Bool(true),
IsProtected: new(true),
}

t.Run("WeSendCorrectData", func(t *testing.T) {
Expand Down
5 changes: 2 additions & 3 deletions internal/bridge/crunchybridgecluster/crunchybridgecluster_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/percona/percona-postgresql-operator/v2/internal/bridge"
"github.com/percona/percona-postgresql-operator/v2/internal/initialize"
"github.com/percona/percona-postgresql-operator/v2/internal/naming"
"github.com/percona/percona-postgresql-operator/v2/internal/testing/cmp"
"github.com/percona/percona-postgresql-operator/v2/internal/testing/require"
Expand Down Expand Up @@ -558,8 +557,8 @@ func TestHandleUpgradeHA(t *testing.T) {
ns := setupNamespace(t, tClient).Name
clusterInBridgeWithHaDisabled := testClusterApiResource()
clusterInBridgeWithHaEnabled := testClusterApiResource()
clusterInBridgeWithHaEnabled.ID = "2345" // originally "1234"
clusterInBridgeWithHaEnabled.IsHA = initialize.Bool(true) // originally "false"
clusterInBridgeWithHaEnabled.ID = "2345" // originally "1234"
clusterInBridgeWithHaEnabled.IsHA = new(true) // originally "false"

reconciler := &CrunchyBridgeClusterReconciler{
Client: tClient,
Expand Down
3 changes: 1 addition & 2 deletions internal/bridge/crunchybridgecluster/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

"github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime"
"github.com/percona/percona-postgresql-operator/v2/internal/initialize"
"github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1"
)

Expand Down Expand Up @@ -49,7 +48,7 @@ func (r *CrunchyBridgeClusterReconciler) handleDelete(
}

if !deletedAlready {
return initialize.Pointer(runtime.RequeueWithoutBackoff(time.Second)), err
return new(runtime.RequeueWithoutBackoff(time.Second)), err
}

// Remove finalizer if deleted already
Expand Down
5 changes: 2 additions & 3 deletions internal/bridge/crunchybridgecluster/helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"sigs.k8s.io/yaml"

"github.com/percona/percona-postgresql-operator/v2/internal/bridge"
"github.com/percona/percona-postgresql-operator/v2/internal/initialize"
"github.com/percona/percona-postgresql-operator/v2/internal/testing/require"
"github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1"
)
Expand Down Expand Up @@ -105,8 +104,8 @@ func testClusterApiResource() *bridge.ClusterApiResource {
cluster := bridge.ClusterApiResource{
ID: "1234",
Host: "example.com",
IsHA: initialize.Bool(false),
IsProtected: initialize.Bool(false),
IsHA: new(false),
IsProtected: new(false),
MajorVersion: 15,
ClusterName: "hippo-cluster",
Plan: "standard-8",
Expand Down
3 changes: 1 addition & 2 deletions internal/bridge/crunchybridgecluster/mock_bridge_api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
"k8s.io/apimachinery/pkg/util/intstr"

"github.com/percona/percona-postgresql-operator/v2/internal/bridge"
"github.com/percona/percona-postgresql-operator/v2/internal/initialize"
"github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1"
)

Expand Down Expand Up @@ -165,7 +164,7 @@ func (tbc *TestBridgeClient) CreateCluster(ctx context.Context, apiKey string,
cluster := &bridge.ClusterApiResource{
ID: fmt.Sprint(len(tbc.Clusters)),
Host: "example.com",
IsHA: initialize.Bool(clusterRequestPayload.IsHA),
IsHA: new(clusterRequestPayload.IsHA),
MajorVersion: clusterRequestPayload.PostgresVersion.IntValue(),
ClusterName: clusterRequestPayload.Name,
Plan: clusterRequestPayload.Plan,
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/pgupgrade/jobs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ func (r *PGUpgradeReconciler) generateUpgradeJob(
job.Spec.Template.Spec.ImagePullSecrets = upgrade.Spec.ImagePullSecrets

// Attempt the upgrade exactly once.
job.Spec.BackoffLimit = initialize.Int32(0)
job.Spec.BackoffLimit = new(int32(0))
job.Spec.Template.Spec.RestartPolicy = corev1.RestartPolicyNever

// When enabled, calculate the number of CPUs for pg_upgrade.
Expand Down Expand Up @@ -335,7 +335,7 @@ func (r *PGUpgradeReconciler) generateRemoveDataJob(
job.Spec.Template.Spec.ImagePullSecrets = upgrade.Spec.ImagePullSecrets

// Attempt the removal exactly once.
job.Spec.BackoffLimit = initialize.Int32(0)
job.Spec.BackoffLimit = new(int32(0))
job.Spec.Template.Spec.RestartPolicy = corev1.RestartPolicyNever

// Replace all containers with one that removes the data.
Expand Down
5 changes: 2 additions & 3 deletions internal/controller/pgupgrade/jobs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
"sigs.k8s.io/yaml"

"github.com/percona/percona-postgresql-operator/v2/internal/feature"
"github.com/percona/percona-postgresql-operator/v2/internal/initialize"
"github.com/percona/percona-postgresql-operator/v2/internal/testing/cmp"
"github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1"
)
Expand Down Expand Up @@ -103,7 +102,7 @@ func TestGenerateUpgradeJob(t *testing.T) {
upgrade.Namespace = "ns1"
upgrade.Name = "pgu2"
upgrade.UID = "uid3"
upgrade.Spec.Image = initialize.Pointer("img4")
upgrade.Spec.Image = new("img4")
upgrade.Spec.PostgresClusterName = "pg5"
upgrade.Spec.FromPostgresVersion = 19
upgrade.Spec.ToPostgresVersion = 25
Expand Down Expand Up @@ -265,7 +264,7 @@ func TestGenerateRemoveDataJob(t *testing.T) {
upgrade.Namespace = "ns1"
upgrade.Name = "pgu2"
upgrade.UID = "uid3"
upgrade.Spec.Image = initialize.Pointer("img4")
upgrade.Spec.Image = new("img4")
upgrade.Spec.PostgresClusterName = "pg5"
upgrade.Spec.FromPostgresVersion = 19
upgrade.Spec.ToPostgresVersion = 25
Expand Down
5 changes: 2 additions & 3 deletions internal/controller/pgupgrade/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

"github.com/percona/percona-postgresql-operator/v2/internal/initialize"
"github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1"
)

Expand All @@ -39,8 +38,8 @@ func (r *PGUpgradeReconciler) setControllerReference(
Kind: "PGUpgrade",
Name: owner.GetName(),
UID: owner.GetUID(),
BlockOwnerDeletion: initialize.Pointer(true),
Controller: initialize.Pointer(true),
BlockOwnerDeletion: new(true),
Controller: new(true),
},
))
}
Expand Down
9 changes: 4 additions & 5 deletions internal/controller/pgupgrade/world_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime"
"github.com/percona/percona-postgresql-operator/v2/internal/initialize"
"github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1"
)

Expand Down Expand Up @@ -102,7 +101,7 @@ func TestPopulateShutdown(t *testing.T) {

t.Run("NotShutdown", func(t *testing.T) {
cluster := v1beta1.NewPostgresCluster()
cluster.Spec.Shutdown = initialize.Bool(false)
cluster.Spec.Shutdown = new(false)

world := NewWorld()
world.Cluster = cluster
Expand All @@ -114,7 +113,7 @@ func TestPopulateShutdown(t *testing.T) {
t.Run("OldStatus", func(t *testing.T) {
cluster := v1beta1.NewPostgresCluster()
cluster.SetGeneration(99)
cluster.Spec.Shutdown = initialize.Bool(true)
cluster.Spec.Shutdown = new(true)
cluster.Status.ObservedGeneration = 21

world := NewWorld()
Expand All @@ -127,7 +126,7 @@ func TestPopulateShutdown(t *testing.T) {
t.Run("InstancesRunning", func(t *testing.T) {
cluster := v1beta1.NewPostgresCluster()
cluster.SetGeneration(99)
cluster.Spec.Shutdown = initialize.Bool(true)
cluster.Spec.Shutdown = new(true)
cluster.Status.ObservedGeneration = 99
cluster.Status.InstanceSets = []v1beta1.PostgresInstanceSetStatus{{Replicas: 2}}

Expand All @@ -141,7 +140,7 @@ func TestPopulateShutdown(t *testing.T) {
t.Run("InstancesStopped", func(t *testing.T) {
cluster := v1beta1.NewPostgresCluster()
cluster.SetGeneration(99)
cluster.Spec.Shutdown = initialize.Bool(true)
cluster.Spec.Shutdown = new(true)
cluster.Status.ObservedGeneration = 99
cluster.Status.InstanceSets = []v1beta1.PostgresInstanceSetStatus{{Replicas: 0}}

Expand Down
21 changes: 10 additions & 11 deletions internal/controller/postgrescluster/cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"

"github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime"
"github.com/percona/percona-postgresql-operator/v2/internal/initialize"
"github.com/percona/percona-postgresql-operator/v2/internal/naming"
"github.com/percona/percona-postgresql-operator/v2/internal/testing/cmp"
"github.com/percona/percona-postgresql-operator/v2/internal/testing/require"
Expand Down Expand Up @@ -143,14 +142,14 @@ func TestCustomLabels(t *testing.T) {
InitContainer: &v1beta1.InitContainerSpec{
Image: "some-image",
},
Replicas: initialize.Int32(1),
Replicas: new(int32(1)),
DataVolumeClaimSpec: testVolumeClaimSpec(),
}, {
Name: "daisy-instance2",
InitContainer: &v1beta1.InitContainerSpec{
Image: "some-image",
},
Replicas: initialize.Int32(1),
Replicas: new(int32(1)),
DataVolumeClaimSpec: testVolumeClaimSpec(),
}}
cluster.Spec.Metadata = &v1beta1.Metadata{
Expand Down Expand Up @@ -197,7 +196,7 @@ func TestCustomLabels(t *testing.T) {
InitContainer: &v1beta1.InitContainerSpec{
Image: "some-image",
},
Replicas: initialize.Int32(1),
Replicas: new(int32(1)),
DataVolumeClaimSpec: testVolumeClaimSpec(),
Metadata: &v1beta1.Metadata{
Labels: map[string]string{"my.instance.label": "max"},
Expand All @@ -207,7 +206,7 @@ func TestCustomLabels(t *testing.T) {
InitContainer: &v1beta1.InitContainerSpec{
Image: "some-image",
},
Replicas: initialize.Int32(1),
Replicas: new(int32(1)),
DataVolumeClaimSpec: testVolumeClaimSpec(),
Metadata: &v1beta1.Metadata{
Labels: map[string]string{"my.instance.label": "lucy"},
Expand Down Expand Up @@ -393,14 +392,14 @@ func TestCustomAnnotations(t *testing.T) {
InitContainer: &v1beta1.InitContainerSpec{
Image: "some-image",
},
Replicas: initialize.Int32(1),
Replicas: new(int32(1)),
DataVolumeClaimSpec: testVolumeClaimSpec(),
}, {
Name: "daisy-instance2",
InitContainer: &v1beta1.InitContainerSpec{
Image: "some-image",
},
Replicas: initialize.Int32(1),
Replicas: new(int32(1)),
DataVolumeClaimSpec: testVolumeClaimSpec(),
}}
cluster.Spec.Metadata = &v1beta1.Metadata{
Expand Down Expand Up @@ -448,7 +447,7 @@ func TestCustomAnnotations(t *testing.T) {
InitContainer: &v1beta1.InitContainerSpec{
Image: "some-image",
},
Replicas: initialize.Int32(1),
Replicas: new(int32(1)),
DataVolumeClaimSpec: testVolumeClaimSpec(),
Metadata: &v1beta1.Metadata{
Annotations: map[string]string{"my.instance.annotation": "max"},
Expand All @@ -458,7 +457,7 @@ func TestCustomAnnotations(t *testing.T) {
InitContainer: &v1beta1.InitContainerSpec{
Image: "some-image",
},
Replicas: initialize.Int32(1),
Replicas: new(int32(1)),
DataVolumeClaimSpec: testVolumeClaimSpec(),
Metadata: &v1beta1.Metadata{
Annotations: map[string]string{"my.instance.annotation": "lucy"},
Expand Down Expand Up @@ -584,7 +583,7 @@ func TestGenerateClusterPrimaryService(t *testing.T) {
cluster := &v1beta1.PostgresCluster{}
cluster.Namespace = "ns2"
cluster.Name = "pg5"
cluster.Spec.Port = initialize.Int32(2600)
cluster.Spec.Port = new(int32(2600))

// K8SPG-430
cluster.Labels = map[string]string{
Expand Down Expand Up @@ -719,7 +718,7 @@ func TestGenerateClusterReplicaServiceIntent(t *testing.T) {
cluster := &v1beta1.PostgresCluster{}
cluster.Namespace = "ns1"
cluster.Name = "pg2"
cluster.Spec.Port = initialize.Int32(9876)
cluster.Spec.Port = new(int32(9876))

// K8SPG-430
cluster.Labels = map[string]string{
Expand Down
6 changes: 3 additions & 3 deletions internal/controller/postgrescluster/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ spec:
MatchFields(IgnoreExtras, Fields{
"Manager": Equal(string(test.Reconciler.Owner)),
"FieldsV1": PointTo(MatchAllFields(Fields{
"Raw": WithTransform(func(in []byte) (out map[string]interface{}) {
"Raw": WithTransform(func(in []byte) (out map[string]any) {
Expect(yaml.Unmarshal(in, &out)).To(Succeed())
return out
}, MatchAllKeys(Keys{
Expand All @@ -376,7 +376,7 @@ spec:
MatchFields(IgnoreExtras, Fields{
"Manager": Equal(string(test.Reconciler.Owner)),
"FieldsV1": PointTo(MatchAllFields(Fields{
"Raw": WithTransform(func(in []byte) (out map[string]interface{}) {
"Raw": WithTransform(func(in []byte) (out map[string]any) {
Expect(yaml.Unmarshal(in, &out)).To(Succeed())
return out
}, MatchAllKeys(Keys{
Expand All @@ -389,7 +389,7 @@ spec:
MatchFields(IgnoreExtras, Fields{
"Manager": Equal(string(test.Reconciler.Owner)),
"FieldsV1": PointTo(MatchAllFields(Fields{
"Raw": WithTransform(func(in []byte) (out map[string]interface{}) {
"Raw": WithTransform(func(in []byte) (out map[string]any) {
Expect(yaml.Unmarshal(in, &out)).To(Succeed())
return out
}, MatchAllKeys(Keys{
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/postgrescluster/helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"sigs.k8s.io/yaml"

"github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime"
"github.com/percona/percona-postgresql-operator/v2/internal/initialize"

@github-actions github-actions Bot May 5, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[goimports-reviser] reported by reviewdog 🐶

Suggested change

"github.com/percona/percona-postgresql-operator/v2/internal/naming"
"github.com/percona/percona-postgresql-operator/v2/internal/testing/require"
"github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1"
Expand Down Expand Up @@ -120,7 +120,7 @@ func testCluster() *v1beta1.PostgresCluster {
InitContainer: &v1beta1.InitContainerSpec{
Image: "some-image",
},
Replicas: initialize.Int32(1),
Replicas: new(int32(1)),
DataVolumeClaimSpec: testVolumeClaimSpec(),
}},
Backups: v1beta1.Backups{
Expand Down
Loading
Loading