Skip to content

Bug 2033536: Alibaba infrastructure config: Updating kube validation on optional s… #1088

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
openshift-merge-robot merged 1 commit into from
Dec 17, 2021
Merged

Bug 2033536: Alibaba infrastructure config: Updating kube validation on optional s… #1088

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
2 changes: 1 addition & 1 deletion config/v1/0000_10_config-operator_01_infrastructure.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ spec:
resourceGroupID:
description: resourceGroupID is the ID of the resource group for the cluster.
type: string
pattern: ^rg-[0-9A-Za-z]+$
pattern: ^(rg-[0-9A-Za-z]+)?$
resourceTags:
description: resourceTags is a list of additional tags to apply to Alibaba Cloud resources created for the cluster.
type: array
Expand Down
2 changes: 1 addition & 1 deletion config/v1/types_infrastructure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@ type AlibabaCloudPlatformStatus struct {
// +required
Region string `json:"region"`
// resourceGroupID is the ID of the resource group for the cluster.
// +kubebuilder:validation:Pattern=`^rg-[0-9A-Za-z]+$`
// +kubebuilder:validation:Pattern=`^(rg-[0-9A-Za-z]+)?$`
Copy link
Copy Markdown
Author

@kwoodson kwoodson Dec 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This allows the string to be empty in cases where it gets defaults to "".

// +optional
ResourceGroupID string `json:"resourceGroupID,omitempty"`
// resourceTags is a list of additional tags to apply to Alibaba Cloud resources created for the cluster.
Expand Down