LOG-3228: fix validation on empty spec

[jcantrill]

This PR:

fixes a merge issue where we always validate against an empty spec which causes logging to never deploy
Links
https://issues.redhat.com/browse/LOG-3228
forward pick of #1801

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jcantrill

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

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [jcantrill]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[jcantrill]

/cherrypick master

[openshift-cherrypick-robot]

@jcantrill: once the present PR merges, I will cherry-pick it on top of master in a new PR and assign it to you.

In response to this:

/cherrypick master

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.

[openshift-ci]

@jcantrill: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-ocp-next	adaf7de	link	false	/test e2e-ocp-next
ci/prow/e2e-ocp-previous	adaf7de	link	false	/test e2e-ocp-previous

Full PR test history. Your PR dashboard.

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.

[jcantrill]

/hold

[jcantrill]

/hold cancel

[cahartma]

/lgtm

[openshift-cherrypick-robot]

@jcantrill: #1802 failed to apply on top of branch "master":

Applying: LOG-3342: fix validation on empty spec
Using index info to reconstruct a base tree...
M	internal/k8shandler/forwarding_test.go
M	internal/migrations/migrate_clusterlogforwarder.go
M	internal/migrations/migrate_clusterlogforwarder_test.go
Falling back to patching base and 3-way merge...
Auto-merging internal/migrations/migrate_clusterlogforwarder_test.go
CONFLICT (content): Merge conflict in internal/migrations/migrate_clusterlogforwarder_test.go
Auto-merging internal/migrations/migrate_clusterlogforwarder.go
Auto-merging internal/k8shandler/forwarding_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 LOG-3342: fix validation on empty spec
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick master

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.

[jcantrill]

/cherrypick master

[openshift-cherrypick-robot]

@jcantrill: new pull request created: #1817

In response to this:

/cherrypick master

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.