Skip to content

Commit 246091f

Browse files
committed
Support setting DNS zone and domain in VpcNetworkConfiguration and NetworkInfo
1 parent 315ffc8 commit 246091f

File tree

5 files changed

+29
-1
lines changed

5 files changed

+29
-1
lines changed

build/yaml/crd/vpc/crd.nsx.vmware.com_networkinfos.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ spec:
2626
may reject unrecognized values.
2727
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2828
type: string
29+
dnsDomains:
30+
description: DNSDomains specifies the permitted DNS domain names in the
31+
namespace.
32+
items:
33+
type: string
34+
type: array
2935
kind:
3036
description: |-
3137
Kind is a string value representing the REST resource this object represents.
@@ -69,6 +75,7 @@ spec:
6975
type: object
7076
type: array
7177
required:
78+
- dnsDomains
7279
- vpcs
7380
type: object
7481
served: true

build/yaml/crd/vpc/crd.nsx.vmware.com_vpcnetworkconfigurations.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,12 @@ spec:
5757
Defaults to 32.
5858
maximum: 65536
5959
type: integer
60+
dnsZones:
61+
description: DNSZones specifies the list of permitted DNS zones, identified
62+
by their NSX paths.
63+
items:
64+
type: string
65+
type: array
6066
nsxProject:
6167
description: NSX Project the Namespace is associated with.
6268
type: string

pkg/apis/vpc/v1alpha1/networkinfo_types.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ type NetworkInfo struct {
2424
metav1.TypeMeta `json:",inline"`
2525
metav1.ObjectMeta `json:"metadata,omitempty"`
2626

27-
VPCs []VPCState `json:"vpcs"`
27+
VPCs []VPCState `json:"vpcs"`
28+
// DNSDomains specifies the permitted DNS domain names in the namespace.
29+
DNSDomains []string `json:"dnsDomains"`
2830
}
2931

3032
// +kubebuilder:object:root=true

pkg/apis/vpc/v1alpha1/vpcnetworkconfiguration_types.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ type VPCNetworkConfigurationSpec struct {
3737
// +kubebuilder:default=32
3838
// +kubebuilder:validation:Maximum:=65536
3939
DefaultSubnetSize int `json:"defaultSubnetSize,omitempty"`
40+
41+
// DNSZones specifies the list of permitted DNS zones, identified by their NSX paths.
42+
DNSZones []string `json:"dnsZones,omitempty"`
4043
}
4144

4245
// SharedSubnet defines the information for a Subnet shared with vSphere Namespace.

pkg/apis/vpc/v1alpha1/zz_generated.deepcopy.go

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

0 commit comments

Comments
 (0)