kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix minor errors due to rebase.

This commit is contained in:
Miao Luo 2017-04-21 00:11:27 -07:00
parent de72c50a0d
commit aed9f154ad
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dns-controller/pkg/dns/dnscontroller.go
View File

@ -278,7 +278,7 @@ func (c *DNSController) runOnce() error {
dedup = append(dedup, s) 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 { if err != nil {
glog.Infof("error updating records for %s: %v", k, err) glog.Infof("error updating records for %s: %v", k, err)
errors = append(errors, err) errors = append(errors, err)

2
hack/.packages
View File

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

2
upup/pkg/kutil/delete_cluster_vsphere.go → pkg/resources/delete_cluster_vsphere.go
View File

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