fixup! refactor: Rebase against main

jimmidyson · jimmidyson · commit 204e2b69a436 · 2024-05-08T16:48:17.000+01:00
diff --git a/api/go.mod b/api/go.mod
@@ -15,6 +15,7 @@ require (
 	github.com/nutanix-cloud-native/prism-go-client v0.4.0
 	github.com/onsi/gomega v1.33.1
 	k8s.io/api v0.29.3
+	k8s.io/apiextensions-apiserver v0.29.3
 	k8s.io/apimachinery v0.29.3
 	k8s.io/utils v0.0.0-20231127182322-b307cd553661
 	sigs.k8s.io/cluster-api v1.7.1
@@ -69,7 +70,6 @@ require (
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiextensions-apiserver v0.29.3 // indirect
 	k8s.io/client-go v0.29.3 // indirect
 	k8s.io/component-base v0.29.3 // indirect
 	k8s.io/klog/v2 v2.120.1 // indirect
diff --git a/api/v1alpha1/crds/caren.nutanix.com_awsclusterconfigs.yaml b/api/v1alpha1/crds/caren.nutanix.com_awsclusterconfigs.yaml
@@ -1,4 +1,4 @@
-# Copyright 2023 Nutanix. All rights reserved.
+# Copyright 2024 Nutanix. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 ---
 apiVersion: apiextensions.k8s.io/v1
diff --git a/api/v1alpha1/crds/caren.nutanix.com_awsworkernodeconfigs.yaml b/api/v1alpha1/crds/caren.nutanix.com_awsworkernodeconfigs.yaml
@@ -1,4 +1,4 @@
-# Copyright 2023 Nutanix. All rights reserved.
+# Copyright 2024 Nutanix. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 ---
 apiVersion: apiextensions.k8s.io/v1
diff --git a/api/v1alpha1/crds/caren.nutanix.com_dockerclusterconfigs.yaml b/api/v1alpha1/crds/caren.nutanix.com_dockerclusterconfigs.yaml
@@ -1,4 +1,4 @@
-# Copyright 2023 Nutanix. All rights reserved.
+# Copyright 2024 Nutanix. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 ---
 apiVersion: apiextensions.k8s.io/v1
diff --git a/api/v1alpha1/crds/caren.nutanix.com_dockernodeconfigs.yaml b/api/v1alpha1/crds/caren.nutanix.com_dockernodeconfigs.yaml
@@ -1,4 +1,4 @@
-# Copyright 2023 Nutanix. All rights reserved.
+# Copyright 2024 Nutanix. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 ---
 apiVersion: apiextensions.k8s.io/v1
diff --git a/api/v1alpha1/crds/caren.nutanix.com_nutanixclusterconfigs.yaml b/api/v1alpha1/crds/caren.nutanix.com_nutanixclusterconfigs.yaml
@@ -1,4 +1,4 @@
-# Copyright 2023 Nutanix. All rights reserved.
+# Copyright 2024 Nutanix. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 ---
 apiVersion: apiextensions.k8s.io/v1
diff --git a/api/v1alpha1/crds/caren.nutanix.com_nutanixnodeconfigs.yaml b/api/v1alpha1/crds/caren.nutanix.com_nutanixnodeconfigs.yaml
@@ -1,4 +1,4 @@
-# Copyright 2023 Nutanix. All rights reserved.
+# Copyright 2024 Nutanix. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 ---
 apiVersion: apiextensions.k8s.io/v1
diff --git a/api/v1alpha1/http_proxy.go b/api/v1alpha1/http_proxy.go
@@ -1,4 +1,4 @@
-// Copyright 2023 D2iQ, Inc. All rights reserved.
+// Copyright 2023 Nutanix. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 package v1alpha1
diff --git a/api/v1alpha1/http_proxy_test.go b/api/v1alpha1/http_proxy_test.go
@@ -1,4 +1,4 @@
-// Copyright 2023 D2iQ, Inc. All rights reserved.
+// Copyright 2023 Nutanix. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 package v1alpha1_test
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.27.1-configmap.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.27.1-configmap.yaml
@@ -1,4 +1,4 @@
-# Copyright 2023 Nutanix. All rights reserved.
+# Copyright 2024 Nutanix. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
 #=================================================================
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.28.1-configmap.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.28.1-configmap.yaml
@@ -1,4 +1,4 @@
-# Copyright 2023 Nutanix. All rights reserved.
+# Copyright 2024 Nutanix. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
 #=================================================================
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.29.2-configmap.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.29.2-configmap.yaml
@@ -1,4 +1,4 @@
-# Copyright 2023 D2iQ, Inc. All rights reserved.
+# Copyright 2024 Nutanix. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
 #=================================================================
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/cluster-autoscaler/manifests/cluster-autoscaler-configmap.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/cluster-autoscaler/manifests/cluster-autoscaler-configmap.yaml
@@ -1,4 +1,4 @@
-# Copyright 2023 Nutanix. All rights reserved.
+# Copyright 2024 Nutanix. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
 #=================================================================
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/cni/calico/manifests/tigera-operator-configmap.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/cni/calico/manifests/tigera-operator-configmap.yaml
@@ -1,4 +1,4 @@
-# Copyright 2023 Nutanix. All rights reserved.
+# Copyright 2024 Nutanix. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
 #=================================================================
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/cni/cilium/manifests/cilium-configmap.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/cni/cilium/manifests/cilium-configmap.yaml
@@ -1,4 +1,4 @@
-# Copyright 2023 Nutanix. All rights reserved.
+# Copyright 2024 Nutanix. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
 #=================================================================
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/csi/aws-ebs/manifests/aws-ebs-csi-configmap.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/csi/aws-ebs/manifests/aws-ebs-csi-configmap.yaml
@@ -1,4 +1,4 @@
-# Copyright 2023 Nutanix. All rights reserved.
+# Copyright 2024 Nutanix. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
 #=================================================================
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/helm-config.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/helm-config.yaml
@@ -1,4 +1,4 @@
-# Copyright 2023 Nutanix. All rights reserved.
+# Copyright 2024 Nutanix. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
 #=================================================================
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/nfd/manifests/node-feature-discovery-configmap.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/nfd/manifests/node-feature-discovery-configmap.yaml
@@ -1,4 +1,4 @@
-# Copyright 2023 Nutanix. All rights reserved.
+# Copyright 2024 Nutanix. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
 #=================================================================
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/role.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/role.yaml
@@ -1,4 +1,4 @@
-# Copyright 2023 Nutanix. All rights reserved.
+# Copyright 2024 Nutanix. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 ---
 apiVersion: rbac.authorization.k8s.io/v1
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/serviceloadbalancer/metallb/helm-addon-installation.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/serviceloadbalancer/metallb/helm-addon-installation.yaml
@@ -1,4 +1,4 @@
-# Copyright 2023 D2iQ, Inc. All rights reserved.
+# Copyright 2023 Nutanix. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
 {{- if .Values.hooks.serviceLoadBalancer.metalLB.defaultValueTemplateConfigMap.create }}
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/virtual-ip/kube-vip/manifests/kube-vip-configmap.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/virtual-ip/kube-vip/manifests/kube-vip-configmap.yaml
@@ -1,4 +1,4 @@
-# Copyright 2023 D2iQ, Inc. All rights reserved.
+# Copyright 2024 Nutanix. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
 #=================================================================
diff --git a/common/pkg/capi/clustertopology/variables/json.go b/common/pkg/capi/clustertopology/variables/json.go
@@ -1,4 +1,4 @@
-// Copyright 2024 D2iQ, Inc. All rights reserved.
+// Copyright 2024 Nutanix. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 package variables
diff --git a/common/pkg/capi/utils/labels.go b/common/pkg/capi/utils/labels.go
@@ -1,4 +1,4 @@
-// Copyright 2023 D2iQ, Inc. All rights reserved.
+// Copyright 2023 Nutanix. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 package utils
diff --git a/common/pkg/k8s/client/apply.go b/common/pkg/k8s/client/apply.go
@@ -1,4 +1,4 @@
-// Copyright 2023 D2iQ, Inc. All rights reserved.
+// Copyright 2023 Nutanix. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 package client
diff --git a/hack/addons/kustomize/aws-ccm/helm-values.yaml b/hack/addons/kustomize/aws-ccm/helm-values.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 D2iQ, Inc. All rights reserved.
+# Copyright 2024 Nutanix. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
 ---
diff --git a/hack/addons/kustomize/metallb/kustomization.yaml.tmpl b/hack/addons/kustomize/metallb/kustomization.yaml.tmpl
@@ -1,4 +1,4 @@
-# Copyright 2024 D2iQ, Inc. All rights reserved.
+# Copyright 2024 Nutanix. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
 # NOTE This file is used by the tool in `hack/tools/helm-cm` to add
diff --git a/hack/license-header.go.txt b/hack/license-header.go.txt
@@ -1,2 +1,2 @@
-// Copyright 2023 Nutanix. All rights reserved.
+// Copyright 2024 Nutanix. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
diff --git a/hack/license-header.txt b/hack/license-header.txt
@@ -1,2 +1,2 @@
-Copyright 2023 Nutanix. All rights reserved.
+Copyright 2024 Nutanix. All rights reserved.
 SPDX-License-Identifier: Apache-2.0
diff --git a/hack/license-header.yaml.txt b/hack/license-header.yaml.txt
@@ -1,2 +1,2 @@
-# Copyright 2023 Nutanix. All rights reserved.
+# Copyright 2024 Nutanix. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
diff --git a/pkg/handlers/aws/handlers.go b/pkg/handlers/aws/handlers.go
@@ -1,4 +1,4 @@
-// Copyright 2023 D2iQ, Inc. All rights reserved.
+// Copyright 2023 Nutanix. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 package aws
diff --git a/pkg/handlers/docker/handlers.go b/pkg/handlers/docker/handlers.go
@@ -1,4 +1,4 @@
-// Copyright 2023 D2iQ, Inc. All rights reserved.
+// Copyright 2023 Nutanix. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 package docker
diff --git a/pkg/handlers/generic/lifecycle/csi/handler.go b/pkg/handlers/generic/lifecycle/csi/handler.go
@@ -159,7 +159,9 @@ func validateDefaultStorage(csi v1alpha1.CSI) error {
 		}
 		configs, ok := storageClassConfigsByProviderName[csi.DefaultStorage.ProviderName]
 		if !ok {
-			return fmt.Errorf("the DefaultStorage Provider name must be the name of a configured provider")
+			return fmt.Errorf(
+				"the DefaultStorage Provider name must be the name of a configured provider",
+			)
 		}
 		defaultStorageClassConfigNameInProvider := false
 		for _, config := range configs {
@@ -169,8 +171,9 @@ func validateDefaultStorage(csi v1alpha1.CSI) error {
 			}
 		}
 		if !defaultStorageClassConfigNameInProvider {
-			//nolint:lll // Long message.
-			return fmt.Errorf("the DefaultStorage StorageClassConfig name must be the name of a StorageClassConfig for the default provider")
+			return fmt.Errorf(
+				"the DefaultStorage StorageClassConfig name must be the name of a StorageClassConfig for the default provider",
+			)
 		}
 	}
 	return nil
diff --git a/pkg/handlers/generic/lifecycle/csi/handler_test.go b/pkg/handlers/generic/lifecycle/csi/handler_test.go
@@ -1,4 +1,4 @@
-// Copyright 2024 D2iQ, Inc. All rights reserved.
+// Copyright 2024 Nutanix. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 package csi
diff --git a/pkg/handlers/generic/lifecycle/serviceloadbalancer/handler.go b/pkg/handlers/generic/lifecycle/serviceloadbalancer/handler.go
@@ -1,4 +1,4 @@
-// Copyright 2023 D2iQ, Inc. All rights reserved.
+// Copyright 2023 Nutanix. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 package serviceloadbalancer
diff --git a/pkg/handlers/generic/lifecycle/serviceloadbalancer/metallb/handler.go b/pkg/handlers/generic/lifecycle/serviceloadbalancer/metallb/handler.go
@@ -1,4 +1,4 @@
-// Copyright 2023 D2iQ, Inc. All rights reserved.
+// Copyright 2023 Nutanix. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 package metallb
diff --git a/pkg/handlers/generic/lifecycle/utils/utils_integration_test.go b/pkg/handlers/generic/lifecycle/utils/utils_integration_test.go
@@ -1,4 +1,4 @@
-// Copyright 2023 D2iQ, Inc. All rights reserved.
+// Copyright 2023 Nutanix. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 package utils
diff --git a/pkg/handlers/generic/lifecycle/utils/utils_suite_test.go b/pkg/handlers/generic/lifecycle/utils/utils_suite_test.go
@@ -1,4 +1,4 @@
-// Copyright 2023 D2iQ, Inc. All rights reserved.
+// Copyright 2023 Nutanix. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 package utils
diff --git a/pkg/handlers/generic/mutation/controlplanevirtualip/inject.go b/pkg/handlers/generic/mutation/controlplanevirtualip/inject.go
@@ -1,4 +1,4 @@
-// Copyright 2023 D2iQ, Inc. All rights reserved.
+// Copyright 2023 Nutanix. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 package controlplanevirtualip
diff --git a/pkg/handlers/generic/mutation/controlplanevirtualip/inject_test.go b/pkg/handlers/generic/mutation/controlplanevirtualip/inject_test.go
@@ -1,4 +1,4 @@
-// Copyright 2023 D2iQ, Inc. All rights reserved.
+// Copyright 2023 Nutanix. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 package controlplanevirtualip
diff --git a/pkg/handlers/generic/mutation/controlplanevirtualip/providers/kubevip.go b/pkg/handlers/generic/mutation/controlplanevirtualip/providers/kubevip.go
@@ -1,4 +1,4 @@
-// Copyright 2023 D2iQ, Inc. All rights reserved.
+// Copyright 2023 Nutanix. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 package providers
diff --git a/pkg/handlers/generic/mutation/controlplanevirtualip/providers/kubevip_test.go b/pkg/handlers/generic/mutation/controlplanevirtualip/providers/kubevip_test.go
@@ -1,4 +1,4 @@
-// Copyright 2023 D2iQ, Inc. All rights reserved.
+// Copyright 2023 Nutanix. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 package providers
diff --git a/pkg/handlers/generic/mutation/controlplanevirtualip/providers/providers.go b/pkg/handlers/generic/mutation/controlplanevirtualip/providers/providers.go
@@ -1,4 +1,4 @@
-// Copyright 2023 D2iQ, Inc. All rights reserved.
+// Copyright 2023 Nutanix. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 package providers
diff --git a/pkg/handlers/nutanix/handlers.go b/pkg/handlers/nutanix/handlers.go
@@ -1,4 +1,4 @@
-// Copyright 2023 D2iQ, Inc. All rights reserved.
+// Copyright 2023 Nutanix. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 package nutanix
diff --git a/pkg/handlers/nutanix/mutation/controlplanevirtualip/inject.go b/pkg/handlers/nutanix/mutation/controlplanevirtualip/inject.go
@@ -1,4 +1,4 @@
-// Copyright 2023 D2iQ, Inc. All rights reserved.
+// Copyright 2023 Nutanix. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 package controlplanevirtualip
diff --git a/test/e2e/clusterautoscaler_helpers.go b/test/e2e/clusterautoscaler_helpers.go
@@ -1,6 +1,6 @@
 //go:build e2e
 
-// Copyright 2024 D2iQ, Inc. All rights reserved.
+// Copyright 2024 Nutanix. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 package e2e
diff --git a/test/e2e/data/shared/v1beta1-capx/metadata.yaml b/test/e2e/data/shared/v1beta1-capx/metadata.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 D2iQ, Inc. All rights reserved.
+# Copyright 2024 Nutanix. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
 # maps release series of major.minor to cluster-api contract version
diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go
@@ -32,7 +32,7 @@ import (
 	clusterctltemp "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/framework/clusterctl"
 )
 
-func init() { //nolint:gochecknoinits // Idiomatically used to set up flags.
+func init() {
 	flag.StringVar(&configPath, "e2e.config", "", "path to the e2e config file")
 	flag.StringVar(
 		&artifactFolder,
diff --git a/test/e2e/framework/self_hosted.go b/test/e2e/framework/self_hosted.go
@@ -1,6 +1,6 @@
 //go:build e2e
 
-// Copyright 2024 D2iQ, Inc. All rights reserved.
+// Copyright 2024 Nutanix. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 package framework
diff --git a/test/e2e/self_hosted_test.go b/test/e2e/self_hosted_test.go
@@ -1,6 +1,6 @@
 //go:build e2e
 
-// Copyright 2024 D2iQ, Inc. All rights reserved.
+// Copyright 2024 Nutanix. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 package e2e

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Copyright 2023 Nutanix. All rights reserved.`
	`1`	`+# Copyright 2024 Nutanix. All rights reserved.`
`2`	`2`	`# SPDX-License-Identifier: Apache-2.0`
`3`	`3`	`---`
`4`	`4`	`apiVersion: apiextensions.k8s.io/v1`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright 2023 D2iQ, Inc. All rights reserved.`
	`1`	`+// Copyright 2023 Nutanix. All rights reserved.`
`2`	`2`	`// SPDX-License-Identifier: Apache-2.0`
`3`	`3`
`4`	`4`	`package v1alpha1`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Copyright 2023 D2iQ, Inc. All rights reserved.`
	`1`	`+# Copyright 2024 Nutanix. All rights reserved.`
`2`	`2`	`# SPDX-License-Identifier: Apache-2.0`
`3`	`3`
`4`	`4`	`#=================================================================`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Copyright 2023 D2iQ, Inc. All rights reserved.`
	`1`	`+# Copyright 2023 Nutanix. All rights reserved.`
`2`	`2`	`# SPDX-License-Identifier: Apache-2.0`
`3`	`3`
`4`	`4`	`{{- if .Values.hooks.serviceLoadBalancer.metalLB.defaultValueTemplateConfigMap.create }}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright 2024 D2iQ, Inc. All rights reserved.`
	`1`	`+// Copyright 2024 Nutanix. All rights reserved.`
`2`	`2`	`// SPDX-License-Identifier: Apache-2.0`
`3`	`3`
`4`	`4`	`package variables`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Copyright 2024 D2iQ, Inc. All rights reserved.`
	`1`	`+# Copyright 2024 Nutanix. All rights reserved.`
`2`	`2`	`# SPDX-License-Identifier: Apache-2.0`
`3`	`3`
`4`	`4`	`---`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-// Copyright 2023 Nutanix. All rights reserved.`
	`1`	`+// Copyright 2024 Nutanix. All rights reserved.`
`2`	`2`	`// SPDX-License-Identifier: Apache-2.0`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-Copyright 2023 Nutanix. All rights reserved.`
	`1`	`+Copyright 2024 Nutanix. All rights reserved.`
`2`	`2`	`SPDX-License-Identifier: Apache-2.0`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,9 @@ func validateDefaultStorage(csi v1alpha1.CSI) error {`
`159`	`159`	`}`
`160`	`160`	`configs, ok := storageClassConfigsByProviderName[csi.DefaultStorage.ProviderName]`
`161`	`161`	`if !ok {`
`162`		`- return fmt.Errorf("the DefaultStorage Provider name must be the name of a configured provider")`
	`162`	`+ return fmt.Errorf(`
	`163`	`+ "the DefaultStorage Provider name must be the name of a configured provider",`
	`164`	`+ )`
`163`	`165`	`}`
`164`	`166`	`defaultStorageClassConfigNameInProvider := false`
`165`	`167`	`for _, config := range configs {`
`@@ -169,8 +171,9 @@ func validateDefaultStorage(csi v1alpha1.CSI) error {`
`169`	`171`	`}`
`170`	`172`	`}`
`171`	`173`	`if !defaultStorageClassConfigNameInProvider {`
`172`		`- //nolint:lll // Long message.`
`173`		`- return fmt.Errorf("the DefaultStorage StorageClassConfig name must be the name of a StorageClassConfig for the default provider")`
	`174`	`+ return fmt.Errorf(`
	`175`	`+ "the DefaultStorage StorageClassConfig name must be the name of a StorageClassConfig for the default provider",`
	`176`	`+ )`
`174`	`177`	`}`
`175`	`178`	`}`
`176`	`179`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ import (`
`32`	`32`	`clusterctltemp "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/framework/clusterctl"`
`33`	`33`	`)`
`34`	`34`
`35`		`-func init() { //nolint:gochecknoinits // Idiomatically used to set up flags.`
	`35`	`+func init() {`
`36`	`36`	`flag.StringVar(&configPath, "e2e.config", "", "path to the e2e config file")`
`37`	`37`	`flag.StringVar(`
`38`	`38`	`&artifactFolder,`