Skip to content

Commit

Permalink
Rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
@Karthik-K-N
Karthik-K-N committed Jan 17, 2024
1 parent fca9f81 commit e3a9a29
Show file tree
Hide file tree
Showing 5 changed files with 174 additions and 73 deletions.
4 changes: 4 additions & 0 deletions api/v1beta1/ibmvpc_conversion.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,3 +215,7 @@ func Convert_Slice_Pointer_v1beta2_IBMVPCResourceReference_To_Slice_Pointer_stri
}
return nil
}

func Convert_v1beta2_VPCLoadBalancerSpec_To_v1beta1_VPCLoadBalancerSpec(in *infrav1beta2.VPCLoadBalancerSpec, out *VPCLoadBalancerSpec, s apiconversion.Scope) error {
return autoConvert_v1beta2_VPCLoadBalancerSpec_To_v1beta1_VPCLoadBalancerSpec(in, out, s)
}
24 changes: 12 additions & 12 deletions api/v1beta1/zz_generated.conversion.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 22 additions & 13 deletions api/v1beta2/ibmpowervscluster_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,32 +89,41 @@ type IBMPowerVSClusterSpec struct {
CosBucket *CosBucket `json:"cosBucket,omitempty"`
}

// ResourceReference identifies a resource with id.
type ResourceReference struct {
// id represents the id of the resource.
ID *string `json:"id,omitempty"`
// +kubebuilder:default=false
// controllerCreated indicates whether the resource is created by the controller.
ControllerCreated *bool `json:"controllerCreated,omitempty"`
}

// IBMPowerVSClusterStatus defines the observed state of IBMPowerVSCluster.
type IBMPowerVSClusterStatus struct {
// ready is true when the provider resource is ready.
// +kubebuilder:default=false
Ready bool `json:"ready"`

// serviceInstanceID is the reference to the Power VS service on which the server instance(VM) will be created.
ServiceInstanceID *string `json:"serviceInstanceID,omitempty"`
// serviceInstance is the reference to the Power VS service on which the server instance(VM) will be created.
ServiceInstance *ResourceReference `json:"serviceInstance,omitempty"`

// networkID is the reference to the Power VS network to use for this cluster.
NetworkID *string `json:"networkID,omitempty"`
Network *ResourceReference `json:"network,omitempty"`

// dhcpServerID is the reference to the Power VS DHCP server.
DHCPServerID *string `json:"dhcpServerID,omitempty"`
// dhcpServer is the reference to the Power VS DHCP server.
DHCPServer *ResourceReference `json:"dhcpServer,omitempty"`

// vpcID is reference to IBM Cloud VPC resources.
VPCID *string `json:"vpcID,omitempty"`
// vpc is reference to IBM Cloud VPC resources.
VPC *ResourceReference `json:"vpc,omitempty"`

// vpcSubnetID is reference to IBM Cloud VPC subnet.
VPCSubnetID *string `json:"vpcSubnetID,omitempty"`
// vpcSubnet is reference to IBM Cloud VPC subnet.
VPCSubnet *ResourceReference `json:"vpcSubnet,omitempty"`

// transitGatewayID is reference to IBM Cloud TransitGateway.
TransitGatewayID *string `json:"transitGatewayID,omitempty"`
// transitGateway is reference to IBM Cloud TransitGateway.
TransitGateway *ResourceReference `json:"transitGateway,omitempty"`

// cosBucketID is reference to IBM Cloud COS Bucket resource.
COSBucketID *string `json:"cosBucketID,omitempty"`
// cosBucket is reference to IBM Cloud COS Bucket resource.
COSBucket *ResourceReference `json:"cosBucket,omitempty"`

// loadBalancers reference to IBM Cloud VPC Loadbalancer.
LoadBalancers []VPCLoadBalancerStatus `json:"loadBalancers,omitempty"`
Expand Down
81 changes: 53 additions & 28 deletions api/v1beta2/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

103 changes: 83 additions & 20 deletions config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsclusters.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -363,12 +363,30 @@ spec:
- type
type: object
type: array
cosBucketID:
description: cosBucketID is reference to IBM Cloud COS Bucket resource.
type: string
dhcpServerID:
description: dhcpServerID is the reference to the Power VS DHCP server.
type: string
cosBucket:
description: cosBucket is reference to IBM Cloud COS Bucket resource.
properties:
controllerCreated:
default: false
description: controllerCreated indicates whether the resource
is created by the controller.
type: boolean
id:
description: id represents the id of the resource.
type: string
type: object
dhcpServer:
description: dhcpServer is the reference to the Power VS DHCP server.
properties:
controllerCreated:
default: false
description: controllerCreated indicates whether the resource
is created by the controller.
type: boolean
id:
description: id represents the id of the resource.
type: string
type: object
loadBalancers:
description: loadBalancers reference to IBM Cloud VPC Loadbalancer.
items:
Expand All @@ -384,27 +402,72 @@ spec:
type: string
type: object
type: array
networkID:
network:
description: networkID is the reference to the Power VS network to
use for this cluster.
type: string
properties:
controllerCreated:
default: false
description: controllerCreated indicates whether the resource
is created by the controller.
type: boolean
id:
description: id represents the id of the resource.
type: string
type: object
ready:
default: false
description: ready is true when the provider resource is ready.
type: boolean
serviceInstanceID:
description: serviceInstanceID is the reference to the Power VS service
serviceInstance:
description: serviceInstance is the reference to the Power VS service
on which the server instance(VM) will be created.
type: string
transitGatewayID:
description: transitGatewayID is reference to IBM Cloud TransitGateway.
type: string
vpcID:
description: vpcID is reference to IBM Cloud VPC resources.
type: string
vpcSubnetID:
description: vpcSubnetID is reference to IBM Cloud VPC subnet.
type: string
properties:
controllerCreated:
default: false
description: controllerCreated indicates whether the resource
is created by the controller.
type: boolean
id:
description: id represents the id of the resource.
type: string
type: object
transitGateway:
description: transitGateway is reference to IBM Cloud TransitGateway.
properties:
controllerCreated:
default: false
description: controllerCreated indicates whether the resource
is created by the controller.
type: boolean
id:
description: id represents the id of the resource.
type: string
type: object
vpc:
description: vpc is reference to IBM Cloud VPC resources.
properties:
controllerCreated:
default: false
description: controllerCreated indicates whether the resource
is created by the controller.
type: boolean
id:
description: id represents the id of the resource.
type: string
type: object
vpcSubnet:
description: vpcSubnet is reference to IBM Cloud VPC subnet.
properties:
controllerCreated:
default: false
description: controllerCreated indicates whether the resource
is created by the controller.
type: boolean
id:
description: id represents the id of the resource.
type: string
type: object
required:
- ready
type: object
Expand Down

0 comments on commit e3a9a29

Please sign in to comment.