create the IBMCLoudPlatform type for use in the ingress operator

wking · Jan 17, 2020 · 1edb92e · 1edb92e
1 parent 0e2ff1e
commit 1edb92e
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 4 deletions.
diff --git a/config/v1/types_infrastructure.go b/config/v1/types_infrastructure.go
@@ -94,6 +94,20 @@ const (
 
 	// OvirtPlatformType represents oVirt/RHV infrastructure.
 	OvirtPlatformType PlatformType = "oVirt"
+
+	// IBMCloudPlatformType represents IBM Cloud infrastructure.
+	IBMCloudPlatformType PlatformType = "IBMCloud"
+)
+
+// IBMCloudProviderType is a specific supported IBM Cloud provider cluster type
+type IBMCloudProviderType string
+
+const (
+	// Classic  means that the IBM Cloud cluster is using classic infrastructure
+	IBMCloudProviderTypeClassic IBMCloudProviderType = "Classic"
+
+	// VPC means that the IBM Cloud cluster is using VPC infrastructure
+	IBMCloudProviderTypeVPC IBMCloudProviderType = "VPC"
 )
 
 // PlatformStatus holds the current status specific to the underlying infrastructure provider
@@ -255,6 +269,18 @@ type VSpherePlatformStatus struct {
 	NodeDNSIP string `json:"nodeDNSIP,omitempty"`
 }
 
+//IBMCloudPlatformStatus holds the current status of the IBMCloud infrastructure provider.
+type IBMCloudPlatformStatus struct {
+	// Location is where the cluster has been deployed
+	Location string `json:"location,omitempty"`
+
+	// ResourceGroupName is the Resource Group for new IBMCloud resources created for the cluster.
+	ResourceGroupName string `json:"resourceGroupName,omitempty"`
+
+	// ProviderType indicates the type of cluster that was created
+	ProviderType IBMCloudProviderType `json:"providerType,omitempty"`
+}
+
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // InfrastructureList is

diff --git a/config/v1/zz_generated.deepcopy.go b/config/v1/zz_generated.deepcopy.go
diff --git a/config/v1/zz_generated.swagger_doc_generated.go b/config/v1/zz_generated.swagger_doc_generated.go
diff --git a/operator/v1/0000_50_ingress-operator_00-custom-resource-definition.yaml b/operator/v1/0000_50_ingress-operator_00-custom-resource-definition.yaml
@@ -83,9 +83,10 @@ spec:
                 etc. \n If unset, the default is based on infrastructure.config.openshift.io/cluster
                 .status.platform: \n   AWS:      LoadBalancerService (with External
                 scope)   Azure:    LoadBalancerService (with External scope)   GCP:
-                \     LoadBalancerService (with External scope)   Libvirt:  HostNetwork
-                \n Any other platform types (including None) default to HostNetwork.
-                \n endpointPublishingStrategy cannot be updated."
+                \     LoadBalancerService (with External scope)   IBMCloud: LoadBalancerService
+                (with External scope)   Libvirt:  HostNetwork \n Any other platform
+                types (including None) default to HostNetwork. \n endpointPublishingStrategy
+                cannot be updated."
               type: object
               required:
               - type

diff --git a/operator/v1/types_ingress.go b/operator/v1/types_ingress.go
@@ -75,6 +75,7 @@ type IngressControllerSpec struct {
 	//   AWS:      LoadBalancerService (with External scope)
 	//   Azure:    LoadBalancerService (with External scope)
 	//   GCP:      LoadBalancerService (with External scope)
+	//   IBMCloud: LoadBalancerService (with External scope)
 	//   Libvirt:  HostNetwork
 	//
 	// Any other platform types (including None) default to HostNetwork.

diff --git a/operator/v1/zz_generated.swagger_doc_generated.go b/operator/v1/zz_generated.swagger_doc_generated.go