Skip to content

config: Azure Stack Hub support #860

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
Jun 16, 2021
Merged

config: Azure Stack Hub support #860

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
5 changes: 5 additions & 0 deletions 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 @@ -304,6 +304,10 @@ spec:
provider.
type: object
properties:
armEndpoint:
description: armEndpoint specifies a URL to use for resource
management in non-soverign clouds such as Azure Stack.
type: string
cloudName:
description: cloudName is the name of the Azure cloud environment
which can be used to configure the Azure SDK with the appropriate
Expand All @@ -315,6 +319,7 @@ spec:
- AzureUSGovernmentCloud
- AzureChinaCloud
- AzureGermanCloud
- AzureStackCloud
networkResourceGroupName:
description: networkResourceGroupName is the Resource Group
for network resources like the Virtual Network and Subnets
Expand Down
9 changes: 8 additions & 1 deletion config/v1/types_infrastructure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,10 +362,14 @@ type AzurePlatformStatus struct {
// If empty, the value is equal to `AzurePublicCloud`.
// +optional
CloudName AzureCloudEnvironment `json:"cloudName,omitempty"`

// armEndpoint specifies a URL to use for resource management in non-soverign clouds such as Azure Stack.
// +optional
ARMEndpoint string `json:"armEndpoint,omitempty"`
}

// AzureCloudEnvironment is the name of the Azure cloud environment
// +kubebuilder:validation:Enum="";AzurePublicCloud;AzureUSGovernmentCloud;AzureChinaCloud;AzureGermanCloud
// +kubebuilder:validation:Enum="";AzurePublicCloud;AzureUSGovernmentCloud;AzureChinaCloud;AzureGermanCloud;AzureStackCloud
type AzureCloudEnvironment string

const (
Expand All @@ -380,6 +384,9 @@ const (

// AzureGermanCloud is the Azure cloud environment used in Germany.
AzureGermanCloud AzureCloudEnvironment = "AzureGermanCloud"

// AzureStackCloud is the Azure cloud environment used at the edge and on premises.
AzureStackCloud AzureCloudEnvironment = "AzureStackCloud"
)

// GCPPlatformSpec holds the desired state of the Google Cloud Platform infrastructure provider.
Expand Down
1 change: 1 addition & 0 deletions config/v1/zz_generated.swagger_doc_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions operator/v1/0000_70_dns-operator_00-custom-resource-definition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,13 @@ spec:
type: string
tolerations:
description: "tolerations is a list of tolerations applied to
DNS pods. \n If empty, the operator sets a toleration for the
\"node-role.kubernetes.io/master\" taint. This default is subject
to change. Specifying tolerations without including a toleration
for the \"node-role.kubernetes.io/master\" taint may be risky
as it could lead to an outage if all worker nodes become unavailable.
\n Note that the daemon controller adds some tolerations as
well. See https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/"
DNS pods. \n If empty, the DNS operator sets a toleration for
the \"node-role.kubernetes.io/master\" taint. This default
is subject to change. Specifying tolerations without including
a toleration for the \"node-role.kubernetes.io/master\" taint
may be risky as it could lead to an outage if all worker nodes
become unavailable. \n Note that the daemon controller adds
some tolerations as well. See https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/"
type: array
items:
description: The pod this Toleration is attached to tolerates
Expand Down