Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion api/v1beta1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion hack/tools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
ROOT_DIR_RELATIVE := ../..
include $(ROOT_DIR_RELATIVE)/common.mk

GOLANGCI_LINT_VERSION ?= v2.6.2
GOLANGCI_LINT_VERSION ?= v2.7.2

# GOTESTSUM version without the leading 'v'
GOTESTSUM_VERSION ?= 1.12.0
Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/errors/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package errors
package capoerrors

import (
"errors"
Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/errors/terminal.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package errors
package capoerrors

import (
goerrors "errors"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/shared/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package shared
package e2eshared

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/shared/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package shared
package e2eshared

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/shared/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package shared
package e2eshared

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/shared/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package shared
package e2eshared

import (
"errors"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/shared/exec.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package shared
package e2eshared

import (
"bytes"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/shared/exec_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package shared
package e2eshared

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/shared/images.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package shared
package e2eshared

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/shared/openstack.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package shared
package e2eshared

import (
"bytes"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/shared/openstack_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package shared
package e2eshared

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/shared/suite.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package shared
package e2eshared

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/suites/conformance/conformance_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
. "github.com/onsi/gomega"
ctrl "sigs.k8s.io/controller-runtime"

"sigs.k8s.io/cluster-api-provider-openstack/test/e2e/shared"
shared "sigs.k8s.io/cluster-api-provider-openstack/test/e2e/shared"
)

var e2eCtx *shared.E2EContext
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/suites/conformance/conformance_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"sigs.k8s.io/cluster-api/test/framework/kubernetesversions"
"sigs.k8s.io/cluster-api/test/framework/kubetest"

"sigs.k8s.io/cluster-api-provider-openstack/test/e2e/shared"
shared "sigs.k8s.io/cluster-api-provider-openstack/test/e2e/shared"
)

var _ = Describe("conformance tests", func() {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/suites/e2e/clusterctl_upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
capi_e2e "sigs.k8s.io/cluster-api/test/e2e"
"sigs.k8s.io/cluster-api/test/framework/clusterctl"

"sigs.k8s.io/cluster-api-provider-openstack/test/e2e/shared"
shared "sigs.k8s.io/cluster-api-provider-openstack/test/e2e/shared"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/suites/e2e/e2e_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
. "github.com/onsi/gomega"
ctrl "sigs.k8s.io/controller-runtime"

"sigs.k8s.io/cluster-api-provider-openstack/test/e2e/shared"
shared "sigs.k8s.io/cluster-api-provider-openstack/test/e2e/shared"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/suites/e2e/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ import (
infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
"sigs.k8s.io/cluster-api-provider-openstack/internal/util/ssa"
"sigs.k8s.io/cluster-api-provider-openstack/pkg/generated/applyconfiguration/api/v1beta1"
"sigs.k8s.io/cluster-api-provider-openstack/test/e2e/shared"
shared "sigs.k8s.io/cluster-api-provider-openstack/test/e2e/shared"
)

const specName = "e2e"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/suites/e2e/remediations_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"k8s.io/utils/ptr"
capi_e2e "sigs.k8s.io/cluster-api/test/e2e"

"sigs.k8s.io/cluster-api-provider-openstack/test/e2e/shared"
shared "sigs.k8s.io/cluster-api-provider-openstack/test/e2e/shared"
)

var _ = Describe("When testing unhealthy machines remediation", func() {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/suites/e2e/self_hosted_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
. "github.com/onsi/ginkgo/v2"
capie2e "sigs.k8s.io/cluster-api/test/e2e"

"sigs.k8s.io/cluster-api-provider-openstack/test/e2e/shared"
shared "sigs.k8s.io/cluster-api-provider-openstack/test/e2e/shared"
)

var _ = Describe("When testing Cluster API provider Openstack working on [self-hosted] clusters", func() {
Expand Down