Linkerd plugin

Gopkg.toml

@@ -25,11 +25,11 @@
 
 [[constraint]]
   name = "github.com/solo-io/solo-kit"
-  version = "0.7.0"
+  version = "0.8.0"
 
 [[constraint]]
   name = "github.com/solo-io/go-utils"
-  version = "0.7.15"
+  version = "0.8.4"
 
 [[constraint]]
   name = "github.com/hashicorp/consul"

Makefile

@@ -62,6 +62,8 @@ update-deps:
 	mkdir -p $$GOPATH/src/github.com/lyft
 	cd $$GOPATH/src/github.com/lyft && if [ ! -e protoc-gen-validate ];then git clone https://github.com/envoyproxy/protoc-gen-validate; fi && cd protoc-gen-validate && git checkout v0.0.6
 	go get -u github.com/paulvollmer/2gobytes
+	go get -v -u github.com/golang/mock/gomock
+	go install github.com/golang/mock/mockgen
 
 .PHONY: pin-repos
 pin-repos:
@@ -93,9 +95,10 @@ generated-code: $(OUTPUT_DIR)/.generated-code
 
 # Note: currently we generate CLI docs, but don't push them to the consolidated docs repo (gloo-docs). Instead, the
 # Glooctl enterprise docs are pushed from the private repo.
+# TODO(EItanya): make mockgen work for gloo
 SUBDIRS:=projects test
 $(OUTPUT_DIR)/.generated-code:
-	go generate ./...
+	SKIP_MOCK_GEN=1 go generate ./...
 	(rm docs/cli/glooctl*; go run projects/gloo/cli/cmd/docs/main.go)
 	gofmt -w $(SUBDIRS)
 	goimports -w $(SUBDIRS)

changelog/v0.13.20/linkerd-gloo-plugin.yaml

@@ -0,0 +1,5 @@
+changelog:
+  - type: NEW_FEATURE
+    description: Enable linkerd header addition on gloo upstreams.
+    issueLink: https://github.com/solo-io/supergloo/issues/422
+    resolvesIssue: false

ci/upload_github_release_assets.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"github.com/solo-io/go-utils/githubutils"
-	"github.com/solo-io/go-utils/logger"
+	"github.com/solo-io/go-utils/log"
 	"github.com/solo-io/go-utils/pkgmgmtutils"
 	"github.com/solo-io/go-utils/versionutils"
 )
@@ -111,21 +111,21 @@ func main() {
 	status, err := pkgmgmtutils.UpdateFormulas(repoOwner, repoName, buildDir,
 		`glooctl-(darwin|linux|windows).*\.sha256`, fOpts)
 	if err != nil {
-		logger.Fatalf("Error trying to update package manager formulas. Error was: %s", err.Error())
+		log.Fatalf("Error trying to update package manager formulas. Error was: %s", err.Error())
 	}
 	for _, s := range status {
 		if !s.Updated {
 			if s.Err != nil {
-				logger.Fatalf("Error while trying to update formula %s. Error was: %s", s.Name, s.Err.Error())
+				log.Fatalf("Error while trying to update formula %s. Error was: %s", s.Name, s.Err.Error())
 			} else {
-				logger.Fatalf("Error while trying to update formula %s. Error was nil", s.Name) // Shouldn't happen; really bad if it does
+				log.Fatalf("Error while trying to update formula %s. Error was nil", s.Name) // Shouldn't happen; really bad if it does
 			}
 		}
 		if s.Err != nil {
 			if s.Err == pkgmgmtutils.ErrAlreadyUpdated {
-				logger.Warnf("Formula %s was updated externally, so no updates applied during this release", s.Name)
+				log.Warnf("Formula %s was updated externally, so no updates applied during this release", s.Name)
 			} else {
-				logger.Fatalf("Error updating Formula %s. Error was: %s", s.Name, s.Err.Error())
+				log.Fatalf("Error updating Formula %s. Error was: %s", s.Name, s.Err.Error())
 			}
 		}
 	}
@@ -137,9 +137,9 @@ func validateReleaseVersionOfCli() {
 	cmd := exec.Command(name, "--version")
 	bytes, err := cmd.Output()
 	if err != nil {
-		logger.Fatalf("Error while trying to validate artifact version. Error was: %s", err.Error())
+		log.Fatalf("Error while trying to validate artifact version. Error was: %s", err.Error())
 	}
 	if !strings.HasSuffix(string(bytes), fmt.Sprintf("version %s\n", releaseVersion)) {
-		logger.Fatalf("Unexpected version output for glooctl: %s", string(bytes))
+		log.Fatalf("Unexpected version output for glooctl: %s", string(bytes))
 	}
 }

generate.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/solo-io/solo-kit/pkg/code-generator/cmd"
 	"github.com/solo-io/solo-kit/pkg/code-generator/docgen/options"
-	"github.com/solo-io/solo-kit/pkg/utils/log"
+	"github.com/solo-io/go-utils/log"
 )
 
 //go:generate go run generate.go

