make builds default to upstream values

The operator repo currently has defaults set that represent downstream builds.  This was because we did not know how to build without passing values to our build system.  We need to change this so defaults represent upstream and set vars to build downstream versions.