gofmt and lint updates

beagles · beagles · commit ed0d7d13437e · 2025-02-27T12:55:24.000Z
diff --git a/api/v1beta1/common_types.go b/api/v1beta1/common_types.go
@@ -17,8 +17,8 @@ limitations under the License.
 package v1beta1
 
 import (
-	corev1 "k8s.io/api/core/v1"
 	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
+	corev1 "k8s.io/api/core/v1"
 )
 
 const (
diff --git a/api/v1beta1/designate_types.go b/api/v1beta1/designate_types.go
@@ -17,10 +17,10 @@ limitations under the License.
 package v1beta1
 
 import (
+	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/util"
 	"github.com/openstack-k8s-operators/lib-common/modules/storage"
-	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -331,7 +331,6 @@ func SetupDefaults() {
 	SetupDesignateDefaults(designateDefaults)
 }
 
-
 // DesignateExtraVolMounts exposes additional parameters processed by the designate-operator
 // and defines the common VolMounts structure provided by the main storage module
 type DesignateExtraVolMounts struct {
diff --git a/api/v1beta1/designate_webhook.go b/api/v1beta1/designate_webhook.go
@@ -24,9 +24,9 @@ package v1beta1
 import (
 	"fmt"
 
+	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/service"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/validation/field"
@@ -46,7 +46,7 @@ type DesignateDefaults struct {
 	Backendbind9ContainerImageURL string
 	UnboundContainerImageURL      string
 	NetUtilsURL                   string
-	DesignateAPIRouteTimeout         int
+	DesignateAPIRouteTimeout      int
 }
 
 var designateDefaults DesignateDefaults
diff --git a/api/v1beta1/designateapi_types.go b/api/v1beta1/designateapi_types.go
@@ -17,11 +17,11 @@ limitations under the License.
 package v1beta1
 
 import (
+	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/service"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 )
 
 // DesignateAPITemplate defines the input parameters for the Designate API service
diff --git a/api/v1beta1/designatebackendbind9_types.go b/api/v1beta1/designatebackendbind9_types.go
@@ -17,10 +17,10 @@ limitations under the License.
 package v1beta1
 
 import (
+	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/service"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 )
 
 // DesignateBackendbind9SpecCore - this version has no containerImage for use with the OpenStackControlplane
@@ -165,6 +165,7 @@ func (instance *DesignateBackendbind9) GetLastAppliedTopology() *topologyv1.Topo
 func (instance *DesignateBackendbind9) SetLastAppliedTopology(topologyRef *topologyv1.TopoRef) {
 	instance.Status.LastAppliedTopology = topologyRef
 }
+
 // // RbacConditionsSet - set the conditions for the rbac object
 // func (instance DesignateBackendbind9) RbacConditionsSet(c *condition.Condition) {
 // 	instance.Status.Conditions.Set(c)
diff --git a/api/v1beta1/designatecentral_types.go b/api/v1beta1/designatecentral_types.go
@@ -17,10 +17,10 @@ limitations under the License.
 package v1beta1
 
 import (
+	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 )
 
 // DesignateCentralSpecCore - this version has no containerImage for use with the OpenStackControlplane
diff --git a/api/v1beta1/designatemdns_types.go b/api/v1beta1/designatemdns_types.go
@@ -17,11 +17,11 @@ limitations under the License.
 package v1beta1
 
 import (
+	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
+	"github.com/openstack-k8s-operators/lib-common/modules/common/service"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"github.com/openstack-k8s-operators/lib-common/modules/common/service"
-	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 )
 
 // DesignateMdnsSpecCore -
diff --git a/api/v1beta1/designateproducer_types.go b/api/v1beta1/designateproducer_types.go
@@ -17,10 +17,10 @@ limitations under the License.
 package v1beta1
 
 import (
+	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 )
 
 // DesignateProducerSpecCore - this version has no containerImage for use with the OpenStackControlplane
diff --git a/api/v1beta1/designateunbound_types.go b/api/v1beta1/designateunbound_types.go
@@ -17,10 +17,10 @@ limitations under the License.
 package v1beta1
 
 import (
+	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/service"
-	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // DesignateUnboundSpecCore - this version has no containerImage for use with the OpenStackControlplane
diff --git a/api/v1beta1/designateworker_types.go b/api/v1beta1/designateworker_types.go
@@ -17,10 +17,10 @@ limitations under the License.
 package v1beta1
 
 import (
+	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 )
 
 // DesignateWorkerSpecCore - this version has no containerImage for use with the OpenStackControlplane
diff --git a/pkg/designate/generate_bind9_pools_yaml.go b/pkg/designate/generate_bind9_pools_yaml.go
@@ -90,9 +90,9 @@ func GeneratePoolsYamlDataAndHash(BindMap, MdnsMap, NsRecordsMap map[string]stri
 	})
 
 	bindIPs := make([]string, len(BindMap))
-	key_tmpl := "bind_address_%d"
+	keyTmpl := "bind_address_%d"
 	for i := 0; i < len(BindMap); i++ {
-		bindIPs[i] = BindMap[fmt.Sprintf(key_tmpl, i)]
+		bindIPs[i] = BindMap[fmt.Sprintf(keyTmpl, i)]
 	}
 
 	masterHosts := make([]string, 0, len(MdnsMap))

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@ limitations under the License.`
`17`	`17`	`package v1beta1`
`18`	`18`
`19`	`19`	`import (`
`20`		`- corev1 "k8s.io/api/core/v1"`
`21`	`20`	`topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"`
	`21`	`+ corev1 "k8s.io/api/core/v1"`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`const (`