install/helm/gloo/generate.go

@@ -9,7 +9,7 @@ import (
 	"github.com/ghodss/yaml"
 	"github.com/pkg/errors"
 	"github.com/solo-io/gloo/install/helm/gloo/generate"
-	"github.com/solo-io/solo-kit/pkg/utils/log"
+	"github.com/solo-io/go-utils/log"
 )
 
 var (

pin_repos.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	version "github.com/solo-io/go-utils/versionutils"
-	"github.com/solo-io/solo-kit/pkg/utils/log"
+	"github.com/solo-io/go-utils/log"
 )
 
 func main() {

pkg/cliutil/nsselect/setup.go

@@ -5,10 +5,10 @@ import (
 	"fmt"
 
 	gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1"
+	"github.com/solo-io/go-utils/kubeutils"
 	"github.com/solo-io/solo-kit/pkg/api/v1/clients"
 	"github.com/solo-io/solo-kit/pkg/api/v1/clients/factory"
 	"github.com/solo-io/solo-kit/pkg/api/v1/clients/kube"
-	"github.com/solo-io/solo-kit/pkg/utils/kubeutils"
 	"k8s.io/client-go/rest"
 )
 

pkg/cliutil/uri.go

@@ -11,8 +11,8 @@ import (
 	"strings"
 
 	"github.com/solo-io/gloo/projects/gloo/cli/pkg/cmd/options"
+	"github.com/solo-io/go-utils/kubeutils"
 	"github.com/solo-io/solo-kit/pkg/errors"
-	"github.com/solo-io/solo-kit/pkg/utils/kubeutils"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"

pkg/utils/setuputils/main_setup.go

@@ -11,12 +11,12 @@ import (
 	v1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1"
 	check "github.com/solo-io/go-checkpoint"
 	"github.com/solo-io/go-utils/contextutils"
+	"github.com/solo-io/go-utils/kubeutils"
 	"github.com/solo-io/solo-kit/pkg/api/v1/clients"
 	"github.com/solo-io/solo-kit/pkg/api/v1/clients/factory"
 	"github.com/solo-io/solo-kit/pkg/api/v1/clients/kube"
 	"github.com/solo-io/solo-kit/pkg/api/v1/resources/core"
 	"github.com/solo-io/solo-kit/pkg/errors"
-	"github.com/solo-io/solo-kit/pkg/utils/kubeutils"
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 )
 

pkg/version/check.go

@@ -2,8 +2,8 @@ package version
 
 import (
 	"github.com/pkg/errors"
+	"github.com/solo-io/go-utils/log"
 	"github.com/solo-io/go-utils/versionutils"
-	"github.com/solo-io/solo-kit/pkg/utils/log"
 )
 
 func CheckVersions() error {

projects/clusteringress/pkg/api/clusteringress/resource_client_test.go

@@ -16,9 +16,9 @@ import (
 	. "github.com/onsi/gomega"
 	. "github.com/solo-io/gloo/projects/clusteringress/pkg/api/clusteringress"
 	v1 "github.com/solo-io/gloo/projects/clusteringress/pkg/api/v1"
+	"github.com/solo-io/go-utils/kubeutils"
+	"github.com/solo-io/go-utils/log"
 	"github.com/solo-io/solo-kit/pkg/api/v1/clients"
-	"github.com/solo-io/solo-kit/pkg/utils/kubeutils"
-	"github.com/solo-io/solo-kit/pkg/utils/log"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 	"k8s.io/apimachinery/pkg/api/errors"