kubernetes · chrislovecnm · Jul 3, 2017 · Jun 30, 2017 · Jun 30, 2017 · Jun 30, 2017
diff --git a/.gitmodules b/.gitmodules
@@ -265,9 +265,6 @@
 [submodule "_vendor/github.com/elazarl/go-bindata-assetfs"]
 	path = _vendor/github.com/elazarl/go-bindata-assetfs
 	url = https://github.com/elazarl/go-bindata-assetfs
-[submodule "_vendor/github.com/grpc-ecosystem"]
-	path = _vendor/github.com/grpc-ecosystem
-	url = https://github.com/grpc-ecosystem/grpc-gateway
 [submodule "_vendor/gopkg.in/natefinch/lumberjack.v2"]
 	path = _vendor/gopkg.in/natefinch/lumberjack.v2
 	url = https://gopkg.in/natefinch/lumberjack.v2
@@ -289,3 +286,30 @@
 [submodule "_vendor/github.com/weaveworks/mesh"]
 	path = _vendor/github.com/weaveworks/mesh
 	url = https://github.com/weaveworks/mesh
+[submodule "_vendor/github.com/grpc-ecosystem/go-grpc-prometheus"]
+	path = _vendor/github.com/grpc-ecosystem/go-grpc-prometheus
+	url = https://github.com/grpc-ecosystem/go-grpc-prometheus
+[submodule "_vendor/github.com/grpc-ecosystem/grpc-gateway"]
+	path = _vendor/github.com/grpc-ecosystem/grpc-gateway
+	url = https://github.com/grpc-ecosystem/grpc-gateway
+[submodule "_vendor/github.com/emicklei/go-restful-swagger12"]
+	path = _vendor/github.com/emicklei/go-restful-swagger12
+	url = https://github.com/emicklei/go-restful-swagger12
+[submodule "_vendor/github.com/fatih/camelcase"]
+	path = _vendor/github.com/fatih/camelcase
+	url = https://github.com/fatih/camelcase
+[submodule "_vendor/github.com/go-openapi/loads"]
+	path = _vendor/github.com/go-openapi/loads
+	url = https://github.com/go-openapi/loads
+[submodule "_vendor/github.com/go-openapi/analysis"]
+	path = _vendor/github.com/go-openapi/analysis
+	url = https://github.com/go-openapi/analysis
+[submodule "_vendor/github.com/googleapis/gnostic"]
+	path = _vendor/github.com/googleapis/gnostic
+	url = https://github.com/googleapis/gnostic
+[submodule "_vendor/github.com/hashicorp/golang-lru"]
+	path = _vendor/github.com/hashicorp/golang-lru
+	url = https://github.com/hashicorp/golang-lru
+[submodule "_vendor/github.com/Azure/go-autorest"]
+	path = _vendor/github.com/Azure/go-autorest
+	url = https://github.com/Azure/go-autorest
diff --git a/Makefile b/Makefile
@@ -358,6 +358,7 @@ copydeps:
 	ln -sf kubernetes/staging/src/k8s.io/apimachinery vendor/k8s.io/apimachinery
 	ln -sf kubernetes/staging/src/k8s.io/apiserver vendor/k8s.io/apiserver
 	ln -sf kubernetes/staging/src/k8s.io/client-go vendor/k8s.io/client-go
+	ln -sf kubernetes/staging/src/k8s.io/metrics vendor/k8s.io/metrics
 
 .PHONY: gofmt
 gofmt:

