Add locality lb settings support on destination rules

Makefile

@@ -21,7 +21,7 @@ PROTOC_ZIP=protoc-$(PROTOC_VER)-osx-x86_64.zip
 
 
 # ROOT_PACKAGE :: the package (relative to $GOPATH/src) that is the target for code generation
-ROOT_PACKAGE=github.com/admiral/admiral
+ROOT_PACKAGE=github.com/istio-ecosystem/admiral/admiral
 # CUSTOM_RESOURCE_NAME :: the name of the custom resource that we're generating client code for
 CUSTOM_RESOURCE_NAME=admiral
 # CUSTOM_RESOURCE_VERSION :: the version of the resource
@@ -66,12 +66,11 @@ api-gen:
 	go install github.com/golang/protobuf/protoc-gen-go
 	$(GOCMD) generate ./...
 	go install k8s.io/code-generator/cmd/deepcopy-gen
-	$(GOBIN)/deepcopy-gen --input-dirs ./admiral/pkg/apis/admiral/model --bounding-dirs ./admiral/pkg/apis/admiral/model -O zz_generated.deepcopy -o $(GOPATH)/src
 
 crd-gen:
-	#go get -d -u -fix k8s.io/code-generator
-	#go get -d -u -fix k8s.io/apimachinery
-	#go get -d -u -fix k8s.io/gengo
+	go get -d -u -fix k8s.io/code-generator
+	go get -d -u -fix k8s.io/apimachinery
+	go get -d -u -fix k8s.io/gengo
 	$(GOPATH)/src/k8s.io/code-generator/generate-groups.sh all "$(ROOT_PACKAGE)/pkg/client" "$(ROOT_PACKAGE)/pkg/apis" "$(CUSTOM_RESOURCE_NAME):$(CUSTOM_RESOURCE_VERSION)"
 
 # Cross compilation

admiral/cmd/admiral/cmd/root.go

@@ -5,8 +5,8 @@ import (
 	"flag"
 	"fmt"
 	"github.com/istio-ecosystem/admiral/admiral/pkg/clusters"
+	"github.com/prometheus/common/log"
 	"github.com/istio-ecosystem/admiral/admiral/pkg/controller/common"
-	"istio.io/istio/pkg/log"
 	"os"
 	"os/signal"
 	"syscall"
@@ -16,7 +16,6 @@ import (
 )
 
 var (
-	loggingOptions = log.DefaultOptions()
 	ctx, cancel    = context.WithCancel(context.Background())
 )
 
@@ -36,8 +35,7 @@ func GetRootCmd(args []string) *cobra.Command {
 			if len(args) > 0 {
 				return fmt.Errorf("%q is an invalid argument", args[0])
 			}
-			err := log.Configure(loggingOptions)
-			return err
+			return nil
 		},
 		Run: func(cmd *cobra.Command, args []string) {
 			log.Info("Starting Admiral")
@@ -86,7 +84,6 @@ func GetRootCmd(args []string) *cobra.Command {
 		"The hostname suffix to customize the cname generated by admiral. Default suffix value will be \"global\"")
 	rootCmd.PersistentFlags().StringVar(&params.LabelSet.WorkloadIdentityLabel, "workload_identity_label", "identity",
 		"The workload identity label key, on deployment which holds identity value used to generate cname by admiral. Default label key will be \"identity\"")
-	loggingOptions.AttachCobraFlags(rootCmd)
 
 	return rootCmd
 }

admiral/pkg/apis/admiral/model/dependency.proto

@@ -5,7 +5,7 @@ package admiral.global.v1alpha;
 option go_package = "model";
 
 // ```
-// apiVersion: admiral.global.traffic/v1alpha
+// apiVersion: admiral.io/v1alpha1
 // kind: Dependency
 // metadata:
 //   name: my-dependency

admiral/pkg/apis/admiral/model/globalrouting.proto

@@ -8,7 +8,7 @@ option go_package = "model";
 
 
 // ```
-// apiVersion: navarch.global.traffic/v1alpha
+// apiVersion: admiral.io/v1alpha1
 // kind: GlobalTrafficPolicy
 // metadata:
 //   name: my-routing