Use consistent calicoImage field name for combined calico image#4838

caseydavenport merged 2 commits into

tigera:mastertigera/operator:masterfrom

caseydavenport:casey-combined-image-cleanupcaseydavenport/operator:casey-combined-image-cleanupCopy head branch name to clipboard