Merge pull request #216 from wking/install-config-drop-dns-server

openshift-merge-robot · web-flow · commit 44bedfeff82e · 2018-09-06T10:30:41.000-07:00
pkg/types/installconfig: Drop DNSServer
diff --git a/Documentation/design/installconfig.md b/Documentation/design/installconfig.md
@@ -128,8 +128,6 @@ type LibvirtNetwork struct {
     Name string `json:"name"`
     // IfName is the name of the network interface.
     IfName string `json:"if"`
-    // DNSServer is the name of the DNS server.
-    DNSServer string `json:"resolver"`
     // IPRange is the range of IPs to use.
     IPRange string `json:"ipRange"`
 }
diff --git a/pkg/asset/installconfig/installconfig_test.go b/pkg/asset/installconfig/installconfig_test.go
@@ -87,8 +87,7 @@ func TestInstallConfigGenerate(t *testing.T) {
     network:
       if: ""
       ipRange: ""
-      name: ""
-      resolver: ""`,
+      name: ""`,
 		},
 	}
 	for _, tc := range cases {
diff --git a/pkg/types/installconfig.go b/pkg/types/installconfig.go
@@ -107,8 +107,6 @@ type LibvirtNetwork struct {
 	Name string `json:"name"`
 	// IfName is the name of the network interface.
 	IfName string `json:"if"`
-	// DNSServer is the name of the DNS server.
-	DNSServer string `json:"resolver"`
 	// IPRange is the range of IPs to use.
 	IPRange string `json:"ipRange"`
 }

Original file line number	Diff line number	Diff line change
`@@ -128,8 +128,6 @@ type LibvirtNetwork struct {`
`128`	`128`	Name string `json:"name"`
`129`	`129`	`// IfName is the name of the network interface.`
`130`	`130`	IfName string `json:"if"`
`131`		`- // DNSServer is the name of the DNS server.`
`132`		- DNSServer string `json:"resolver"`
`133`	`131`	`// IPRange is the range of IPs to use.`
`134`	`132`	IPRange string `json:"ipRange"`
`135`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,8 +107,6 @@ type LibvirtNetwork struct {`
`107`	`107`	Name string `json:"name"`
`108`	`108`	`// IfName is the name of the network interface.`
`109`	`109`	IfName string `json:"if"`
`110`		`- // DNSServer is the name of the DNS server.`
`111`		- DNSServer string `json:"resolver"`
`112`	`110`	`// IPRange is the range of IPs to use.`
`113`	`111`	IPRange string `json:"ipRange"`
`114`	`112`	`}`