Merge pull request #792 from slagle/fix-lint

Fixes lint errors raised by golint and golangci-lint
openstack-k8s-operators · Mar 27, 2024 · c6b6ab0 · c6b6ab0
2 parents f6bc8fe + 4a65e65
commit c6b6ab0
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/controllers/openstackdataplanenodeset_controller.go b/controllers/openstackdataplanenodeset_controller.go
@@ -73,11 +73,11 @@ const (
 	OvnControllerAgentDefaultImage = "quay.io/podified-antelope-centos9/openstack-ovn-controller:current-podified"
 	// OvnBgpAgentDefaultImage -
 	OvnBgpAgentDefaultImage = "quay.io/podified-antelope-centos9/openstack-ovn-bgp-agent:current-podified"
-	// TelemetryCeilometerComputeDefaultImage
+	// TelemetryCeilometerComputeDefaultImage -
 	TelemetryCeilometerComputeDefaultImage = "quay.io/podified-antelope-centos9/openstack-ceilometer-compute:current-podified"
-	// TelemetryCeilometerIpmiDefaultImage
+	// TelemetryCeilometerIpmiDefaultImage -
 	TelemetryCeilometerIpmiDefaultImage = "quay.io/podified-antelope-centos9/openstack-ceilometer-ipmi:current-podified"
-	// NodeExporterDefaultImage -
+	// TelemetryNodeExporterDefaultImage -
 	TelemetryNodeExporterDefaultImage = "quay.io/prometheus/node-exporter:v1.5.0"
 )
 

diff --git a/pkg/deployment/service.go b/pkg/deployment/service.go
@@ -160,7 +160,7 @@ func EnsureServices(ctx context.Context, helper *helper.Helper, instance *datapl
 	return nil
 }
 
-// Check that global services are defined only once in all nodesets, report and fail if there are duplicates
+// CheckGlobalServiceExecutionConsistency - Check that global services are defined only once in all nodesets, report and fail if there are duplicates
 func CheckGlobalServiceExecutionConsistency(ctx context.Context, helper *helper.Helper, nodesets []dataplanev1.OpenStackDataPlaneNodeSet) error {
 	var globalServices []string
 	var allServices []string

diff --git a/pkg/util/const.go b/pkg/util/const.go
@@ -19,5 +19,6 @@ package util
 const (
 	// AnsibleExecutionServiceNameLen max length for the ansibleEE service name prefix
 	AnsibleExecutionServiceNameLen = 53
-	AnsibleExcecutionNameLabelLen  = 63
+	// AnsibleExcecutionNameLabelLen max length for the ansibleEE execution name
+	AnsibleExcecutionNameLabelLen = 63
 )
diff --git a/tests/functional/openstackdataplanenodeset_controller_test.go b/tests/functional/openstackdataplanenodeset_controller_test.go
@@ -1044,15 +1044,15 @@ var _ = Describe("Dataplane NodeSet Test", func() {
 		})
 
 		It("Should change the ConfigHash", func() {
-			Eventually(func(g Gomega) error {
+			Eventually(func(_ Gomega) error {
 				instance := GetDataplaneNodeSet(dataplaneNodeSetName)
 				dataplaneConfigHash = instance.Status.ConfigHash
 				instance.Spec.NodeTemplate.Ansible.AnsibleVars = map[string]json.RawMessage{
 					"edpm_network_config_hide_sensitive_logs": json.RawMessage([]byte(`"true"`)),
 				}
 				return th.K8sClient.Update(th.Ctx, instance)
 			}).Should(Succeed())
-			Eventually(func(g Gomega) bool {
+			Eventually(func(_ Gomega) bool {
 				updatedInstance := GetDataplaneNodeSet(dataplaneNodeSetName)
 				return dataplaneConfigHash != updatedInstance.Status.ConfigHash
 			}).Should(BeTrue())

diff --git a/tests/functional/openstackdataplanenodeset_webhook_test.go b/tests/functional/openstackdataplanenodeset_webhook_test.go
@@ -45,7 +45,7 @@ var _ = Describe("DataplaneNodeSet Webhook", func() {
 		})
 
 		It("Should block changes to the BmhLabelSelector object in baremetalSetTemplate spec", func() {
-			Eventually(func(g Gomega) string {
+			Eventually(func(_ Gomega) string {
 				instance := GetDataplaneNodeSet(dataplaneNodeSetName)
 				instance.Spec.BaremetalSetTemplate = baremetalv1.OpenStackBaremetalSetSpec{
 					CloudUserName: "new-user",
@@ -77,7 +77,7 @@ var _ = Describe("DataplaneNodeSet Webhook", func() {
 			DeferCleanup(th.DeleteInstance, CreateDataplaneNodeSet(dataplaneNodeSetName, nodeSetSpec))
 		})
 		It("Should allow changes to the CloudUserName", func() {
-			Eventually(func(g Gomega) error {
+			Eventually(func(_ Gomega) error {
 				instance := GetDataplaneNodeSet(dataplaneNodeSetName)
 				instance.Spec.BaremetalSetTemplate = baremetalv1.OpenStackBaremetalSetSpec{
 					CloudUserName: "new-user",
@@ -137,7 +137,7 @@ var _ = Describe("DataplaneNodeSet Webhook", func() {
 		})
 
 		It("Should block duplicate node declaration", func() {
-			Eventually(func(g Gomega) string {
+			Eventually(func(_ Gomega) string {
 				newNodeSetSpec := DefaultDataPlaneNoNodeSetSpec(false)
 				newNodeSetSpec["preProvisioned"] = true
 				newNodeSetSpec["nodes"] = map[string]interface{}{
@@ -153,7 +153,7 @@ var _ = Describe("DataplaneNodeSet Webhook", func() {
 		})
 
 		It("Should block NodeSets if they contain a duplicate ansibleHost", func() {
-			Eventually(func(g Gomega) string {
+			Eventually(func(_ Gomega) string {
 				newNodeSetSpec := DefaultDataPlaneNoNodeSetSpec(false)
 				newNodeSetSpec["preProvisioned"] = true
 				newNodeSetSpec["nodes"] = map[string]interface{}{