Cleanup dead code (istio#24053)

* Initial removal * conformance * agent * More dead code * Kill nodeagent * Clean up dead security controllers * protocol * lint * controlz * Conversion * more * fmt * Fix bad merge
sel · Jun 1, 2020 · 709dcf4 · 709dcf4
1 parent dc107a1
commit 709dcf4
Show file tree

Hide file tree

Showing 155 changed files with 13 additions and 11,325 deletions.
diff --git a/galley/pkg/config/analysis/analyzers/util/config.go b/galley/pkg/config/analysis/analyzers/util/config.go
@@ -15,27 +15,9 @@
 package util
 
 import (
-	"istio.io/api/mesh/v1alpha1"
-
-	"istio.io/istio/galley/pkg/config/analysis"
 	"istio.io/istio/pkg/config/resource"
-	"istio.io/istio/pkg/config/schema/collections"
 )
 
-// MeshConfig returns the mesh configuration object associated with the context
-// Analyzers that call this should include metadata.IstioMeshV1Alpha1MeshConfig as an input in their Metadata
-func MeshConfig(ctx analysis.Context) *v1alpha1.MeshConfig {
-	// Only one MeshConfig should exist in practice, but getting it this way avoids needing
-	// to plumb through the name or enforce/expose a constant.
-	var mc *v1alpha1.MeshConfig
-	ctx.ForEach(collections.IstioMeshV1Alpha1MeshConfig.Name(), func(r *resource.Instance) bool {
-		mc = r.Message.(*v1alpha1.MeshConfig)
-		return true
-	})
-
-	return mc
-}
-
 // IsSystemNamespace returns true for system namespaces
 func IsSystemNamespace(ns resource.Namespace) bool {
 	return ns == "kube-system" || ns == "kube-public"

diff --git a/galley/pkg/config/collection/instance.go b/galley/pkg/config/collection/instance.go
@@ -21,9 +21,6 @@ import (
 	"istio.io/istio/pkg/config/schema/collection"
 )
 
-// ChangeNotifierFn is called when a collection instance changes.
-type ChangeNotifierFn func()
-
 // Instance is collection of resources, indexed by name.
 type Instance struct {
 	mu          sync.RWMutex // TODO: This lock will most likely cause contention. We should investigate whether removing it would help.

diff --git a/galley/pkg/config/processing/snapshotter/snapshotter.go b/galley/pkg/config/processing/snapshotter/snapshotter.go
@@ -51,9 +51,6 @@ type Snapshotter struct {
 
 var _ event.Processor = &Snapshotter{}
 
-// HandlerFn handles generated snapshots
-type HandlerFn func(*coll.Set)
-
 type accumulator struct {
 	reqSyncCount   int32
 	syncCount      int32

diff --git a/galley/pkg/config/util/pb/proto.go b/galley/pkg/config/util/pb/proto.go
@@ -15,58 +15,14 @@
 package pb
 
 import (
-	"fmt"
 	"strings"
 
 	"github.com/ghodss/yaml"
 	"github.com/gogo/protobuf/jsonpb"
 	"github.com/gogo/protobuf/proto"
-	multierror "github.com/hashicorp/go-multierror"
 	yaml2 "gopkg.in/yaml.v2"
-
-	"istio.io/istio/pkg/config/schema/collection"
-	"istio.io/istio/pkg/util/gogoprotomarshal"
 )
 
-// UnmarshalFromJSON converts a canonical JSON to a proto message
-func UnmarshalFromJSON(s collection.Schema, js string) (proto.Message, error) {
-	pb, err := s.Resource().NewProtoInstance()
-	if err != nil {
-		return nil, err
-	}
-	if err = gogoprotomarshal.ApplyJSON(js, pb); err != nil {
-		return nil, err
-	}
-	return pb, nil
-}
-
-// UnmarshalFromYAML converts a canonical YAML to a proto message
-func UnmarshalFromYAML(s collection.Schema, yml string) (proto.Message, error) {
-	pb, err := s.Resource().NewProtoInstance()
-	if err != nil {
-		return nil, err
-	}
-	if err = gogoprotomarshal.ApplyYAML(yml, pb); err != nil {
-		return nil, err
-	}
-	return pb, nil
-}
-
-// UnmarshalFromJSONMap converts from a generic map to a proto message using canonical JSON encoding
-// JSON encoding is specified here: https://developers.google.com/protocol-buffers/docs/proto3#json
-func UnmarshalFromJSONMap(s collection.Schema, data interface{}) (proto.Message, error) {
-	// Marshal to YAML bytes
-	str, err := yaml.Marshal(data)
-	if err != nil {
-		return nil, err
-	}
-	out, err := UnmarshalFromYAML(s, string(str))
-	if err != nil {
-		return nil, multierror.Prefix(err, fmt.Sprintf("YAML decoding error: %v", string(str)))
-	}
-	return out, nil
-}
-
 // UnmarshalData data into the proto.
 func UnmarshalData(pb proto.Message, data interface{}) error {
 	js, err := toJSON(data)

diff --git a/galley/pkg/envvar/envvars.go b/galley/pkg/envvar/envvars.go
@@ -47,18 +47,3 @@ var (
 	// EnableIncrementalMCP is an option to enable incremental mcp
 	EnableIncrementalMCP = env.RegisterBoolVar("ENABLE_INCREMENTAL_MCP", false, "")
 )
-
-// RegisteredEnvVarNames returns the names of registered environment variables.
-func RegisteredEnvVarNames() []string {
-	return []string{
-		// AuthFailure RateLimiter
-		AuthzFailureLogFreq.Name,
-		AuthzFailureLogBurstSize.Name,
-		// SourceServer RateLimiter
-		SourceServerStreamBurstSize.Name,
-		SourceServerStreamFreq.Name,
-		// MCP Source RateLimiter
-		MCPSourceReqBurstSize.Name,
-		MCPSourceReqFreq.Name,
-	}
-}
diff --git a/galley/pkg/meshconfig/inmemory.go b/galley/pkg/meshconfig/inmemory.go
diff --git a/galley/pkg/server/components/processing.go b/galley/pkg/server/components/processing.go
@@ -28,7 +28,6 @@ import (
 
 	mcp "istio.io/api/mcp/v1alpha1"
 
-	"istio.io/pkg/ctrlz/fw"
 	"istio.io/pkg/log"
 	"istio.io/pkg/version"
 
@@ -48,7 +47,6 @@ import (
 	"istio.io/istio/pkg/config/schema"
 	"istio.io/istio/pkg/config/schema/collection"
 	"istio.io/istio/pkg/config/schema/snapshots"
-	configz "istio.io/istio/pkg/mcp/configz/server"
 	"istio.io/istio/pkg/mcp/creds"
 	"istio.io/istio/pkg/mcp/monitoring"
 	mcprate "istio.io/istio/pkg/mcp/rate"
@@ -64,8 +62,7 @@ const versionMetadataKey = "config.source.version"
 type Processing struct {
 	args *settings.Args
 
-	mcpCache     *snapshot.Cache
-	configzTopic fw.Topic
+	mcpCache *snapshot.Cache
 
 	k kube.Interfaces
 
@@ -84,9 +81,8 @@ type Processing struct {
 func NewProcessing(a *settings.Args) *Processing {
 	mcpCache := snapshot.New(groups.IndexFunction)
 	return &Processing{
-		args:         a,
-		mcpCache:     mcpCache,
-		configzTopic: configz.CreateTopic(mcpCache),
+		args:     a,
+		mcpCache: mcpCache,
 	}
 }
 
@@ -258,11 +254,6 @@ func (p *Processing) Start() (err error) {
 	return nil
 }
 
-// ConfigZTopic returns the ConfigZTopic for the processor.
-func (p *Processing) ConfigZTopic() fw.Topic {
-	return p.configzTopic
-}
-
 func (p *Processing) getServerGrpcOptions() []grpc.ServerOption {
 	var grpcOptions []grpc.ServerOption
 	grpcOptions = append(grpcOptions,