Skip to content

Commit

Permalink
Merge pull request #432 from Nordix/bump-capi-v1.6.2/adil
Browse files Browse the repository at this point in the history 
🌱 Bump CAPI to v1.6.2
  • Loading branch information
@metal3-io-bot
metal3-io-bot authored Feb 26, 2024
2 parents e5a014d + af3bd1f commit 57e17b7
Show file tree
Hide file tree
Showing 11 changed files with 255 additions and 302 deletions.
42 changes: 21 additions & 21 deletions api/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ require (
github.com/onsi/ginkgo/v2 v2.15.0
github.com/onsi/gomega v1.31.1
github.com/pkg/errors v0.9.1
k8s.io/api v0.28.5
k8s.io/apimachinery v0.28.5
k8s.io/client-go v0.28.5
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
sigs.k8s.io/controller-runtime v0.16.3
k8s.io/api v0.29.2
k8s.io/apimachinery v0.29.2
k8s.io/client-go v0.29.2
k8s.io/utils v0.0.0-20231127182322-b307cd553661
sigs.k8s.io/controller-runtime v0.17.2
)

require github.com/google/gnostic-models v0.6.8 // indirect
Expand All @@ -20,9 +20,9 @@ require (
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
Expand All @@ -38,19 +38,19 @@ require (
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/prometheus/client_golang v1.18.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.45.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/oauth2 v0.12.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/term v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
Expand All @@ -61,11 +61,11 @@ 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.28.5 // indirect
k8s.io/component-base v0.28.5 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/apiextensions-apiserver v0.29.0 // indirect
k8s.io/component-base v0.29.0 // indirect
k8s.io/klog/v2 v2.110.1 // indirect
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
110 changes: 53 additions & 57 deletions api/go.sum
View file

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions api/v1alpha1/utils_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"

"k8s.io/utils/pointer"
"k8s.io/utils/ptr"
)

var _ = Describe("IPPool manager", func() {
Expand Down Expand Up @@ -50,68 +50,68 @@ var _ = Describe("IPPool manager", func() {
}),
Entry("Start set, no end or subnet", testCaseGetIPAddress{
ipAddress: Pool{
Start: (*IPAddressStr)(pointer.String("192.168.0.10")),
Start: (*IPAddressStr)(ptr.To("192.168.0.10")),
},
index: 1,
expectedIP: IPAddressStr("192.168.0.11"),
}),
Entry("Start set, end set, subnet unset", testCaseGetIPAddress{
ipAddress: Pool{
Start: (*IPAddressStr)(pointer.String("192.168.0.10")),
End: (*IPAddressStr)(pointer.String("192.168.0.100")),
Start: (*IPAddressStr)(ptr.To("192.168.0.10")),
End: (*IPAddressStr)(ptr.To("192.168.0.100")),
},
index: 1,
expectedIP: IPAddressStr("192.168.0.11"),
}),
Entry("Start set, end set, subnet unset, out of bound", testCaseGetIPAddress{
ipAddress: Pool{
Start: (*IPAddressStr)(pointer.String("192.168.0.10")),
End: (*IPAddressStr)(pointer.String("192.168.0.100")),
Start: (*IPAddressStr)(ptr.To("192.168.0.10")),
End: (*IPAddressStr)(ptr.To("192.168.0.100")),
},
index: 100,
expectError: true,
}),
Entry("Start set, end unset, subnet set", testCaseGetIPAddress{
ipAddress: Pool{
Start: (*IPAddressStr)(pointer.String("192.168.0.10")),
Subnet: (*IPSubnetStr)(pointer.String("192.168.0.0/24")),
Start: (*IPAddressStr)(ptr.To("192.168.0.10")),
Subnet: (*IPSubnetStr)(ptr.To("192.168.0.0/24")),
},
index: 1,
expectedIP: IPAddressStr("192.168.0.11"),
}),
Entry("Start set, end unset, subnet set, out of bound", testCaseGetIPAddress{
ipAddress: Pool{
Start: (*IPAddressStr)(pointer.String("192.168.0.10")),
Subnet: (*IPSubnetStr)(pointer.String("192.168.0.0/24")),
Start: (*IPAddressStr)(ptr.To("192.168.0.10")),
Subnet: (*IPSubnetStr)(ptr.To("192.168.0.0/24")),
},
index: 250,
expectError: true,
}),
Entry("Start set, end unset, subnet empty", testCaseGetIPAddress{
ipAddress: Pool{
Start: (*IPAddressStr)(pointer.String("192.168.0.10")),
Subnet: (*IPSubnetStr)(pointer.String("")),
Start: (*IPAddressStr)(ptr.To("192.168.0.10")),
Subnet: (*IPSubnetStr)(ptr.To("")),
},
index: 1,
expectError: true,
}),
Entry("subnet empty", testCaseGetIPAddress{
ipAddress: Pool{
Subnet: (*IPSubnetStr)(pointer.String("")),
Subnet: (*IPSubnetStr)(ptr.To("")),
},
index: 1,
expectError: true,
}),
Entry("Start unset, end unset, subnet set", testCaseGetIPAddress{
ipAddress: Pool{
Subnet: (*IPSubnetStr)(pointer.String("192.168.0.10/24")),
Subnet: (*IPSubnetStr)(ptr.To("192.168.0.10/24")),
},
index: 1,
expectedIP: IPAddressStr("192.168.0.12"),
}),
Entry("Start unset, end unset, subnet set, out of bound", testCaseGetIPAddress{
ipAddress: Pool{
Subnet: (*IPSubnetStr)(pointer.String("192.168.0.10/24")),
Subnet: (*IPSubnetStr)(ptr.To("192.168.0.10/24")),
},
index: 250,
expectError: true,
Expand Down
18 changes: 9 additions & 9 deletions controllers/ippool_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/fake"
Expand Down Expand Up @@ -139,7 +139,7 @@ var _ = Describe("IPPool controller", func() {
Entry("Cluster not found", testCaseReconcile{
m3ipp: &ipamv1.IPPool{
ObjectMeta: testObjectMeta,
Spec: ipamv1.IPPoolSpec{ClusterName: pointer.String("abc")},
Spec: ipamv1.IPPoolSpec{ClusterName: ptr.To("abc")},
},
}),
Entry("Deletion, Cluster not found", testCaseReconcile{
Expand All @@ -152,7 +152,7 @@ var _ = Describe("IPPool controller", func() {
ipamv1.IPClaimFinalizer,
},
},
Spec: ipamv1.IPPoolSpec{ClusterName: pointer.String("abc")},
Spec: ipamv1.IPPoolSpec{ClusterName: ptr.To("abc")},
},
expectManager: true,
}),
Expand All @@ -166,7 +166,7 @@ var _ = Describe("IPPool controller", func() {
ipamv1.IPClaimFinalizer,
},
},
Spec: ipamv1.IPPoolSpec{ClusterName: pointer.String("abc")},
Spec: ipamv1.IPPoolSpec{ClusterName: ptr.To("abc")},
},
expectManager: true,
reconcileDeleteError: true,
Expand All @@ -175,7 +175,7 @@ var _ = Describe("IPPool controller", func() {
Entry("Paused cluster", testCaseReconcile{
m3ipp: &ipamv1.IPPool{
ObjectMeta: testObjectMeta,
Spec: ipamv1.IPPoolSpec{ClusterName: pointer.String("abc")},
Spec: ipamv1.IPPoolSpec{ClusterName: ptr.To("abc")},
},
cluster: &clusterv1.Cluster{
ObjectMeta: testObjectMeta,
Expand All @@ -189,7 +189,7 @@ var _ = Describe("IPPool controller", func() {
Entry("Error in manager", testCaseReconcile{
m3ipp: &ipamv1.IPPool{
ObjectMeta: testObjectMeta,
Spec: ipamv1.IPPoolSpec{ClusterName: pointer.String("abc")},
Spec: ipamv1.IPPoolSpec{ClusterName: ptr.To("abc")},
},
cluster: &clusterv1.Cluster{
ObjectMeta: testObjectMeta,
Expand All @@ -199,7 +199,7 @@ var _ = Describe("IPPool controller", func() {
Entry("Reconcile normal error", testCaseReconcile{
m3ipp: &ipamv1.IPPool{
ObjectMeta: testObjectMeta,
Spec: ipamv1.IPPoolSpec{ClusterName: pointer.String("abc")},
Spec: ipamv1.IPPoolSpec{ClusterName: ptr.To("abc")},
},
cluster: &clusterv1.Cluster{
ObjectMeta: testObjectMeta,
Expand All @@ -211,15 +211,15 @@ var _ = Describe("IPPool controller", func() {
Entry("Reconcile normal no cluster", testCaseReconcile{
m3ipp: &ipamv1.IPPool{
ObjectMeta: testObjectMeta,
Spec: ipamv1.IPPoolSpec{ClusterName: pointer.String("abc")},
Spec: ipamv1.IPPoolSpec{ClusterName: ptr.To("abc")},
},
reconcileNormal: false,
expectManager: false,
}),
Entry("Reconcile normal no error", testCaseReconcile{
m3ipp: &ipamv1.IPPool{
ObjectMeta: testObjectMeta,
Spec: ipamv1.IPPoolSpec{ClusterName: pointer.String("abc")},
Spec: ipamv1.IPPoolSpec{ClusterName: ptr.To("abc")},
},
cluster: &clusterv1.Cluster{
ObjectMeta: testObjectMeta,
Expand Down
11 changes: 6 additions & 5 deletions controllers/suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/rest"
"k8s.io/klog/v2/klogr"
"k8s.io/klog/v2"

ipamv1 "github.com/metal3-io/ip-address-manager/api/v1alpha1"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/envtest"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
// +kubebuilder:scaffold:imports
)

Expand All @@ -48,7 +48,10 @@ var testEnv *envtest.Environment
var timestampNow = metav1.Now()

func init() {
logf.SetLogger(klogr.New())
klog.InitFlags(nil)
klog.SetOutput(GinkgoWriter)
ctrl.SetLogger(klog.Background())
logf.SetLogger(klog.Background())

// Register required object kinds with global scheme.
_ = apiextensionsv1.AddToScheme(scheme.Scheme)
Expand Down Expand Up @@ -78,8 +81,6 @@ var _ = BeforeSuite(func() {
done := make(chan interface{})

go func() {
logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))

By("bootstrapping test environment")
testEnv = &envtest.Environment{
CRDDirectoryPaths: []string{filepath.Join("..", "config", "crd", "bases")},
Expand Down
Loading

0 comments on commit 57e17b7

Please sign in to comment.