Fix minor errors due to rebase.

dns-controller/pkg/dns/dnscontroller.go

@@ -278,7 +278,7 @@ func (c *DNSController) runOnce() error {
 			dedup = append(dedup, s)
 		}
 
-		err := op.updateRecords(k, newValues, int64(ttl.Seconds()), c.dnsProviderId)
+		err := op.updateRecords(k, dedup, int64(ttl.Seconds()), c.dnsProviderId)
 		if err != nil {
 			glog.Infof("error updating records for %s: %v", k, err)
 			errors = append(errors, err)

hack/.packages

@@ -47,8 +47,8 @@ k8s.io/kops/pkg/model/components
 k8s.io/kops/pkg/model/gcemodel
 k8s.io/kops/pkg/model/iam
 k8s.io/kops/pkg/model/resources
-k8s.io/kops/pkg/resources
 k8s.io/kops/pkg/model/vspheremodel
+k8s.io/kops/pkg/resources
 k8s.io/kops/pkg/systemd
 k8s.io/kops/pkg/util/stringorslice
 k8s.io/kops/pkg/validation

pkg/resources/delete_cluster_vsphere.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package kutil
+package resources
 
 import (
 	"context"