add type to type_ingress.go & make update

Signed-off-by: xiayu.lyt <xiayu.lyt@alibaba-inc.com>
OlivierCazade · Sep 7, 2021 · e57b88c · e57b88c
1 parent 6774fb2
commit e57b88c
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 23 deletions.
diff --git a/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml b/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml
@@ -179,22 +179,34 @@ spec:
                       type: object
                       properties:
                         region:
-                          description: region specifics the Alibaba Cloud region where the cluster in.
+                          description: region specifies the region for Alibaba Cloud resources created for the cluster.
                           type: string
                         resourceGroupID:
                           description: resourceGroupID is the ID of the resource group for the cluster.
                           type: string
                         resourceTags:
                           description: resourceTags is a list of additional tags to apply to Alibaba Cloud resources created for the cluster.
                           type: array
+                          maxItems: 20
                           items:
-                            description: AlibabaCloudResourceTag is the set of tags to add to apply to resources
+                            description: AlibabaCloudResourceTag is the set of tags to add to apply to resources.
                             type: object
+                            required:
+                              - Key
+                              - Value
                             properties:
-                              key:
+                              Key:
+                                description: key is the key of the tag.
                                 type: string
-                              value:
+                                maxLength: 128
+                                minLength: 1
+                                pattern: ^(?!aliyun)(?!acs:)(?!(.*https://.*))(?!(.*http://.*)).*$
+                              Value:
+                                description: value is the value of the tag.
                                 type: string
+                                maxLength: 128
+                                minLength: 1
+                                pattern: ^(?!aliyun)(?!acs:)(?!(.*https://.*))(?!(.*http://.*)).*$
                     aws:
                       description: AWS contains settings specific to the Amazon Web Services infrastructure provider.
                       type: object

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-ingresscontroller.crd.yaml b/operator/v1/0000_50_ingress-operator_00-ingresscontroller.crd.yaml
@@ -132,10 +132,11 @@ spec:
                 description: "endpointPublishingStrategy is used to publish the ingress
                   controller endpoints to other networks, enable load balancer integrations,
                   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)   IBMCloud: LoadBalancerService
-                  (with External scope)   Libvirt:  HostNetwork \n Any other platform
+                  .status.platform: \n   AWS:          LoadBalancerService (with External
+                  scope)   Azure:        LoadBalancerService (with External scope)
+                  \  GCP:          LoadBalancerService (with External scope)   IBMCloud:
+                  \    LoadBalancerService (with External scope)   AlibabaCloud: LoadBalancerService
+                  (with External scope)   Libvirt:      HostNetwork \n Any other platform
                   types (including None) default to HostNetwork. \n endpointPublishingStrategy
                   cannot be updated."
                 properties:

diff --git a/operator/v1/types_ingress.go b/operator/v1/types_ingress.go
@@ -87,11 +87,12 @@ type IngressControllerSpec struct {
 	// If unset, the default is based on
 	// infrastructure.config.openshift.io/cluster .status.platform:
 	//
-	//   AWS:      LoadBalancerService (with External scope)
-	//   Azure:    LoadBalancerService (with External scope)
-	//   GCP:      LoadBalancerService (with External scope)
-	//   IBMCloud: LoadBalancerService (with External scope)
-	//   Libvirt:  HostNetwork
+	//   AWS:          LoadBalancerService (with External scope)
+	//   Azure:        LoadBalancerService (with External scope)
+	//   GCP:          LoadBalancerService (with External scope)
+	//   IBMCloud:     LoadBalancerService (with External scope)
+	//   AlibabaCloud: LoadBalancerService (with External scope)
+	//   Libvirt:      HostNetwork
 	//
 	// Any other platform types (including None) default to HostNetwork.
 	//
@@ -356,13 +357,14 @@ type ProviderLoadBalancerParameters struct {
 type LoadBalancerProviderType string
 
 const (
-	AWSLoadBalancerProvider       LoadBalancerProviderType = "AWS"
-	AzureLoadBalancerProvider     LoadBalancerProviderType = "Azure"
-	GCPLoadBalancerProvider       LoadBalancerProviderType = "GCP"
-	OpenStackLoadBalancerProvider LoadBalancerProviderType = "OpenStack"
-	VSphereLoadBalancerProvider   LoadBalancerProviderType = "VSphere"
-	IBMLoadBalancerProvider       LoadBalancerProviderType = "IBM"
-	BareMetalLoadBalancerProvider LoadBalancerProviderType = "BareMetal"
+	AWSLoadBalancerProvider          LoadBalancerProviderType = "AWS"
+	AzureLoadBalancerProvider        LoadBalancerProviderType = "Azure"
+	GCPLoadBalancerProvider          LoadBalancerProviderType = "GCP"
+	OpenStackLoadBalancerProvider    LoadBalancerProviderType = "OpenStack"
+	VSphereLoadBalancerProvider      LoadBalancerProviderType = "VSphere"
+	IBMLoadBalancerProvider          LoadBalancerProviderType = "IBM"
+	BareMetalLoadBalancerProvider    LoadBalancerProviderType = "BareMetal"
+	AlibabaCloudLoadBalancerProvider LoadBalancerProviderType = "AlibabaCloud"
 )
 
 // AWSLoadBalancerParameters provides configuration settings that are

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