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

Jump to bottom

Feature: PowerVS cluster creation with dynamic resource creation #1608

Merged
merged 7 commits into from
Feb 29, 2024
Merged

Feature: PowerVS cluster creation with dynamic resource creation #1608

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0429ec9
api changes to support infra creation
Karthik-K-N Feb 28, 2024
0b8257d
controller changes to support infra creation
Karthik-K-N Feb 28, 2024
8544fcc
scope changes to create infra creation
Karthik-K-N Feb 28, 2024
521e015
package files changes to support infra creation
Karthik-K-N Feb 28, 2024
d6ee5ea
docs changes to support infra creation
Karthik-K-N Feb 28, 2024
4176e67
go module changes
Karthik-K-N Feb 28, 2024
825789b
Fix test failures
Karthik-K-N Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cloud/scope/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,5 +715,5 @@ func (s *ClusterScope) APIServerPort() int32 {
if s.Cluster.Spec.ClusterNetwork != nil && s.Cluster.Spec.ClusterNetwork.APIServerPort != nil {
return *s.Cluster.Spec.ClusterNetwork.APIServerPort
}
return 6443
return infrav1beta2.DefaultAPIServerPort
}
2 changes: 1 addition & 1 deletion cloud/scope/machine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,5 +528,5 @@ func (m *MachineScope) APIServerPort() int32 {
if m.Cluster.Spec.ClusterNetwork != nil && m.Cluster.Spec.ClusterNetwork.APIServerPort != nil {
return *m.Cluster.Spec.ClusterNetwork.APIServerPort
}
return 6443
return infrav1beta2.DefaultAPIServerPort
}
20 changes: 10 additions & 10 deletions cloud/scope/machine_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ func TestCreateVPCLoadBalancerPoolMember(t *testing.T) {
scope.IBMVPCMachine.Spec = vpcMachine.Spec
scope.IBMVPCMachine.Status = vpcMachine.Status
mockvpc.EXPECT().GetLoadBalancer(gomock.AssignableToTypeOf(&vpcv1.GetLoadBalancerOptions{})).Return(&vpcv1.LoadBalancer{}, &core.DetailedResponse{}, errors.New("Could not fetch LoadBalancer"))
_, err := scope.CreateVPCLoadBalancerPoolMember(&scope.IBMVPCMachine.Status.Addresses[0].Address, int64(6443))
_, err := scope.CreateVPCLoadBalancerPoolMember(&scope.IBMVPCMachine.Status.Addresses[0].Address, int64(infrav1beta2.DefaultAPIServerPort))
g.Expect(err).To(Not(BeNil()))
})
t.Run("Error when LoadBalancer is not active", func(t *testing.T) {
Expand All @@ -569,7 +569,7 @@ func TestCreateVPCLoadBalancerPoolMember(t *testing.T) {
ProvisioningStatus: core.StringPtr("pending"),
}
mockvpc.EXPECT().GetLoadBalancer(gomock.AssignableToTypeOf(&vpcv1.GetLoadBalancerOptions{})).Return(loadBalancer, &core.DetailedResponse{}, nil)
_, err := scope.CreateVPCLoadBalancerPoolMember(&scope.IBMVPCMachine.Status.Addresses[0].Address, int64(6443))
_, err := scope.CreateVPCLoadBalancerPoolMember(&scope.IBMVPCMachine.Status.Addresses[0].Address, int64(infrav1beta2.DefaultAPIServerPort))
g.Expect(err).To(Not(BeNil()))
})
t.Run("Error when no pool exist", func(t *testing.T) {
Expand All @@ -585,7 +585,7 @@ func TestCreateVPCLoadBalancerPoolMember(t *testing.T) {
Pools: []vpcv1.LoadBalancerPoolReference{},
}
mockvpc.EXPECT().GetLoadBalancer(gomock.AssignableToTypeOf(&vpcv1.GetLoadBalancerOptions{})).Return(loadBalancer, &core.DetailedResponse{}, nil)
_, err := scope.CreateVPCLoadBalancerPoolMember(&scope.IBMVPCMachine.Status.Addresses[0].Address, int64(6443))
_, err := scope.CreateVPCLoadBalancerPoolMember(&scope.IBMVPCMachine.Status.Addresses[0].Address, int64(infrav1beta2.DefaultAPIServerPort))
g.Expect(err).To(Not(BeNil()))
})
t.Run("Error when listing LoadBalancerPoolMembers", func(t *testing.T) {
Expand All @@ -597,7 +597,7 @@ func TestCreateVPCLoadBalancerPoolMember(t *testing.T) {
scope.IBMVPCMachine.Status = vpcMachine.Status
mockvpc.EXPECT().GetLoadBalancer(gomock.AssignableToTypeOf(&vpcv1.GetLoadBalancerOptions{})).Return(loadBalancer, &core.DetailedResponse{}, nil)
mockvpc.EXPECT().ListLoadBalancerPoolMembers(gomock.AssignableToTypeOf(&vpcv1.ListLoadBalancerPoolMembersOptions{})).Return(&vpcv1.LoadBalancerPoolMemberCollection{}, &core.DetailedResponse{}, errors.New("Failed to list LoadBalancerPoolMembers"))
_, err := scope.CreateVPCLoadBalancerPoolMember(&scope.IBMVPCMachine.Status.Addresses[0].Address, int64(6443))
_, err := scope.CreateVPCLoadBalancerPoolMember(&scope.IBMVPCMachine.Status.Addresses[0].Address, int64(infrav1beta2.DefaultAPIServerPort))
g.Expect(err).To(Not(BeNil()))
})
t.Run("PoolMember already exist", func(t *testing.T) {
Expand All @@ -610,7 +610,7 @@ func TestCreateVPCLoadBalancerPoolMember(t *testing.T) {
loadBalancerPoolMemberCollection := &vpcv1.LoadBalancerPoolMemberCollection{
Members: []vpcv1.LoadBalancerPoolMember{
{
Port: core.Int64Ptr(6443),
Port: core.Int64Ptr(int64(infrav1beta2.DefaultAPIServerPort)),
Target: &vpcv1.LoadBalancerPoolMemberTarget{
Address: core.StringPtr("192.168.1.1"),
},
Expand All @@ -619,7 +619,7 @@ func TestCreateVPCLoadBalancerPoolMember(t *testing.T) {
}
mockvpc.EXPECT().GetLoadBalancer(gomock.AssignableToTypeOf(&vpcv1.GetLoadBalancerOptions{})).Return(loadBalancer, &core.DetailedResponse{}, nil)
mockvpc.EXPECT().ListLoadBalancerPoolMembers(gomock.AssignableToTypeOf(&vpcv1.ListLoadBalancerPoolMembersOptions{})).Return(loadBalancerPoolMemberCollection, &core.DetailedResponse{}, nil)
_, err := scope.CreateVPCLoadBalancerPoolMember(&scope.IBMVPCMachine.Status.Addresses[0].Address, int64(6443))
_, err := scope.CreateVPCLoadBalancerPoolMember(&scope.IBMVPCMachine.Status.Addresses[0].Address, int64(infrav1beta2.DefaultAPIServerPort))
g.Expect(err).To(BeNil())
})
t.Run("Error when creating LoadBalancerPoolMember", func(t *testing.T) {
Expand All @@ -642,18 +642,18 @@ func TestCreateVPCLoadBalancerPoolMember(t *testing.T) {
scope := setupMachineScope(clusterName, machineName, mockvpc)
expectedOutput := &vpcv1.LoadBalancerPoolMember{
ID: core.StringPtr("foo-load-balancer-pool-member-id"),
Port: core.Int64Ptr(6443),
Port: core.Int64Ptr(int64(infrav1beta2.DefaultAPIServerPort)),
}
scope.IBMVPCMachine.Spec = vpcMachine.Spec
scope.IBMVPCMachine.Status = vpcMachine.Status
loadBalancerPoolMember := &vpcv1.LoadBalancerPoolMember{
ID: core.StringPtr("foo-load-balancer-pool-member-id"),
Port: core.Int64Ptr(6443),
Port: core.Int64Ptr(int64(infrav1beta2.DefaultAPIServerPort)),
}
mockvpc.EXPECT().GetLoadBalancer(gomock.AssignableToTypeOf(&vpcv1.GetLoadBalancerOptions{})).Return(loadBalancer, &core.DetailedResponse{}, nil)
mockvpc.EXPECT().ListLoadBalancerPoolMembers(gomock.AssignableToTypeOf(&vpcv1.ListLoadBalancerPoolMembersOptions{})).Return(&vpcv1.LoadBalancerPoolMemberCollection{}, &core.DetailedResponse{}, nil)
mockvpc.EXPECT().CreateLoadBalancerPoolMember(gomock.AssignableToTypeOf(&vpcv1.CreateLoadBalancerPoolMemberOptions{})).Return(loadBalancerPoolMember, &core.DetailedResponse{}, nil)
out, err := scope.CreateVPCLoadBalancerPoolMember(&scope.IBMVPCMachine.Status.Addresses[0].Address, int64(6443))
out, err := scope.CreateVPCLoadBalancerPoolMember(&scope.IBMVPCMachine.Status.Addresses[0].Address, int64(infrav1beta2.DefaultAPIServerPort))
g.Expect(err).To(BeNil())
require.Equal(t, expectedOutput, out)
})
Expand Down Expand Up @@ -702,7 +702,7 @@ func TestDeleteVPCLoadBalancerPoolMember(t *testing.T) {
Members: []vpcv1.LoadBalancerPoolMember{
{
ID: core.StringPtr("foo-lb-pool-member-id"),
Port: core.Int64Ptr(6443),
Port: core.Int64Ptr(int64(infrav1beta2.DefaultAPIServerPort)),
Target: &vpcv1.LoadBalancerPoolMemberTarget{
Address: core.StringPtr("192.168.1.1"),
},
Expand Down