diff --git a/_vendor/github.com/Azure/go-autorest b/_vendor/github.com/Azure/go-autorest
diff --git a/_vendor/github.com/coreos/etcd b/_vendor/github.com/coreos/etcd
diff --git a/_vendor/github.com/coreos/go-semver b/_vendor/github.com/coreos/go-semver
diff --git a/_vendor/github.com/coreos/go-systemd b/_vendor/github.com/coreos/go-systemd
diff --git a/_vendor/github.com/elazarl/go-bindata-assetfs b/_vendor/github.com/elazarl/go-bindata-assetfs
diff --git a/_vendor/github.com/emicklei/go-restful b/_vendor/github.com/emicklei/go-restful
diff --git a/_vendor/github.com/emicklei/go-restful-swagger12 b/_vendor/github.com/emicklei/go-restful-swagger12
diff --git a/_vendor/github.com/fatih/camelcase b/_vendor/github.com/fatih/camelcase
diff --git a/_vendor/github.com/go-openapi/analysis b/_vendor/github.com/go-openapi/analysis
diff --git a/_vendor/github.com/go-openapi/loads b/_vendor/github.com/go-openapi/loads
diff --git a/_vendor/github.com/gogo/protobuf b/_vendor/github.com/gogo/protobuf
diff --git a/_vendor/github.com/golang/protobuf b/_vendor/github.com/golang/protobuf
diff --git a/_vendor/github.com/google/cadvisor b/_vendor/github.com/google/cadvisor
diff --git a/_vendor/github.com/googleapis/gnostic b/_vendor/github.com/googleapis/gnostic
diff --git a/_vendor/github.com/grpc-ecosystem b/_vendor/github.com/grpc-ecosystem
diff --git a/_vendor/github.com/grpc-ecosystem/go-grpc-prometheus b/_vendor/github.com/grpc-ecosystem/go-grpc-prometheus
diff --git a/_vendor/github.com/grpc-ecosystem/grpc-gateway b/_vendor/github.com/grpc-ecosystem/grpc-gateway
diff --git a/_vendor/github.com/hashicorp/golang-lru b/_vendor/github.com/hashicorp/golang-lru
diff --git a/_vendor/github.com/howeyc/gopass b/_vendor/github.com/howeyc/gopass
diff --git a/_vendor/github.com/juju/ratelimit b/_vendor/github.com/juju/ratelimit
diff --git a/_vendor/github.com/miekg/coredns b/_vendor/github.com/miekg/coredns
diff --git a/_vendor/github.com/miekg/dns b/_vendor/github.com/miekg/dns
diff --git a/_vendor/github.com/mitchellh/mapstructure b/_vendor/github.com/mitchellh/mapstructure
diff --git a/_vendor/github.com/opencontainers/runc b/_vendor/github.com/opencontainers/runc
diff --git a/_vendor/github.com/prometheus/client_golang b/_vendor/github.com/prometheus/client_golang
diff --git a/_vendor/github.com/prometheus/common b/_vendor/github.com/prometheus/common
diff --git a/_vendor/github.com/prometheus/procfs b/_vendor/github.com/prometheus/procfs
diff --git a/_vendor/github.com/vmware/govmomi b/_vendor/github.com/vmware/govmomi
diff --git a/_vendor/golang.org/x/net b/_vendor/golang.org/x/net
diff --git a/_vendor/golang.org/x/oauth2 b/_vendor/golang.org/x/oauth2
diff --git a/_vendor/google.golang.org/api b/_vendor/google.golang.org/api
diff --git a/_vendor/google.golang.org/grpc b/_vendor/google.golang.org/grpc
diff --git a/_vendor/gopkg.in/natefinch/lumberjack.v2 b/_vendor/gopkg.in/natefinch/lumberjack.v2
diff --git a/_vendor/k8s.io/gengo b/_vendor/k8s.io/gengo
diff --git a/_vendor/k8s.io/kubernetes b/_vendor/k8s.io/kubernetes
diff --git a/cmd/kops/root.go b/cmd/kops/root.go
@@ -113,7 +113,16 @@ func NewCmdRoot(f *util.Factory, out io.Writer) *cobra.Command {
 
 	cmd := rootCommand.cobraCommand
 
-	cmd.PersistentFlags().AddGoFlagSet(goflag.CommandLine)
+	//cmd.PersistentFlags().AddGoFlagSet(goflag.CommandLine)
+	goflag.CommandLine.VisitAll(func(goflag *goflag.Flag) {
+		switch goflag.Name {
+		case "cloud-provider-gce-lb-src-cidrs":
+			// Skip; this is dragged in by the google cloudprovider dependency
+
+		default:
+			cmd.PersistentFlags().AddGoFlag(goflag)
+		}
+	})
 
 	cmd.PersistentFlags().StringVar(&rootCommand.configFile, "config", "", "config file (default is $HOME/.kops.yaml)")
 

diff --git a/dns-controller/pkg/dns/dnscontroller.go b/dns-controller/pkg/dns/dnscontroller.go
@@ -449,19 +449,21 @@ func (o *dnsOp) deleteRecords(k recordKey) error {
 			return fmt.Errorf("zone does not support resource records %q", zone.Name())
 		}
 
-		dnsRecord, err := rrsProvider.Get(fqdn)
+		dnsRecords, err := rrsProvider.Get(fqdn)
 		if err != nil {
 			return fmt.Errorf("Failed to get DNS record %s with error: %v", fqdn, err)
 		}
 
-		if dnsRecord != nil && string(dnsRecord.Type()) == string(k.RecordType) {
-			cs, err := o.getChangeset(zone)
-			if err != nil {
-				return err
-			}
+		for _, dnsRecord := range dnsRecords {
+			if string(dnsRecord.Type()) == string(k.RecordType) {
+				cs, err := o.getChangeset(zone)
+				if err != nil {
+					return err
+				}
 
-			glog.V(2).Infof("Deleting resource record %s %s", fqdn, k.RecordType)
-			cs.Remove(dnsRecord)
+				glog.V(2).Infof("Deleting resource record %s %s", fqdn, k.RecordType)
+				cs.Remove(dnsRecord)
+			}
 		}
 
 		return nil
@@ -518,13 +520,16 @@ func (o *dnsOp) updateRecords(k recordKey, newRecords []string, ttl int64) error
 	var existing dnsprovider.ResourceRecordSet
 	// TODO: work-around before ResourceRecordSets.List() is implemented for CoreDNS
 	if isCoreDNSZone(zone) {
-		dnsRecord, err := rrsProvider.Get(fqdn)
+		dnsRecords, err := rrsProvider.Get(fqdn)
 		if err != nil {
 			return fmt.Errorf("Failed to get DNS record %s with error: %v", fqdn, err)
 		}
-		if dnsRecord != nil && string(dnsRecord.Type()) == string(k.RecordType) {
-			glog.V(8).Infof("Found matching record: %s %s", k.RecordType, fqdn)
-			existing = dnsRecord
+
+		for _, dnsRecord := range dnsRecords {
+			if string(dnsRecord.Type()) == string(k.RecordType) {
+				glog.V(8).Infof("Found matching record: %s %s", k.RecordType, fqdn)
+				existing = dnsRecord
+			}
 		}
 	} else {
 		// when DNS provider is aws-route53 or google-clouddns

diff --git a/pkg/apis/kops/v1alpha1/defaults.go b/pkg/apis/kops/v1alpha1/defaults.go
@@ -22,10 +22,7 @@ import (
 )
 
 func addDefaultingFuncs(scheme *runtime.Scheme) error {
-	RegisterDefaults(scheme)
-	return scheme.AddDefaultingFuncs(
-		SetDefaults_ClusterSpec,
-	)
+	return RegisterDefaults(scheme)
 }
 
 func SetDefaults_ClusterSpec(obj *ClusterSpec) {
+1 −4		.travis.yml
+8 −5		README.md
+35 −101		semver/semver.go
+12 −160		semver/semver_test.go
+0 −14		semver/sort.go
+23 −4		.travis.yml
+0 −2		activation/listeners.go
+39 −7		daemon/sdnotify.go
+79 −0		daemon/sdnotify_test.go
+72 −0		daemon/watchdog.go
+85 −0		daemon/watchdog_test.go
+11 −1		dbus/dbus.go
+126 −8		dbus/methods.go
+677 −48		dbus/methods_test.go
+19 −0		dbus/properties.go
+3 −3		examples/activation/httpserver/README.md
+5 −0		fixtures/mask-unmask.service
+6 −0		fixtures/reload.service
+6 −0		fixtures/start-failed.service
+66 −0		sdjournal/functions.go
+36 −0		sdjournal/functions_test.go
+345 −116		sdjournal/journal.go
+248 −1		sdjournal/journal_test.go
+60 −22		sdjournal/read.go
+13 −2		test
+10 −147		util/util.go
+174 −0		util/util_cgo.go
+23 −0		util/util_stub.go
+74 −0		util/util_test.go
+1 −1		README.md
+7 −27		assetfs.go
+1 −4		go-bindata-assetfs/main.go
+6 −0		.travis.yml
+81 −29		CHANGES.md
+7 −0		Makefile
+12 −12		README.md
+0 −2		compress_test.go
+1 −0		compressors.go
+13 −8		container.go
+3 −3		cors_filter_test.go
+1 −1		doc.go
+4 −3		examples/google_app_engine/datastore/main.go
+3 −2		examples/google_app_engine/restful-user-service.go
+4 −4		examples/msgpack/msgpack_entity_test.go
+1 −1		examples/restful-swagger.go
+1 −1		examples/restful-user-resource.go
+10 −4		examples/restful-user-service.go
+0 −10		install.sh
+4 −1		log/log.go
+0 −23		request.go
+0 −63		request_test.go
+3 −2		response.go
+3 −0		route.go
+61 −8		route_builder.go
+19 −1		route_builder_test.go
+0 −43		swagger/CHANGES.md
+0 −76		swagger/README.md
+0 −64		swagger/api_declaration_list.go
+0 −46		swagger/config.go
+0 −467		swagger/model_builder.go
+0 −1,283		swagger/model_builder_test.go
+0 −86		swagger/model_list.go
+0 −48		swagger/model_list_test.go
+0 −81		swagger/model_property_ext.go
+0 −70		swagger/model_property_ext_test.go
+0 −87		swagger/model_property_list.go
+0 −47		swagger/model_property_list_test.go
+0 −36		swagger/ordered_route_map.go
+0 −29		swagger/ordered_route_map_test.go
+0 −42		swagger/postbuild_model_test.go
+0 −185		swagger/swagger.go
+0 −21		swagger/swagger_builder.go
+0 −284		swagger/swagger_test.go
+0 −440		swagger/swagger_webservice.go
+0 −5		swagger/test_package/struct.go
+0 −86		swagger/utils_test.go
+29 −7		web_service.go
+23 −0		web_service_test.go
+174 −588		_conformance/conformance_proto/conformance.pb.go
+0 −93		descriptor/descriptor.go
+0 −32		descriptor/descriptor_test.go
+2 −16		jsonpb/jsonpb.go
+0 −2		jsonpb/jsonpb_test.go
+0 −7		jsonpb/jsonpb_test_proto/more_test_objects.pb.go
+68 −70		jsonpb/jsonpb_test_proto/test_objects.pb.go
+2 −9		proto/encode.go
+0 −1		proto/extensions.go
+0 −28		proto/extensions_test.go
+0 −46		proto/map_test.go
+47 −175		proto/proto3_proto/proto3.pb.go
+0 −9		proto/proto3_proto/proto3.proto
+0 −10		proto/proto3_test.go
+384 −471		proto/testdata/test.pb.go
+160 −149		protoc-gen-go/descriptor/descriptor.pb.go
+6 −6		protoc-gen-go/generator/generator.go
+3 −3		protoc-gen-go/testdata/Makefile
+1 −6		protoc-gen-go/testdata/my_test/test.pb.go
+1 −6		protoc-gen-go/testdata/my_test/test.pb.go.golden
+1 −7		.travis.yml
+1 −9		README.md
+8 −20		client.go
+2 −61		client_test.go
+0 −32		clientconfig.go
+0 −37		clientconfig_test.go
+0 −184		compress_generate.go
+0 −43		dane.go
+2 −2		defaults.go
+0 −17		dns_test.go
+11 −10		dnssec.go
+8 −8		dnssec_keygen.go
+2 −2		dnssec_keyscan.go
+1 −1		doc.go
+18 −83		edns.go
+0 −36		edns_test.go
+3 −0		idn/punycode.go
+147 −59		msg.go
+3 −6		msg_generate.go
+2 −0		msg_helpers.go
+6 −5		nsecx.go
+14 −33		parse_test.go
+2 −2		privaterr_test.go
+2 −2		reverse.go
+1 −1		sanitize_test.go
+4 −11		scan.go
+114 −142		scan_rr.go
+3 −5		server.go
+2 −42		server_test.go
+3 −2		sig0.go
+0 −47		smimea.go
+39 −0		tlsa.go
+2 −1		tsig.go
+21 −50		types.go
+1 −1		types_generate.go
+0 −32		types_test.go
+25 −1		udp.go
+1 −33		udp_linux.go
+4 −2		udp_other.go
+34 −0		udp_plan9.go
+7 −2		udp_windows.go
+18 −18		update_test.go
+0 −119		zcompress.go
+20 −87		zmsg.go
+26 −40		ztypes.go
+7 −0		.travis.yml
+74 −4		decode_hooks.go
+63 −25		decode_hooks_test.go
+18 −0		error.go
+172 −53		mapstructure.go
+36 −0		mapstructure_benchmark_test.go
+213 −0		mapstructure_bugs_test.go
+35 −1		mapstructure_examples_test.go
+383 −18		mapstructure_test.go
+2 −1		Dockerfile
+1 −1		checkpoint.go
+13 −3		delete.go
+7 −2		kill.go
+1 −1		libcontainer/cgroups/fs/apply_raw.go
+12 −2		libcontainer/cgroups/systemd/apply_systemd.go
+2 −2		libcontainer/configs/cgroup_unix.go
+1 −1		libcontainer/console_linux.go
+1 −1		libcontainer/console_windows.go
+1 −1		libcontainer/container.go
+4 −0		libcontainer/label/label.go
+15 −7		libcontainer/label/label_selinux.go
+8 −4		libcontainer/label/label_selinux_test.go
+2 −2		libcontainer/process_linux.go
+1 −1		libcontainer/rootfs_linux.go
+12 −0		libcontainer/selinux/selinux.go
+10 −2		libcontainer/specconv/spec_linux.go
+1 −1		libcontainer/standard_init_linux.go
+1 −1		libcontainer/utils/utils.go
+5 −2		man/runc-delete.8.md
+1 −1		man/runc-pause.8.md
+1 −1		man/runc-resume.8.md
+1 −1		man/runc-start.8.md
+52 −9		pause.go
+39 −8		ps.go
+13 −0		spec.go
+43 −15		start.go
+78 −0		tests/integration/pause.bats
+41 −0		tests/integration/start.bats
+1 −1		utils.go
+4 −2		.travis.yml
+0 −18		AUTHORS.md
+23 −0		CHANGELOG.md
+3 −3		CONTRIBUTING.md
+1 −0		MAINTAINERS.md
+0 −5		NOTICE
+3 −1		README.md
+1 −1		VERSION
+131 −0		api/client.go
+115 −0		api/client_test.go
+115 −195		api/prometheus/v1/api.go
+165 −237		api/prometheus/v1/api_test.go
+12 −9		examples/random/main.go
+4 −3		examples/simple/main.go
+1 −53		prometheus/README.md
+30 −4		prometheus/benchmark_test.go
+26 −26		prometheus/collector.go
+13 −24		prometheus/counter.go
+27 −28		prometheus/desc.go
+137 −60		prometheus/doc.go
+42 −54		prometheus/example_clustermanager_test.go
+0 −87		prometheus/example_memstats_test.go
+0 −69		prometheus/example_selfcollector_test.go
+71 −0		prometheus/example_timer_complex_test.go
+48 −0		prometheus/example_timer_gauge_test.go
+40 −0		prometheus/example_timer_test.go
+211 −106		prometheus/examples_test.go
+16 −16		prometheus/expvar_collector.go
+1 −1		prometheus/expvar_collector_test.go
+29 −0		prometheus/fnv.go
+13 −15		prometheus/gauge.go
+20 −0		prometheus/gauge_test.go
+30 −17		prometheus/go_collector.go
+27 −24		prometheus/go_collector_test.go
+280 −0		prometheus/graphite/bridge.go
+309 −0		prometheus/graphite/bridge_test.go
+22 −28		prometheus/histogram.go
+24 −2		prometheus/histogram_test.go
+203 −40		prometheus/http.go
+38 −5		prometheus/http_test.go
+17 −17		prometheus/metric.go
+50 −0		prometheus/observer.go
+53 −55		prometheus/process_collector.go
+32 −28		prometheus/process_collector_test.go
+38 −0		prometheus/promhttp/delegator_1_7.go
+73 −0		prometheus/promhttp/delegator_1_8.go
+204 −0		prometheus/promhttp/http.go
+131 −0		prometheus/promhttp/http_test.go
+95 −0		prometheus/promhttp/instrument_client.go
+142 −0		prometheus/promhttp/instrument_client_1_8.go
+195 −0		prometheus/promhttp/instrument_client_1_8_test.go
+505 −0		prometheus/promhttp/instrument_server.go
+193 −0		prometheus/promhttp/instrument_server_test.go
+0 −65		prometheus/push.go
+83 −0		prometheus/push/example_add_from_gatherer_test.go
+36 −0		prometheus/push/examples_test.go
+172 −0		prometheus/push/push.go
+176 −0		prometheus/push/push_test.go
+480 −451		prometheus/registry.go
+75 −64		prometheus/registry_test.go
+38 −35		prometheus/summary.go
+49 −8		prometheus/summary_test.go
+48 −0		prometheus/timer.go
+152 −0		prometheus/timer_test.go
+9 −11		prometheus/untyped.go
+10 −5		prometheus/value.go
+205 −48		prometheus/vec.go
+238 −17		prometheus/vec_test.go
+1 −2		.travis.yml
+0 −11		AUTHORS.md
+3 −3		CONTRIBUTING.md
+1 −0		MAINTAINERS.md
+5 −1		README.md
+30 −0		config/config.go
+1 −0		config/testdata/tls_config.cert_no_key.bad.yml
+0 −0		config/testdata/tls_config.empty.good.yml
+1 −0		config/testdata/tls_config.insecure.good.yml
+1 −0		config/testdata/tls_config.invalid_field.bad.yml
+1 −0		config/testdata/tls_config.key_no_cert.bad.yml
+79 −0		config/tls_config.go
+92 −0		config/tls_config_test.go
+0 −4		expfmt/bench_test.go
+57 −39		expfmt/decode.go
+79 −0		expfmt/decode_test.go
+1 −1		expfmt/encode.go
+4 −6		expfmt/expfmt.go
+2 −2		expfmt/fuzz.go
+0 −162		expfmt/json_decode.go
+0 −124		expfmt/json_decode_test.go
+46 −0		expfmt/testdata/json2_bad
+ −		expfmt/testdata/protobuf
+ −		expfmt/testdata/protobuf.gz
+0 −163		expfmt/testdata/test.gz
+ −		expfmt/testdata/text.gz
+14 −16		expfmt/text_create.go
+8 −1		expfmt/text_parse.go
+4 −2		expfmt/text_parse_test.go
+67 −0		internal/bitbucket.org/ww/goautoneg/README.txt
+162 −0		internal/bitbucket.org/ww/goautoneg/autoneg.go
+33 −0		internal/bitbucket.org/ww/goautoneg/autoneg_test.go
+89 −0		log/eventlog_formatter.go
+123 −11		log/log.go
+126 −0		log/syslog_formatter.go
+52 −0		log/syslog_formatter_test.go
+30 −3		model/alert.go
+118 −0		model/alert_test.go
+42 −0		model/fnv.go
+27 −5		model/labels.go
+49 −0		model/labels_test.go
+17 −1		model/labelset.go
+24 −2		model/metric.go
+49 −0		model/metric_test.go
+1 −1		model/model.go
+31 −77		model/signature.go
+10 −0		model/signature_test.go
+46 −0		model/silence.go
+228 −0		model/silence_test.go
+40 −21		model/time.go
+43 −0		model/time_test.go
+29 −8		model/value.go
+106 −0		model/value_test.go
+28 −42		route/route.go
+17 −0		route/route_test.go
+89 −0		version/info.go