Skip to content

🌱 Bump k8s dep to 0.29.3 #2014

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

Merged
merged 1 commit into from
Apr 12, 2024
Merged

🌱 Bump k8s dep to 0.29.3 #2014

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
20 changes: 10 additions & 10 deletions api/v1alpha5/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"strings"

conversion "k8s.io/apimachinery/pkg/conversion"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"
utilconversion "sigs.k8s.io/cluster-api/util/conversion"
ctrlconversion "sigs.k8s.io/controller-runtime/pkg/conversion"

Expand Down Expand Up @@ -301,7 +301,7 @@ func Convert_v1alpha5_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(in *O
}

if in.APIServerPort != 0 {
out.APIServerPort = pointer.Int(in.APIServerPort)
out.APIServerPort = ptr.To(in.APIServerPort)
}

return nil
Expand Down Expand Up @@ -333,10 +333,10 @@ func Convert_v1beta1_PortOpts_To_v1alpha5_PortOpts(in *infrav1.PortOpts, out *Po

if in.Profile != nil {
out.Profile = make(map[string]string)
if pointer.BoolDeref(in.Profile.OVSHWOffload, false) {
if ptr.Deref(in.Profile.OVSHWOffload, false) {
(out.Profile)["capabilities"] = "[\"switchdev\"]"
}
if pointer.BoolDeref(in.Profile.TrustedVF, false) {
if ptr.Deref(in.Profile.TrustedVF, false) {
(out.Profile)["trusted"] = trueString
}
}
Expand Down Expand Up @@ -435,10 +435,10 @@ func Convert_v1alpha5_PortOpts_To_v1beta1_PortOpts(in *PortOpts, out *infrav1.Po

// Profile is now a struct in v1beta1.
if strings.Contains(in.Profile["capabilities"], "switchdev") {
out.Profile.OVSHWOffload = pointer.Bool(true)
out.Profile.OVSHWOffload = ptr.To(true)
}
if in.Profile["trusted"] == trueString {
out.Profile.TrustedVF = pointer.Bool(true)
out.Profile.TrustedVF = ptr.To(true)
}
return nil
}
Expand Down Expand Up @@ -608,21 +608,21 @@ func Convert_Map_string_To_Interface_To_v1beta1_BindingProfile(in map[string]str
for k, v := range in {
if k == "capabilities" {
if strings.Contains(v, "switchdev") {
out.OVSHWOffload = pointer.Bool(true)
out.OVSHWOffload = ptr.To(true)
}
}
if k == "trusted" && v == trueString {
out.TrustedVF = pointer.Bool(true)
out.TrustedVF = ptr.To(true)
}
}
return nil
}

func Convert_v1beta1_BindingProfile_To_Map_string_To_Interface(in *infrav1.BindingProfile, out map[string]string, _ conversion.Scope) error {
if pointer.BoolDeref(in.OVSHWOffload, false) {
if ptr.Deref(in.OVSHWOffload, false) {
(out)["capabilities"] = "[\"switchdev\"]"
}
if pointer.BoolDeref(in.TrustedVF, false) {
if ptr.Deref(in.TrustedVF, false) {
(out)["trusted"] = trueString
}
return nil
Expand Down
34 changes: 17 additions & 17 deletions api/v1alpha6/conversion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"
utilconversion "sigs.k8s.io/cluster-api/util/conversion"
"sigs.k8s.io/controller-runtime/pkg/conversion"

Expand Down Expand Up @@ -221,7 +221,7 @@ func TestNetworksToPorts(t *testing.T) {
Ports: []infrav1.PortOpts{
{
Network: &infrav1.NetworkParam{
ID: pointer.String(networkuuid),
ID: ptr.To(networkuuid),
},
},
},
Expand Down Expand Up @@ -282,12 +282,12 @@ func TestNetworksToPorts(t *testing.T) {
Ports: []infrav1.PortOpts{
{
Network: &infrav1.NetworkParam{
ID: pointer.String(networkuuid),
ID: ptr.To(networkuuid),
},
FixedIPs: []infrav1.FixedIP{
{
Subnet: &infrav1.SubnetParam{
ID: pointer.String(subnetuuid),
ID: ptr.To(subnetuuid),
},
},
},
Expand Down Expand Up @@ -326,7 +326,7 @@ func TestNetworksToPorts(t *testing.T) {
Ports: []infrav1.PortOpts{
{
Network: &infrav1.NetworkParam{
ID: pointer.String(networkuuid),
ID: ptr.To(networkuuid),
},
FixedIPs: []infrav1.FixedIP{
{
Expand Down Expand Up @@ -388,19 +388,19 @@ func TestNetworksToPorts(t *testing.T) {
Ports: []infrav1.PortOpts{
{
Network: &infrav1.NetworkParam{
ID: pointer.String(networkuuid),
ID: ptr.To(networkuuid),
},
FixedIPs: []infrav1.FixedIP{
{
Subnet: &infrav1.SubnetParam{
ID: pointer.String(subnetuuid),
ID: ptr.To(subnetuuid),
},
},
},
},
{
Network: &infrav1.NetworkParam{
ID: pointer.String(networkuuid),
ID: ptr.To(networkuuid),
},
FixedIPs: []infrav1.FixedIP{
{
Expand Down Expand Up @@ -465,7 +465,7 @@ func TestPortOptsConvertTo(t *testing.T) {
}
securityGroupFilterMerged := []infrav1.SecurityGroupParam{
{Filter: &infrav1.SecurityGroupFilter{Name: "one"}},
{ID: pointer.String("654cba")},
{ID: ptr.To("654cba")},
{ID: &uuids[0]},
{ID: &uuids[1]},
}
Expand All @@ -474,8 +474,8 @@ func TestPortOptsConvertTo(t *testing.T) {
"trusted": "true",
}
convertedPortProfile := infrav1.BindingProfile{
OVSHWOffload: pointer.Bool(true),
TrustedVF: pointer.Bool(true),
OVSHWOffload: ptr.To(true),
TrustedVF: ptr.To(true),
}

tests := []struct {
Expand Down Expand Up @@ -597,31 +597,31 @@ func TestMachineConversionControllerSpecFields(t *testing.T) {
{
name: "Set ProviderID",
modifyUp: func(up *infrav1.OpenStackMachine) {
up.Spec.ProviderID = pointer.String("new-provider-id")
up.Spec.ProviderID = ptr.To("new-provider-id")
},
testAfter: func(after *OpenStackMachine) {
g.Expect(after.Spec.ProviderID).To(gomega.Equal(pointer.String("new-provider-id")))
g.Expect(after.Spec.ProviderID).To(gomega.Equal(ptr.To("new-provider-id")))
},
expectNetworkDiff: false,
},
{
name: "Set InstanceID",
modifyUp: func(up *infrav1.OpenStackMachine) {
up.Status.InstanceID = pointer.String("new-instance-id")
up.Status.InstanceID = ptr.To("new-instance-id")
},
testAfter: func(after *OpenStackMachine) {
g.Expect(after.Spec.InstanceID).To(gomega.Equal(pointer.String("new-instance-id")))
g.Expect(after.Spec.InstanceID).To(gomega.Equal(ptr.To("new-instance-id")))
},
expectNetworkDiff: false,
},
{
name: "Set ProviderID and non-ignored change",
modifyUp: func(up *infrav1.OpenStackMachine) {
up.Spec.ProviderID = pointer.String("new-provider-id")
up.Spec.ProviderID = ptr.To("new-provider-id")
up.Spec.Flavor = "new-flavor"
},
testAfter: func(after *OpenStackMachine) {
g.Expect(after.Spec.ProviderID).To(gomega.Equal(pointer.String("new-provider-id")))
g.Expect(after.Spec.ProviderID).To(gomega.Equal(ptr.To("new-provider-id")))
g.Expect(after.Spec.Flavor).To(gomega.Equal("new-flavor"))
},
expectNetworkDiff: true,
Expand Down
4 changes: 2 additions & 2 deletions api/v1alpha6/openstackmachine_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package v1alpha6
import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
"sigs.k8s.io/cluster-api/errors"
)
Expand Down Expand Up @@ -184,7 +184,7 @@ func (r *OpenStackMachine) SetConditions(conditions clusterv1.Conditions) {
// SetFailure sets the OpenStackMachine status failure reason and failure message.
func (r *OpenStackMachine) SetFailure(failureReason errors.MachineStatusError, failureMessage error) {
r.Status.FailureReason = &failureReason
r.Status.FailureMessage = pointer.String(failureMessage.Error())
r.Status.FailureMessage = ptr.To(failureMessage.Error())
}

func init() {
Expand Down
14 changes: 7 additions & 7 deletions api/v1alpha6/types_conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"strings"

apiconversion "k8s.io/apimachinery/pkg/conversion"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"

infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
optional "sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/optional"
Expand Down Expand Up @@ -387,10 +387,10 @@ func Convert_v1beta1_PortOpts_To_v1alpha6_PortOpts(in *infrav1.PortOpts, out *Po

if in.Profile != nil {
out.Profile = make(map[string]string)
if pointer.BoolDeref(in.Profile.OVSHWOffload, false) {
if ptr.Deref(in.Profile.OVSHWOffload, false) {
(out.Profile)["capabilities"] = "[\"switchdev\"]"
}
if pointer.BoolDeref(in.Profile.TrustedVF, false) {
if ptr.Deref(in.Profile.TrustedVF, false) {
(out.Profile)["trusted"] = trueString
}
}
Expand All @@ -402,21 +402,21 @@ func Convert_Map_string_To_Interface_To_v1beta1_BindingProfile(in map[string]str
for k, v := range in {
if k == "capabilities" {
if strings.Contains(v, "switchdev") {
out.OVSHWOffload = pointer.Bool(true)
out.OVSHWOffload = ptr.To(true)
}
}
if k == "trusted" && v == trueString {
out.TrustedVF = pointer.Bool(true)
out.TrustedVF = ptr.To(true)
}
}
return nil
}

func Convert_v1beta1_BindingProfile_To_Map_string_To_Interface(in *infrav1.BindingProfile, out map[string]string, _ apiconversion.Scope) error {
if pointer.BoolDeref(in.OVSHWOffload, false) {
if ptr.Deref(in.OVSHWOffload, false) {
(out)["capabilities"] = "[\"switchdev\"]"
}
if pointer.BoolDeref(in.TrustedVF, false) {
if ptr.Deref(in.TrustedVF, false) {
(out)["trusted"] = trueString
}
return nil
Expand Down
14 changes: 7 additions & 7 deletions api/v1alpha7/conversion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"
utilconversion "sigs.k8s.io/cluster-api/util/conversion"
"sigs.k8s.io/controller-runtime/pkg/conversion"

Expand Down Expand Up @@ -201,31 +201,31 @@ func TestMachineConversionControllerSpecFields(t *testing.T) {
{
name: "Set ProviderID",
modifyUp: func(up *infrav1.OpenStackMachine) {
up.Spec.ProviderID = pointer.String("new-provider-id")
up.Spec.ProviderID = ptr.To("new-provider-id")
},
testAfter: func(g gomega.Gomega, after *OpenStackMachine) {
g.Expect(after.Spec.ProviderID).To(gomega.Equal(pointer.String("new-provider-id")))
g.Expect(after.Spec.ProviderID).To(gomega.Equal(ptr.To("new-provider-id")))
},
expectIdentityRefDiff: false,
},
{
name: "Set InstanceID",
modifyUp: func(up *infrav1.OpenStackMachine) {
up.Status.InstanceID = pointer.String("new-instance-id")
up.Status.InstanceID = ptr.To("new-instance-id")
},
testAfter: func(g gomega.Gomega, after *OpenStackMachine) {
g.Expect(after.Spec.InstanceID).To(gomega.Equal(pointer.String("new-instance-id")))
g.Expect(after.Spec.InstanceID).To(gomega.Equal(ptr.To("new-instance-id")))
},
expectIdentityRefDiff: false,
},
{
name: "Set ProviderID and non-ignored change",
modifyUp: func(up *infrav1.OpenStackMachine) {
up.Spec.ProviderID = pointer.String("new-provider-id")
up.Spec.ProviderID = ptr.To("new-provider-id")
up.Spec.Flavor = "new-flavor"
},
testAfter: func(g gomega.Gomega, after *OpenStackMachine) {
g.Expect(after.Spec.ProviderID).To(gomega.Equal(pointer.String("new-provider-id")))
g.Expect(after.Spec.ProviderID).To(gomega.Equal(ptr.To("new-provider-id")))
g.Expect(after.Spec.Flavor).To(gomega.Equal("new-flavor"))
},
expectIdentityRefDiff: true,
Expand Down
4 changes: 2 additions & 2 deletions api/v1alpha7/openstackmachine_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package v1alpha7
import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
"sigs.k8s.io/cluster-api/errors"
)
Expand Down Expand Up @@ -179,7 +179,7 @@ func (r *OpenStackMachine) SetConditions(conditions clusterv1.Conditions) {
// SetFailure sets the OpenStackMachine status failure reason and failure message.
func (r *OpenStackMachine) SetFailure(failureReason errors.MachineStatusError, failureMessage error) {
r.Status.FailureReason = &failureReason
r.Status.FailureMessage = pointer.String(failureMessage.Error())
r.Status.FailureMessage = ptr.To(failureMessage.Error())
}

func init() {
Expand Down
18 changes: 9 additions & 9 deletions api/v1beta1/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package v1beta1
import (
"strings"

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

// Hub marks OpenStackCluster as a conversion hub.
Expand Down Expand Up @@ -53,20 +53,20 @@ func LegacyCalicoSecurityGroupRules() []SecurityGroupRuleSpec {
return []SecurityGroupRuleSpec{
{
Name: "BGP (calico)",
Description: pointer.String("Created by cluster-api-provider-openstack API conversion - BGP (calico)"),
Description: ptr.To("Created by cluster-api-provider-openstack API conversion - BGP (calico)"),
Direction: "ingress",
EtherType: pointer.String("IPv4"),
PortRangeMin: pointer.Int(179),
PortRangeMax: pointer.Int(179),
Protocol: pointer.String("tcp"),
EtherType: ptr.To("IPv4"),
PortRangeMin: ptr.To(179),
PortRangeMax: ptr.To(179),
Protocol: ptr.To("tcp"),
RemoteManagedGroups: []ManagedSecurityGroupName{"controlplane", "worker"},
},
{
Name: "IP-in-IP (calico)",
Description: pointer.String("Created by cluster-api-provider-openstack API conversion - IP-in-IP (calico)"),
Description: ptr.To("Created by cluster-api-provider-openstack API conversion - IP-in-IP (calico)"),
Direction: "ingress",
EtherType: pointer.String("IPv4"),
Protocol: pointer.String("4"),
EtherType: ptr.To("IPv4"),
Protocol: ptr.To("4"),
RemoteManagedGroups: []ManagedSecurityGroupName{"controlplane", "worker"},
},
}
Expand Down
4 changes: 2 additions & 2 deletions api/v1beta1/openstackmachine_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package v1beta1
import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
"sigs.k8s.io/cluster-api/errors"

Expand Down Expand Up @@ -206,7 +206,7 @@ func (r *OpenStackMachine) SetConditions(conditions clusterv1.Conditions) {
// SetFailure sets the OpenStackMachine status failure reason and failure message.
func (r *OpenStackMachine) SetFailure(failureReason errors.MachineStatusError, failureMessage error) {
r.Status.FailureReason = &failureReason
r.Status.FailureMessage = pointer.String(failureMessage.Error())
r.Status.FailureMessage = ptr.To(failureMessage.Error())
}

func init() {
Expand Down
4 changes: 2 additions & 2 deletions api/v1beta1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package v1beta1

import (
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"

"sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/optional"
)
Expand Down Expand Up @@ -822,7 +822,7 @@ type APIServerLoadBalancer struct {
}

func (s *APIServerLoadBalancer) IsZero() bool {
return s == nil || ((s.Enabled == nil || !*s.Enabled) && len(s.AdditionalPorts) == 0 && len(s.AllowedCIDRs) == 0 && pointer.StringDeref(s.Provider, "") == "")
return s == nil || ((s.Enabled == nil || !*s.Enabled) && len(s.AdditionalPorts) == 0 && len(s.AllowedCIDRs) == 0 && ptr.Deref(s.Provider, "") == "")
}

func (s *APIServerLoadBalancer) IsEnabled() bool {
Expand Down
Loading