File tree 5 files changed +9
-5
lines changed
5 files changed +9
-5
lines changed Original file line number Diff line number Diff line change @@ -49,9 +49,14 @@ linters-settings:
49
49
depguard :
50
50
rules :
51
51
main :
52
+ list-mode : lax # Allow everything unless explicitly denied below.
52
53
deny :
53
54
- pkg : k8s.io/kubernetes
54
55
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"
55
60
errcheck :
56
61
exclude-functions :
57
62
- encoding/json.Marshal
Original file line number Diff line number Diff line change @@ -32,7 +32,6 @@ require (
32
32
k8s.io/kubelet v0.29.3
33
33
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
34
34
sigs.k8s.io/cluster-api v1.6.3
35
- sigs.k8s.io/cluster-api-addon-provider-helm v0.1.1-alpha.1
36
35
sigs.k8s.io/cluster-api/test v1.6.3
37
36
sigs.k8s.io/controller-runtime v0.17.2
38
37
sigs.k8s.io/yaml v1.4.0
@@ -93,6 +92,7 @@ require (
93
92
github.com/mitchellh/copystructure v1.2.0 // indirect
94
93
github.com/mitchellh/mapstructure v1.5.0 // indirect
95
94
github.com/mitchellh/reflectwalk v1.0.2 // indirect
95
+ github.com/moby/term v0.5.0 // indirect
96
96
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
97
97
github.com/modern-go/reflect2 v1.0.2 // indirect
98
98
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
Original file line number Diff line number Diff line change @@ -1099,8 +1099,6 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2S
1099
1099
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 /go.mod h1:VHVDI/KrK4fjnV61bE2g3sA7tiETLn8sooImelsCx3Y =
1100
1100
sigs.k8s.io/cluster-api v1.6.3 h1:VOlPNg92PQLlhBVLc5pg+cbAuPvGOOBujeFLk9zgnoo =
1101
1101
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 =
1104
1102
sigs.k8s.io/cluster-api/test v1.6.3 h1:ZCboLCTpKWzSbf+f7MpQT7EN8aeH9DNhJC1T9/vAuAM =
1105
1103
sigs.k8s.io/cluster-api/test v1.6.3 /go.mod h1:AKs25dgW6AnyGaQBoWuXfWnBs+FT7vJmAI/aox64DEI =
1106
1104
sigs.k8s.io/controller-runtime v0.17.2 h1:FwHwD1CTUemg0pW2otk7/U5/i5m2ymzvOXdbeGOUvw0 =
Original file line number Diff line number Diff line change @@ -21,13 +21,13 @@ import (
21
21
. "github.com/onsi/gomega"
22
22
"k8s.io/apimachinery/pkg/runtime"
23
23
"k8s.io/klog/v2"
24
- addonsv1 "sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1"
25
24
capie2e "sigs.k8s.io/cluster-api/test/e2e"
26
25
"sigs.k8s.io/cluster-api/test/framework"
27
26
capibootstrap "sigs.k8s.io/cluster-api/test/framework/bootstrap"
28
27
"sigs.k8s.io/cluster-api/test/framework/clusterctl"
29
28
ctrl "sigs.k8s.io/controller-runtime"
30
29
30
+ addonsv1 "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1"
31
31
"github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/test/framework/bootstrap"
32
32
clusterctltemp "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/test/framework/clusterctl"
33
33
)
Original file line number Diff line number Diff line change @@ -11,12 +11,13 @@ import (
11
11
"time"
12
12
13
13
. "github.com/onsi/gomega"
14
- addonsv1 "sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1"
15
14
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
16
15
capie2e "sigs.k8s.io/cluster-api/test/e2e"
17
16
"sigs.k8s.io/cluster-api/test/framework"
18
17
"sigs.k8s.io/cluster-api/util/conditions"
19
18
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"
20
21
)
21
22
22
23
// WaitForHelmReleaseProxyReadyInput is the input for WaitForHelmReleaseProxyReady.
You can’t perform that action at this time.
0 commit comments