Skip to content

Commit 19528bf

Browse files
authored
refactor: Replace direct usage of CAAPH API with vendored types (#492)
Also introduces linting rules to prevent happening this in future.
1 parent 73625d2 commit 19528bf

File tree

5 files changed

+9
-5
lines changed

5 files changed

+9
-5
lines changed

.golangci.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,14 @@ linters-settings:
4949
depguard:
5050
rules:
5151
main:
52+
list-mode: lax # Allow everything unless explicitly denied below.
5253
deny:
5354
- pkg: k8s.io/kubernetes
5455
desc: "do not use k8s.io/kubernetes directly"
56+
- pkg: sigs.k8s.io/cluster-api-provider-
57+
desc: "do not use CAPI providers directly, instead vendor necessary APIs"
58+
- pkg: sigs.k8s.io/cluster-api-addon-provider-
59+
desc: "do not use CAPI providers directly, instead vendor necessary APIs"
5560
errcheck:
5661
exclude-functions:
5762
- encoding/json.Marshal

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ require (
3232
k8s.io/kubelet v0.29.3
3333
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
3434
sigs.k8s.io/cluster-api v1.6.3
35-
sigs.k8s.io/cluster-api-addon-provider-helm v0.1.1-alpha.1
3635
sigs.k8s.io/cluster-api/test v1.6.3
3736
sigs.k8s.io/controller-runtime v0.17.2
3837
sigs.k8s.io/yaml v1.4.0
@@ -93,6 +92,7 @@ require (
9392
github.com/mitchellh/copystructure v1.2.0 // indirect
9493
github.com/mitchellh/mapstructure v1.5.0 // indirect
9594
github.com/mitchellh/reflectwalk v1.0.2 // indirect
95+
github.com/moby/term v0.5.0 // indirect
9696
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
9797
github.com/modern-go/reflect2 v1.0.2 // indirect
9898
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect

go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1099,8 +1099,6 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2S
10991099
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0/go.mod h1:VHVDI/KrK4fjnV61bE2g3sA7tiETLn8sooImelsCx3Y=
11001100
sigs.k8s.io/cluster-api v1.6.3 h1:VOlPNg92PQLlhBVLc5pg+cbAuPvGOOBujeFLk9zgnoo=
11011101
sigs.k8s.io/cluster-api v1.6.3/go.mod h1:4FzfgPPiYaFq8X9F9j2SvmggH/4OOLEDgVJuWDqKLig=
1102-
sigs.k8s.io/cluster-api-addon-provider-helm v0.1.1-alpha.1 h1:HfBfswOZk/oUsNfkp5mT7eW/fIY//xGAvjSq9yCO0Gc=
1103-
sigs.k8s.io/cluster-api-addon-provider-helm v0.1.1-alpha.1/go.mod h1:SgeAkpyhAzK5GBPeqfYHbThpMptSXVhDcLyWbM6UTik=
11041102
sigs.k8s.io/cluster-api/test v1.6.3 h1:ZCboLCTpKWzSbf+f7MpQT7EN8aeH9DNhJC1T9/vAuAM=
11051103
sigs.k8s.io/cluster-api/test v1.6.3/go.mod h1:AKs25dgW6AnyGaQBoWuXfWnBs+FT7vJmAI/aox64DEI=
11061104
sigs.k8s.io/controller-runtime v0.17.2 h1:FwHwD1CTUemg0pW2otk7/U5/i5m2ymzvOXdbeGOUvw0=

test/e2e/e2e_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ import (
2121
. "github.com/onsi/gomega"
2222
"k8s.io/apimachinery/pkg/runtime"
2323
"k8s.io/klog/v2"
24-
addonsv1 "sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1"
2524
capie2e "sigs.k8s.io/cluster-api/test/e2e"
2625
"sigs.k8s.io/cluster-api/test/framework"
2726
capibootstrap "sigs.k8s.io/cluster-api/test/framework/bootstrap"
2827
"sigs.k8s.io/cluster-api/test/framework/clusterctl"
2928
ctrl "sigs.k8s.io/controller-runtime"
3029

30+
addonsv1 "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1"
3131
"github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/test/framework/bootstrap"
3232
clusterctltemp "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/test/framework/clusterctl"
3333
)

test/e2e/helmreleaseproxy_helpers.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@ import (
1111
"time"
1212

1313
. "github.com/onsi/gomega"
14-
addonsv1 "sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1"
1514
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
1615
capie2e "sigs.k8s.io/cluster-api/test/e2e"
1716
"sigs.k8s.io/cluster-api/test/framework"
1817
"sigs.k8s.io/cluster-api/util/conditions"
1918
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
19+
20+
addonsv1 "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1"
2021
)
2122

2223
// WaitForHelmReleaseProxyReadyInput is the input for WaitForHelmReleaseProxyReady.

0 commit comments

Comments
 (0)