Skip to content

OCPBUGS-63065: Expand Azure userTags to support Azure Government Cloud #10015

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

OCPBUGS-63065: Expand Azure userTags to support Azure Government Cloud #10015

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
14 changes: 10 additions & 4 deletions pkg/types/azure/validation/platform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@ var (
// https://github.com/openshift/api/blob/e82a99f5bc64c2bf8549da559a6f37ccaf7d3af6/config/v1/types_infrastructure.go#L483-L490
const maxUserTagLimit = 10

// isUserTagsAllowed returns true if the cloud environment supports userTags.
// userTags are supported on PublicCloud and USGovernmentCloud.
func isUserTagsAllowed(cloudName azure.CloudEnvironment) bool {
return cloudName == azure.PublicCloud || cloudName == azure.USGovernmentCloud
}

// ValidatePlatform checks that the specified platform is valid.
func ValidatePlatform(p *azure.Platform, publish types.PublishingStrategy, fldPath *field.Path, ic *types.InstallConfig) field.ErrorList {
allErrs := field.ErrorList{}
Expand Down Expand Up @@ -108,10 +114,10 @@ func ValidatePlatform(p *azure.Platform, publish types.PublishingStrategy, fldPa
allErrs = append(allErrs, validateCustomerManagedKeys(p.CloudName, *p.CustomerManagedKey, fldPath.Child("customerManagedKey"))...)
}

// support for Azure user-defined tags made available through
// RFE-2017 is for AzurePublicCloud only.
if p.CloudName != azure.PublicCloud && len(p.UserTags) > 0 {
allErrs = append(allErrs, field.Forbidden(fldPath.Child("userTags"), fmt.Sprintf("userTags support is for %s only", azure.PublicCloud)))
// support for Azure user-defined tags
// is for AzurePublicCloud and USGovernmentCloud only.
if !isUserTagsAllowed(p.CloudName) && len(p.UserTags) > 0 {
allErrs = append(allErrs, field.Forbidden(fldPath.Child("userTags"), "userTags support is for PublicCloud and USGovernmentCloud only"))
}
// check if configured userTags are valid.
allErrs = append(allErrs, validateUserTags(p.UserTags, fldPath.Child("userTags"))...)
Expand Down