Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🌱 Bump CAPI to v1.6.2 #1467

Merged
merged 1 commit into from
Feb 26, 2024
Merged

🌱 Bump CAPI to v1.6.2 #1467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ need to be manually installed. Example flow of installing Metal3 provider:
level of the logging verbose with a positive integer number, ie. -v5.

```shell
clusterctl init --core cluster-api:v1.6.1 --bootstrap kubeadm:v1.6.1 \
--control-plane kubeadm:v1.6.1 -v5
clusterctl init --core cluster-api:v1.6.2 --bootstrap kubeadm:v1.6.2 \
--control-plane kubeadm:v1.6.2 -v5
```

1. Install Metal3 provider. This will install the latest version of Cluster API
Expand Down
4 changes: 2 additions & 2 deletions api/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ require (
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-20230726121419-3b25d923346b
sigs.k8s.io/cluster-api v1.6.1
k8s.io/utils v0.0.0-20231127182322-b307cd553661
sigs.k8s.io/cluster-api v1.6.2
sigs.k8s.io/controller-runtime v0.17.2

)
Expand Down
8 changes: 4 additions & 4 deletions api/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,10 @@ k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
sigs.k8s.io/cluster-api v1.6.1 h1:I34p/fwgRlEhs+o9cUhKXDwNNfPS3no0yJsd2bJyQVc=
sigs.k8s.io/cluster-api v1.6.1/go.mod h1:DaxwruDvSaEYq5q6FREDaGzX6UsAVUCA99Sp8vfMHyQ=
k8s.io/utils v0.0.0-20231127182322-b307cd553661 h1:FepOBzJ0GXm8t0su67ln2wAZjbQ6RxQGZDnzuLcrUTI=
k8s.io/utils v0.0.0-20231127182322-b307cd553661/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
sigs.k8s.io/cluster-api v1.6.2 h1:ruUi4q/9jXFuI+hmnDjo9izHgrBk4bjfQXLKx678PQE=
sigs.k8s.io/cluster-api v1.6.2/go.mod h1:Anm4cA6R/AIP6KdIuVje8CdFc/TdGl+382bi5oPawRc=
sigs.k8s.io/controller-runtime v0.17.2 h1:FwHwD1CTUemg0pW2otk7/U5/i5m2ymzvOXdbeGOUvw0=
sigs.k8s.io/controller-runtime v0.17.2/go.mod h1:+MngTvIQQQhfXtwfdGw/UOQ/aIaqsYywfCINOtwMO/s=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
Expand Down
4 changes: 2 additions & 2 deletions api/v1beta1/metal3machine_webhook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (

. "github.com/onsi/gomega"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"
)

func TestMetal3MachineDefault(_ *testing.T) {
Expand Down Expand Up @@ -52,7 +52,7 @@ func TestMetal3MachineValidation(t *testing.T) {

validIso := valid.DeepCopy()
validIso.Spec.Image.Checksum = ""
validIso.Spec.Image.DiskFormat = pointer.String(LiveISODiskFormat)
validIso.Spec.Image.DiskFormat = ptr.To(LiveISODiskFormat)

tests := []struct {
name string
Expand Down
4 changes: 2 additions & 2 deletions api/v1beta1/metal3machinetemplate_webhook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (

. "github.com/onsi/gomega"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"
)

func TestMetal3MachineTemplateDefault(_ *testing.T) {
Expand Down Expand Up @@ -56,7 +56,7 @@ func TestMetal3MachineTemplateValidation(t *testing.T) {

validIso := valid.DeepCopy()
validIso.Spec.Template.Spec.Image.Checksum = ""
validIso.Spec.Template.Spec.Image.DiskFormat = pointer.String(LiveISODiskFormat)
validIso.Spec.Template.Spec.Image.DiskFormat = ptr.To(LiveISODiskFormat)

tests := []struct {
name string
Expand Down
4 changes: 2 additions & 2 deletions baremetal/metal3cluster_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
. "github.com/onsi/gomega"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
_ "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
capierrors "sigs.k8s.io/cluster-api/errors"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down Expand Up @@ -167,7 +167,7 @@ var _ = Describe("Metal3Cluster manager", func() {
Cluster: newCluster(clusterName),
BMCluster: newMetal3Cluster(metal3ClusterName,
bmcOwnerRef, nil, &infrav1.Metal3ClusterStatus{
FailureMessage: pointer.String("cba"),
FailureMessage: ptr.To("cba"),
},
),
}),
Expand Down
12 changes: 6 additions & 6 deletions baremetal/metal3data_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/types"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
caipamv1 "sigs.k8s.io/cluster-api/exp/ipam/api/v1alpha1"
"sigs.k8s.io/cluster-api/util"
Expand Down Expand Up @@ -249,7 +249,7 @@ func (m *DataManager) createSecrets(ctx context.Context) error {
// Create the owner Ref for the secret
ownerRefs := []metav1.OwnerReference{
{
Controller: pointer.Bool(true),
Controller: ptr.To(true),
APIVersion: m.Data.APIVersion,
Kind: m.Data.Kind,
Name: m.Data.Name,
Expand Down Expand Up @@ -432,7 +432,7 @@ type poolRefs map[string]corev1.TypedLocalObjectReference
// It returns an error if a reference with the same name but a different group or kind already exists.
func (p poolRefs) addRef(ref corev1.TypedLocalObjectReference) error {
if ref.APIGroup == nil || *ref.APIGroup == "" {
ref.APIGroup = pointer.String("ipam.metal3.io")
ref.APIGroup = ptr.To("ipam.metal3.io")
}
if ref.Kind == "" {
ref.Kind = "IPPool"
Expand All @@ -453,7 +453,7 @@ func (p poolRefs) addRef(ref corev1.TypedLocalObjectReference) error {

// addFromPool adds a pool reference from a [FromPool] value.
func (p poolRefs) addFromPool(pool infrav1.FromPool) error {
return p.addRef(corev1.TypedLocalObjectReference{Name: pool.Name, APIGroup: pointer.String(pool.APIGroup), Kind: pool.Kind})
return p.addRef(corev1.TypedLocalObjectReference{Name: pool.Name, APIGroup: ptr.To(pool.APIGroup), Kind: pool.Kind})
}

// addName adds a reference to a metal3 pool using just its name.
Expand Down Expand Up @@ -612,7 +612,7 @@ func (m *DataManager) m3IPClaimObjectMeta(name, poolRefName string, preallocatio
Kind: m.Data.Kind,
Name: m.Data.Name,
UID: m.Data.UID,
Controller: pointer.Bool(true),
Controller: ptr.To(true),
},
},
Labels: m.Data.Labels,
Expand Down Expand Up @@ -845,7 +845,7 @@ func (m *DataManager) ensureIPClaim(ctx context.Context, poolRef corev1.TypedLoc
Kind: m.Data.Kind,
Name: m.Data.Name,
UID: m.Data.UID,
Controller: pointer.BoolPtr(true),
Controller: ptr.To(true),
},
},
Labels: m.Data.Labels,
Expand Down
Loading
Loading