Skip to content

Commit 4c7fe79

Browse files
committed
Add ability to disable creation of dns zone for unmanaged installs
Similar to managed installs, add ability to optionally create DNS zones for unmanged installs.
1 parent 3625700 commit 4c7fe79

File tree

4 files changed

+18
-3
lines changed

4 files changed

+18
-3
lines changed

api/v1beta1/azurecluster_types.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ const (
2828

2929
// ClusterLabelNamespace indicates the namespace of the cluster.
3030
ClusterLabelNamespace = "azurecluster.infrastructure.cluster.x-k8s.io/cluster-namespace"
31+
32+
// PrivateDNSZoneModeSystem represents mode System for NetworkSpec.
33+
PrivateDNSZoneCreationModeSystem string = "System"
34+
35+
// PrivateDNSZoneModeNone represents mode None for NetworkSpec.
36+
PrivateDNSZoneiCreationModeNone string = "None"
3137
)
3238

3339
// AzureClusterSpec defines the desired state of AzureCluster.

api/v1beta1/types_class.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -459,6 +459,10 @@ type NetworkClassSpec struct {
459459
// +optional
460460
PrivateDNSZoneName string `json:"privateDNSZoneName,omitempty"`
461461

462+
// PrivateDNSZone enables private dns zone creation modes for private cluster.
463+
// +optional
464+
PrivateDNSZone *string `json:"privateDNSZone,omitempty"`
465+
462466
// PrivateDNSZoneResourceGroup defines the resource group to be used for Azure Private DNS Zone.
463467
// If not specified, the resource group of the cluster will be used to create the Azure Private DNS Zone.
464468
// +optional

api/v1beta1/zz_generated.deepcopy.go

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

azure/scope/cluster.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ func (s *ClusterScope) VNetSpec() azure.ASOResourceSpecGetter[*asonetworkv1api20
559559

560560
// PrivateDNSSpec returns the private dns zone spec.
561561
func (s *ClusterScope) PrivateDNSSpec() (zoneSpec azure.ResourceSpecGetter, linkSpec, recordSpec []azure.ResourceSpecGetter) {
562-
if s.IsAPIServerPrivate() {
562+
if s.IsAPIServerPrivate() && s.AzureCluster.Spec.NetworkSpec.PrivateDNSZone != ptr.To(infrav1.PrivateDNSZoneModeNone) {
563563
resourceGroup := s.ResourceGroup()
564564
if s.AzureCluster.Spec.NetworkSpec.PrivateDNSZoneResourceGroup != "" {
565565
resourceGroup = s.AzureCluster.Spec.NetworkSpec.PrivateDNSZoneResourceGroup

0 commit comments

Comments
 (0)