Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build break #14021

Merged
merged 1 commit into from
May 12, 2019
Merged

Fix build break #14021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix build break
  • Loading branch information
mtail committed May 12, 2019
commit ba5f0217bdb8f7e43e57d5f60aa699320b563473
3 changes: 1 addition & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ You'll find many other useful documents on our [Wiki](https://github.com/istio/i
Istio is an open platform for providing a uniform way to integrate
microservices, manage traffic flow across microservices, enforce policies
and aggregate telemetry data. Istio's control plane provides an abstraction
layer over the underlying cluster management platform, such as Kubernetes,
Mesos, etc.
layer over the underlying cluster management platform, such as Kubernetes.

Visit [istio.io](https://istio.io) for in-depth information about using Istio.

Expand Down
2 changes: 1 addition & 1 deletion galley/cmd/galley/cmd/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"github.com/spf13/cobra"

"istio.io/common/pkg/log"
"istio.io/common/pkg/probe"
"istio.io/istio/galley/pkg/crd/validation"
"istio.io/istio/galley/pkg/server"
istiocmd "istio.io/istio/pkg/cmd"
"istio.io/common/pkg/probe"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion galley/pkg/crd/validation/validation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ import (
multierror "github.com/hashicorp/go-multierror"

"istio.io/common/pkg/log"
"istio.io/common/pkg/probe"
mixervalidate "istio.io/istio/mixer/pkg/validate"
"istio.io/istio/pilot/pkg/model"
"istio.io/istio/pkg/cmd"
"istio.io/istio/pkg/kube"
"istio.io/common/pkg/probe"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions galley/pkg/runtime/processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"time"

"istio.io/common/pkg/log"
"istio.io/common/pkg/timedfn"
"istio.io/istio/galley/pkg/metadata"
"istio.io/istio/galley/pkg/runtime/groups"
"istio.io/istio/galley/pkg/runtime/monitoring"
Expand All @@ -29,7 +30,6 @@ import (
"istio.io/istio/galley/pkg/runtime/publish"
"istio.io/istio/galley/pkg/runtime/resource"
"istio.io/istio/galley/pkg/util"
"istio.io/common/pkg/timedfn"
)

var scope = log.RegisterScope("runtime", "Galley runtime", 0)
Expand Down Expand Up @@ -172,7 +172,7 @@ func (p *Processor) Stop() {

// AwaitFullSync waits until the full sync event is received from the source. For testing purposes only.
func (p *Processor) AwaitFullSync(timeout time.Duration) error {
return wait.WithTimeout(func() {
return timedfn.WithTimeout(func() {
p.fullSyncCond.L.Lock()
defer p.fullSyncCond.L.Unlock()
if p.distribute {
Expand Down
4 changes: 2 additions & 2 deletions galley/pkg/runtime/processor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ import (
"github.com/gogo/protobuf/types"

"istio.io/common/pkg/log"
"istio.io/common/pkg/timedfn"
"istio.io/istio/galley/pkg/meshconfig"
"istio.io/istio/galley/pkg/runtime/groups"
runtimeLog "istio.io/istio/galley/pkg/runtime/log"
"istio.io/istio/galley/pkg/runtime/publish"
"istio.io/istio/galley/pkg/runtime/resource"
"istio.io/istio/galley/pkg/testing/resources"
"istio.io/istio/pkg/mcp/snapshot"
"istio.io/common/pkg/timedfn"
)

const (
Expand Down Expand Up @@ -194,7 +194,7 @@ func TestProcessor_Publishing(t *testing.T) {
src.Set(k1, resource.Metadata{}, &types.Empty{})

// Wait for up to 5 seconds.
if err := wait.WithTimeout(processCallCount.Wait, timeout); err != nil {
if err := timedfn.WithTimeout(processCallCount.Wait, timeout); err != nil {
t.Fatal(err)
}

Expand Down
2 changes: 1 addition & 1 deletion galley/pkg/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
"istio.io/common/pkg/ctrlz"
"istio.io/common/pkg/ctrlz/fw"
"istio.io/common/pkg/log"
"istio.io/common/pkg/probe"
"istio.io/common/pkg/version"
"istio.io/istio/galley/pkg/meshconfig"
"istio.io/istio/galley/pkg/metadata"
Expand All @@ -48,7 +49,6 @@ import (
"istio.io/istio/pkg/mcp/server"
"istio.io/istio/pkg/mcp/snapshot"
"istio.io/istio/pkg/mcp/source"
"istio.io/common/pkg/probe"
)

var scope = log.RegisterScope("server", "Galley server debugging", 0)
Expand Down
2 changes: 1 addition & 1 deletion mixer/cmd/mixs/cmd/probe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"github.com/spf13/cobra"

"istio.io/common/pkg/log"
"istio.io/istio/mixer/cmd/shared"
"istio.io/common/pkg/probe"
"istio.io/istio/mixer/cmd/shared"
)

func probeCmd(printf, fatalf shared.FormatFn) *cobra.Command {
Expand Down
2 changes: 1 addition & 1 deletion mixer/pkg/config/crd/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ import (
"k8s.io/client-go/tools/clientcmd" // import GKE cluster authentication plugin

"istio.io/common/pkg/log"
"istio.io/common/pkg/probe"
"istio.io/istio/mixer/pkg/config/store"
"istio.io/istio/pkg/mcp/creds"
"istio.io/common/pkg/probe"
)

// defaultDiscoveryBuilder builds the actual discovery client using the kubernetes config.
Expand Down
2 changes: 1 addition & 1 deletion mixer/pkg/config/crd/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import (
"k8s.io/client-go/tools/cache"

"istio.io/common/pkg/log"
"istio.io/istio/mixer/pkg/config/store"
"istio.io/common/pkg/probe"
"istio.io/istio/mixer/pkg/config/store"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion mixer/pkg/config/crd/store_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import (
"k8s.io/client-go/rest"
k8stesting "k8s.io/client-go/testing"

"istio.io/istio/mixer/pkg/config/store"
"istio.io/common/pkg/probe"
"istio.io/istio/mixer/pkg/config/store"
)

// The "retryTimeout" used by the test.
Expand Down
2 changes: 1 addition & 1 deletion mixer/pkg/config/mcp/backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ import (

mcp "istio.io/api/mcp/v1alpha1"
"istio.io/common/pkg/log"
"istio.io/common/pkg/probe"
"istio.io/istio/galley/pkg/metadata/kube"
"istio.io/istio/mixer/pkg/config/store"
configz "istio.io/istio/pkg/mcp/configz/client"
"istio.io/istio/pkg/mcp/creds"
"istio.io/istio/pkg/mcp/monitoring"
"istio.io/istio/pkg/mcp/sink"
"istio.io/common/pkg/probe"
)

var scope = log.RegisterScope("mcp", "Mixer MCP client stack", 0)
Expand Down
2 changes: 1 addition & 1 deletion mixer/pkg/config/store/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"

"istio.io/common/pkg/log"
"istio.io/istio/pkg/mcp/creds"
"istio.io/common/pkg/probe"
"istio.io/istio/pkg/mcp/creds"
)

// ChangeType denotes the type of a change
Expand Down
2 changes: 1 addition & 1 deletion mixer/pkg/runtime/runtime.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"time"

"istio.io/common/pkg/log"
"istio.io/common/pkg/probe"
"istio.io/istio/mixer/pkg/adapter"
"istio.io/istio/mixer/pkg/config/store"
"istio.io/istio/mixer/pkg/pool"
Expand All @@ -28,7 +29,6 @@ import (
"istio.io/istio/mixer/pkg/runtime/handler"
"istio.io/istio/mixer/pkg/runtime/routing"
"istio.io/istio/mixer/pkg/template"
"istio.io/common/pkg/probe"
)

var errNotListening = errors.New("runtime is not listening to the store")
Expand Down
2 changes: 1 addition & 1 deletion mixer/pkg/runtime/runtime_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ import (
cfgpb "istio.io/api/policy/v1beta1"
configpb "istio.io/api/policy/v1beta1"
dpb "istio.io/api/policy/v1beta1"
"istio.io/common/pkg/probe"
"istio.io/istio/mixer/pkg/attribute"
"istio.io/istio/mixer/pkg/config/store"
"istio.io/istio/mixer/pkg/pool"
"istio.io/istio/mixer/pkg/runtime/config/constant"
"istio.io/istio/mixer/pkg/runtime/testing/data"
"istio.io/common/pkg/probe"
)

var egp = pool.NewGoroutinePool(1, true)
Expand Down
2 changes: 1 addition & 1 deletion mixer/pkg/server/args.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ import (

"istio.io/common/pkg/ctrlz"
"istio.io/common/pkg/log"
"istio.io/common/pkg/probe"
"istio.io/istio/mixer/pkg/adapter"
"istio.io/istio/mixer/pkg/config/store"
"istio.io/istio/mixer/pkg/loadshedding"
"istio.io/istio/mixer/pkg/runtime/config/constant"
"istio.io/istio/mixer/pkg/template"
"istio.io/istio/pkg/mcp/creds"
"istio.io/common/pkg/probe"
"istio.io/istio/pkg/tracing"
)

Expand Down
2 changes: 1 addition & 1 deletion mixer/pkg/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
mixerpb "istio.io/api/mixer/v1"
"istio.io/common/pkg/ctrlz"
"istio.io/common/pkg/log"
"istio.io/common/pkg/probe"
"istio.io/istio/mixer/pkg/adapter"
"istio.io/istio/mixer/pkg/api"
"istio.io/istio/mixer/pkg/checkcache"
Expand All @@ -44,7 +45,6 @@ import (
runtimeconfig "istio.io/istio/mixer/pkg/runtime/config"
"istio.io/istio/mixer/pkg/runtime/dispatcher"
"istio.io/istio/mixer/pkg/template"
"istio.io/common/pkg/probe"
"istio.io/istio/pkg/tracing"
)

Expand Down
2 changes: 1 addition & 1 deletion pilot/cmd/sidecar-injector/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ import (

"istio.io/common/pkg/collateral"
"istio.io/common/pkg/log"
"istio.io/common/pkg/probe"
"istio.io/common/pkg/version"
"istio.io/istio/pilot/pkg/kube/inject"
"istio.io/istio/pkg/cmd"
"istio.io/istio/pkg/kube"
"istio.io/common/pkg/probe"
"istio.io/istio/pkg/util"
)

Expand Down
2 changes: 1 addition & 1 deletion security/cmd/istio_ca/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ import (
"istio.io/common/pkg/ctrlz"
"istio.io/common/pkg/env"
"istio.io/common/pkg/log"
"istio.io/common/pkg/probe"
"istio.io/common/pkg/version"
kubelib "istio.io/istio/pkg/kube"
"istio.io/common/pkg/probe"
"istio.io/istio/pkg/spiffe"
"istio.io/istio/security/pkg/caclient"
"istio.io/istio/security/pkg/cmd"
Expand Down
2 changes: 1 addition & 1 deletion security/pkg/cmd/probe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"github.com/spf13/cobra"

"istio.io/common/pkg/log"
"istio.io/istio/mixer/cmd/shared"
"istio.io/common/pkg/probe"
"istio.io/istio/mixer/cmd/shared"
)

// NewProbeCmd creates the cobra.Command for the probe command
Expand Down