Skip to content

Commit d9303e4

Browse files
committed
Replace CloudProvided with Default
1 parent 0501eab commit d9303e4

File tree

5 files changed

+24
-22
lines changed

5 files changed

+24
-22
lines changed

config/v1/0000_10_config-operator_01_infrastructure-TechPreviewNoUpgrade.crd.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -468,15 +468,15 @@ spec:
468468
properties:
469469
dnsConfig:
470470
default:
471-
provider: CloudProvided
471+
provider: Default
472472
description: dnsConfig contains information about the type of DNS solution in use for the cluster.
473473
properties:
474474
provider:
475-
default: CloudProvided
476-
description: provider determines which DNS solution is in use for this cluster. When the user wants to use their own DNS solution, the `provider` is set to "UserAndClusterProvided". When the cluster configures the cloud DNS, this field is set to "CloudProvided". The default is "CloudProvided".
475+
default: Default
476+
description: provider determines which DNS solution is in use for this cluster. When the user wants to use their own DNS solution, the `provider` is set to "UserAndClusterProvided". When the cluster's DNS solution is the default for IPI or UPI, then `provider` is set to "Default" which is also its default value.
477477
enum:
478478
- UserAndClusterProvided
479-
- CloudProvided
479+
- Default
480480
type: string
481481
x-kubernetes-validations:
482482
- message: type is immutable once set

config/v1/types_infrastructure.go

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -481,8 +481,8 @@ type AWSPlatformStatus struct {
481481

482482
// dnsConfig contains information about the type of DNS solution in use
483483
// for the cluster.
484-
// +default={"provider": "CloudProvided"}
485-
// +kubebuilder:default={"provider": "CloudProvided"}
484+
// +default={"provider": "Default"}
485+
// +kubebuilder:default={"provider": "Default"}
486486
// +openshift:enable:FeatureSets=TechPreviewNoUpgrade
487487
// +optional
488488
DNSConfig *DNSConfigurationType `json:"dnsConfig,omitempty"`
@@ -513,13 +513,13 @@ type AWSResourceTag struct {
513513
// +union
514514
type DNSConfigurationType struct {
515515
// provider determines which DNS solution is in use for this cluster.
516-
// When the user wants to use their own DNS solution, the `provider` is set to
517-
// "UserAndClusterProvided".
518-
// When the cluster configures the cloud DNS, this field is set to
519-
// "CloudProvided". The default is "CloudProvided".
520-
// +default="CloudProvided"
521-
// +kubebuilder:default:="CloudProvided"
522-
// +kubebuilder:validation:Enum="UserAndClusterProvided";"CloudProvided"
516+
// When the user wants to use their own DNS solution, the `provider`
517+
// is set to "UserAndClusterProvided".
518+
// When the cluster's DNS solution is the default for IPI or UPI, then
519+
// `provider` is set to "Default" which is also its default value.
520+
// +default="Default"
521+
// +kubebuilder:default:="Default"
522+
// +kubebuilder:validation:Enum="UserAndClusterProvided";"Default"
523523
// +kubebuilder:validation:Required
524524
// +kubebuilder:validation:XValidation:rule="oldSelf == '' || self == oldSelf",message="type is immutable once set"
525525
// +unionDiscriminator
@@ -532,10 +532,12 @@ type DNSProviderType string
532532

533533
const (
534534
// DNSUserAndClusterProvided indicates that the user configures DNS for API and API-Int.
535+
// The cluster handles some of its in-cluster DNS needs without user intervention.
535536
DNSUserAndClusterProvided DNSProviderType = "UserAndClusterProvided"
536537

537-
// DNSCloudProvided indicates that the cluster configures DNS for API and API-Int.
538-
DNSCloudProvided DNSProviderType = "CloudProvided"
538+
// DNSDefault indicates the cluster's default way of handling DNS configuration.
539+
// This refers to the default DNS configuration expected for both IPI and UPI installs.
540+
DNSDefault DNSProviderType = "Default"
539541
)
540542

541543
// AzurePlatformSpec holds the desired state of the Azure infrastructure provider.

config/v1/zz_generated.swagger_doc_generated.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

openapi/generated_openapi/zz_generated.openapi.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

openapi/openapi.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4173,7 +4173,7 @@
41734173
"dnsConfig": {
41744174
"description": "dnsConfig contains information about the type of DNS solution in use for the cluster.",
41754175
"default": {
4176-
"provider": "CloudProvided"
4176+
"provider": "Default"
41774177
},
41784178
"$ref": "#/definitions/com.github.openshift.api.config.v1.DNSConfigurationType"
41794179
},
@@ -5724,9 +5724,9 @@
57245724
"type": "object",
57255725
"properties": {
57265726
"provider": {
5727-
"description": "provider determines which DNS solution is in use for this cluster. When the user wants to use their own DNS solution, the `provider` is set to \"UserAndClusterProvided\". When the cluster configures the cloud DNS, this field is set to \"CloudProvided\". The default is \"CloudProvided\".",
5727+
"description": "provider determines which DNS solution is in use for this cluster. When the user wants to use their own DNS solution, the `provider` is set to \"UserAndClusterProvided\". When the cluster's DNS solution is the default for IPI or UPI, then `provider` is set to \"Default\" which is also its default value.",
57285728
"type": "string",
5729-
"default": "CloudProvided"
5729+
"default": "Default"
57305730
}
57315731
},
57325732
"x-kubernetes-unions": [

0 commit comments

Comments
 (0)