Switch from defaulting to converting clusterNetworkCIDR

[smarterclayton]

Fixes break. On disk, deprecated fields override the first value in
the clusterNetworks array if specified. When writing out, the deprecated
fields are set to the first value of the network CIDR.

Fixes #16627

This fixes oc cluster up. @csrwng @JacobTanenbaum

[mfojtik]

/lgtm

verified this fixed that oc cluster up issue.

[openshift-bot]

/retest

Please review the full test history for this PR and help us cut down flakes.

[JacobTanenbaum]

lgtm

[csrwng]

Tested and works for me as well
/lgtm

However, oc cluster up won't start with a config that was created with a v3.6.0 server. Not related to this issue, but if possible we should have defaults that work.

F1003 13:52:52.932242    5308 start_allinone.go:100] 
Server could not start: Couldn't init admission plugin "openshift.io/ImagePolicy": [
openshift.io/ImagePolicy.resolutionRules[0].policy: 
Required value: a policy must be specified for this resource, 
openshift.io/ImagePolicy.resolutionRules[1].policy: 
Required value: a policy must be specified for this resource, 
openshift.io/ImagePolicy.resolutionRules[2].policy: 
Required value: a policy must be specified for this resource, 
openshift.io/ImagePolicy.resolutionRules[3].policy: 
Required value: a policy must be specified for this resource, 
openshift.io/ImagePolicy.resolutionRules[4].policy: 
Required value: a policy must be specified for this resource]

@mfojtik

[openshift-merge-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: csrwng, mfojtik, smarterclayton

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

• pkg/cmd/OWNERS [mfojtik,smarterclayton]

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

[smarterclayton]

We have defaulting for those but it's only if the full resolution rules weren't written out. We didn't default them because it might break a user who customized that field. Hrm

…

On Tue, Oct 3, 2017 at 9:58 AM, OpenShift Merge Robot < ***@***.***> wrote: [APPROVALNOTIFIER] This PR is *APPROVED* This pull-request has been approved by: *csrwng <#16649 (comment)>*, *mfojtik <#16649 (comment)>*, *smarterclayton <#16649#>* The full list of commands accepted by this bot can be found here <https://github.com/kubernetes/test-infra/blob/master/commands.md>. Needs approval from an approver in each of these OWNERS Files: - pkg/cmd/OWNERS <https://github.com/openshift/origin/blob/master/pkg/cmd/OWNERS> [mfojtik,smarterclayton] You can indicate your approval by writing /approve in a comment You can cancel your approval by writing /approve cancel in a comment — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#16649 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ABG_pyBra0W_w5BmVTCMZPDw0LqSxJrSks5soj2igaJpZM4Prgfo> .

[openshift-merge-robot]

/test all [submit-queue is verifying that this PR is safe to merge]

[openshift-merge-robot]

Automatic merge from submit-queue (batch tested with PRs 16644, 16649, 16656, 16651, 16663).

[openshift-ci-robot]

@smarterclayton: The following tests failed, say /retest to rerun them all:

Test name	Commit	Details	Rerun command
ci/openshift-jenkins/integration	a5f3a43	link	/test integration
ci/openshift-jenkins/extended_conformance_install_update	a5f3a43	link	/test extended_conformance_install_update

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.