Release 1.1

Gopkg.toml

@@ -111,7 +111,7 @@ ignored = [
 
 [[constraint]]
   name = "github.com/envoyproxy/go-control-plane"
-  version = "^0.6.3"
+  version = "^0.6.7"
 
 [[constraint]]
   name = "github.com/fluent/fluent-logger-golang"
@@ -209,10 +209,6 @@ ignored = [
   name = "github.com/opentracing/opentracing-go"
   version = "1.0.2"
 
-[[constraint]]
-  name = "github.com/pborman/uuid"
-  version = "1.1.0"
-
 [[constraint]]
   name = "github.com/pmezard/go-difflib"
   version = "1.0.0"

Makefile

@@ -233,8 +233,8 @@ ${ISTIO_BIN}/have_go_$(GO_VERSION_REQUIRED):
 # Ensure expected GOPATH setup
 .PHONY: check-tree
 check-tree:
-	@if [ "$(ISTIO_GO)" != "$(GO_TOP)/src/istio.io/istio" ]; then \
-		echo Not building in expected path \'GOPATH/src/istio.io/istio\'. Make sure to clone Istio into that path. Istio root=$(ISTIO_GO), GO_TOP=$(GO_TOP) ; \
+	@if [ ! "$(ISTIO_GO)" -ef "$(GO_TOP)/src/istio.io/istio" ]; then \
+		echo Not building in expected path \'GOPATH/src/istio.io/istio\'. Make sure to clone Istio into that path. Istio root="$(ISTIO_GO)", GO_TOP="$(GO_TOP)" ; \
 		exit 1; fi
 
 # Downloads envoy, based on the SHA defined in the base pilot Dockerfile

bin/codecov.sh

@@ -47,6 +47,7 @@ function cleanup() {
 trap cleanup EXIT
 
 # Setup environment needed by some tests.
+make sync
 make localTestEnv
 
 # coverage test needs to run one package per command.

bin/codecov_diff.sh

@@ -47,6 +47,7 @@ if [[ -n "${CIRCLE_PR_NUMBER:-}" ]]; then
 
   go get -u istio.io/test-infra/toolbox/githubctl
   BASE_SHA=$("${GOPATH}"/bin/githubctl --token_file="${TMP_GITHUB_TOKEN}" --op=getBaseSHA --repo=istio --pr_num="${CIRCLE_PR_NUMBER}")
+  git reset HEAD --hard
   git clean -f -d
   git checkout "${BASE_SHA}"
 
@@ -56,6 +57,7 @@ if [[ -n "${CIRCLE_PR_NUMBER:-}" ]]; then
   OUT_DIR="${BASELINE_PATH}" MAXPROCS="${MAXPROCS:-}" CODECOV_SKIP="${CODECOV_SKIP:-}" ./bin/codecov.sh
 
   # Get back to the PR head
+  git reset HEAD --hard
   git clean -f -d
   git checkout "${CIRCLE_SHA1}"
 

codecov.threshold

@@ -21,15 +21,18 @@ istio.io/istio/pilot/pkg/config/memory/monitor.go=30
 istio.io/istio/pilot/pkg/proxy/envoy/v2=10
 istio.io/istio/pilot/pkg/serviceregistry/consul/monitor.go=20
 istio.io/istio/pkg/mcp/creds/watcher.go=100
-istio.io/istio/pkg/test=100
-istio.io/istio/security/proto=100
+istio.io/istio/pkg/mcp/source/source.go=90
 istio.io/istio/security/pkg/nodeagent=15
+# Disable codecov check for testing and proto packages
 istio.io/istio/galley/pkg/testing=100
+istio.io/istio/pkg/test=100
+istio.io/istio/security/proto=100
+istio.io/istio/tests=100
+istio.io/istio/mixer/pkg/adapter/test=100
 
 # Temporary until integ tests are restored
 istio.io/istio/pilot/pkg/networking/plugin=50
 istio.io/istio/galley/pkg/runtime=30
-istio.io/istio/galley/pkg/kube/converter/legacy/legacymixer.pb.go=10
 istio.io/istio/galley/pkg/meshconfig/cache.go=100
 istio.io/istio/pkg/mcp/server/monitoring.go=50
 istio.io/istio/pilot/pkg/model/authentication.go=20

galley/cmd/galley/cmd/root.go

@@ -148,6 +148,8 @@ func GetRootCmd(args []string) *cobra.Command {
 		"DNS domain suffix")
 	rootCmd.PersistentFlags().BoolVar(&serverArgs.DisableResourceReadyCheck, "disableResourceReadyCheck", serverArgs.DisableResourceReadyCheck,
 		"Disable resource readiness checks. This allows Galley to start if not all resource types are supported")
+	rootCmd.PersistentFlags().StringSliceVar(&serverArgs.ExcludedResourceKinds, "excludedResourceKinds",
+		serverArgs.ExcludedResourceKinds, "Comma-separated list of resource kinds that should not generate source events")
 
 	serverArgs.IntrospectionOptions.AttachCobraFlags(rootCmd)
 

galley/docker/Dockerfile.galley

@@ -1,3 +1,3 @@
-FROM scratch
+FROM istionightly/base_debug
 ADD galley /usr/local/bin/
 ENTRYPOINT ["/usr/local/bin/galley"]

galley/pkg/metadata/kube/types.go

@@ -336,28 +336,6 @@ func init() {
 		Converter: converter.Get("identity"),
 	})
 
-	b.Add(schema.ResourceSpec{
-		Kind:      "servicecontrolreport",
-		ListKind:  "servicecontrolreportList",
-		Singular:  "servicecontrolreport",
-		Plural:    "servicecontrolreports",
-		Version:   "v1alpha2",
-		Group:     "config.istio.io",
-		Target:    metadata.Types.Get("istio/config/v1alpha2/legacy/servicecontrolreports"),
-		Converter: converter.Get("identity"),
-	})
-
-	b.Add(schema.ResourceSpec{
-		Kind:      "servicecontrol",
-		ListKind:  "servicecontrolList",
-		Singular:  "servicecontrol",
-		Plural:    "servicecontrols",
-		Version:   "v1alpha2",
-		Group:     "config.istio.io",
-		Target:    metadata.Types.Get("istio/config/v1alpha2/legacy/servicecontrols"),
-		Converter: converter.Get("identity"),
-	})
-
 	b.Add(schema.ResourceSpec{
 		Kind:      "signalfx",
 		ListKind:  "signalfxList",
@@ -611,6 +589,17 @@ func init() {
 		Converter: converter.Get("identity"),
 	})
 
+	b.Add(schema.ResourceSpec{
+		Kind:      "Endpoints",
+		ListKind:  "EndpointsList",
+		Singular:  "endpoints",
+		Plural:    "endpoints",
+		Version:   "v1",
+		Group:     "",
+		Target:    metadata.Types.Get("k8s/core/v1/endpoints"),
+		Converter: converter.Get("identity"),
+	})
+
 	b.Add(schema.ResourceSpec{
 		Kind:      "Node",
 		ListKind:  "NodeList",

galley/pkg/metadata/types.go

@@ -127,12 +127,6 @@ var (
 	// Reportnothing metadata
 	Reportnothing resource.Info
 
-	// Servicecontrolreport metadata
-	Servicecontrolreport resource.Info
-
-	// Servicecontrol metadata
-	Servicecontrol resource.Info
-
 	// Signalfx metadata
 	Signalfx resource.Info
 
@@ -202,6 +196,9 @@ var (
 	// ServiceRole metadata
 	ServiceRole resource.Info
 
+	// Endpoints metadata
+	Endpoints resource.Info
+
 	// Node metadata
 	Node resource.Info
 
@@ -305,12 +302,6 @@ func init() {
 	Reportnothing = b.Register(
 		"istio/config/v1alpha2/legacy/reportnothings",
 		"type.googleapis.com/type.googleapis.com/google.protobuf.Struct")
-	Servicecontrolreport = b.Register(
-		"istio/config/v1alpha2/legacy/servicecontrolreports",
-		"type.googleapis.com/type.googleapis.com/google.protobuf.Struct")
-	Servicecontrol = b.Register(
-		"istio/config/v1alpha2/legacy/servicecontrols",
-		"type.googleapis.com/type.googleapis.com/google.protobuf.Struct")
 	Signalfx = b.Register(
 		"istio/config/v1alpha2/legacy/signalfxs",
 		"type.googleapis.com/type.googleapis.com/google.protobuf.Struct")
@@ -380,12 +371,15 @@ func init() {
 	ServiceRole = b.Register(
 		"istio/rbac/v1alpha1/serviceroles",
 		"type.googleapis.com/istio.rbac.v1alpha1.ServiceRole")
+	Endpoints = b.Register(
+		"k8s/core/v1/endpoints",
+		"type.googleapis.com/k8s.io.api.core.v1.Endpoints")
 	Node = b.Register(
 		"k8s/core/v1/nodes",
 		"type.googleapis.com/k8s.io.api.core.v1.NodeSpec")
 	Pod = b.Register(
 		"k8s/core/v1/pods",
-		"type.googleapis.com/k8s.io.api.core.v1.PodSpec")
+		"type.googleapis.com/k8s.io.api.core.v1.Pod")
 	Service = b.Register(
 		"k8s/core/v1/services",
 		"type.googleapis.com/k8s.io.api.core.v1.ServiceSpec")

galley/pkg/runtime/processing/dispatcher.go

@@ -0,0 +1,70 @@
+//  Copyright 2019 Istio Authors
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain accumulator copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+
+package processing
+
+import (
+	"istio.io/istio/galley/pkg/runtime/resource"
+	"istio.io/istio/pkg/log"
+)
+
+var scope = log.RegisterScope("processing", "Galley data processing", 0)
+
+// Dispatcher is a Handler that can dispatch events to other Handlers, based on Collection.
+type Dispatcher struct {
+	handlers map[resource.Collection][]Handler
+}
+
+var _ Handler = &Dispatcher{}
+
+// Handle implements Handler
+func (d *Dispatcher) Handle(e resource.Event) {
+	handlers, found := d.handlers[e.Entry.ID.Collection]
+	if !found {
+		scope.Warnf("Unhandled resource event: %v", e)
+		return
+	}
+
+	for _, h := range handlers {
+		h.Handle(e)
+	}
+}
+
+// DispatcherBuilder builds Dispatchers
+type DispatcherBuilder struct {
+	handlers map[resource.Collection][]Handler
+}
+
+// NewDispatcherBuilder returns a new dispatcher dispatcher
+func NewDispatcherBuilder() *DispatcherBuilder {
+	return &DispatcherBuilder{
+		handlers: make(map[resource.Collection][]Handler),
+	}
+}
+
+// Add a new handler for the given Collection
+func (d *DispatcherBuilder) Add(t resource.Collection, h Handler) {
+	handlers := d.handlers[t]
+	handlers = append(handlers, h)
+	d.handlers[t] = handlers
+}
+
+// Build a Dispatcher
+func (d *DispatcherBuilder) Build() *Dispatcher {
+	r := &Dispatcher{
+		handlers: d.handlers,
+	}
+	d.handlers = nil
+	return r
+}