Routing policy addition (#243) (#150)

* Adding the routing policy

Co-authored-by: psikka1 <[email protected]>
Co-authored-by: vgonuguntla <[email protected]>

Makefile

@@ -32,6 +32,7 @@ CUSTOM_RESOURCE_VERSION=v1
 
 MAIN_PATH_ADMIRAL=./admiral/cmd/admiral/main.go
 OPSYS:=$(shell $(GOCMD) env GOOS)
+DEEPCOPYGEN=deepcopy-gen
 
 PATH:=$(GOBIN):$(PATH)
 
@@ -56,8 +57,10 @@ dep:
 setup:
 	$(GOGET) -u github.com/golang/protobuf/[email protected]
 
+model-gen:
+	$(DEEPCOPYGEN) -i ./admiral/pkg/apis/admiral/model/ -O zz_generated.deepcopy
 
-gen-all: api-gen crd-gen
+gen-all: api-gen model-gen crd-gen
 
 install-protoc-mac:
 	curl -OL https://github.com/google/protobuf/releases/download/v$(PROTOC_VER)/$(PROTOC_ZIP)
@@ -167,4 +170,5 @@ gen-yaml:
 	cp ./install/sample/gtp_topology.yaml ./out/yaml/gtp_topology.yaml
 	cp ./install/sample/grpc-client.yaml ./out/yaml/grpc-client.yaml
 	cp ./install/prometheus/prometheus.yaml ./out/yaml/prometheus.yaml
-	cp ./install/scripts/*.sh ./out/scripts/
+	cp ./install/sample/rp.yaml ./out/yaml/rp.yaml
+	cp ./install/scripts/*.sh ./out/scripts/

admiral/cmd/admiral/cmd/root.go

@@ -133,11 +133,15 @@ func GetRootCmd(args []string) *cobra.Command {
 	rootCmd.PersistentFlags().StringVar(&params.SecretResolverConfigPath, "secret_resolver_config_path", "/etc/config/resolver_config.yaml",
 		"Path to the secret resolver config")
 	rootCmd.PersistentFlags().BoolVar(&params.MetricsEnabled, "metrics", true, "Enable prometheus metrics collections")
-	rootCmd.PersistentFlags().StringVar(&params.AdmiralStateCheckerName,"admiral_state_checker_name","NoOPStateChecker","The value of the admiral_state_checker_name label to configure the DR Strategy for Admiral")
-	rootCmd.PersistentFlags().StringVar(&params.DRStateStoreConfigPath,"dr_state_store_config_path","","Location of config file which has details for data store. Ex:- Dynamo DB connection details")
-	rootCmd.PersistentFlags().StringVar(&params.ServiceEntryIPPrefix,"se_ip_prefix","240.0","IP prefix for the auto generated IPs for service entries. Only the first two octets:  Eg- 240.0")
-
-
+	rootCmd.PersistentFlags().StringVar(&params.AdmiralStateCheckerName, "admiral_state_checker_name", "NoOPStateChecker", "The value of the admiral_state_checker_name label to configure the DR Strategy for Admiral")
+	rootCmd.PersistentFlags().StringVar(&params.DRStateStoreConfigPath, "dr_state_store_config_path", "", "Location of config file which has details for data store. Ex:- Dynamo DB connection details")
+	rootCmd.PersistentFlags().StringVar(&params.ServiceEntryIPPrefix, "se_ip_prefix", "240.0", "IP prefix for the auto generated IPs for service entries. Only the first two octets:  Eg- 240.0")
+	rootCmd.PersistentFlags().StringVar(&params.EnvoyFilterVersion, "envoy_filter_version", "",
+		"The value of envoy filter version is used to match the proxy version for envoy filter created by routing policy")
+	rootCmd.PersistentFlags().StringVar(&params.EnvoyFilterAdditionalConfig, "envoy_filter_additional_config", "",
+		"The value of envoy filter is to add additional config to the filter config section")
+	rootCmd.PersistentFlags().BoolVar(&params.EnableRoutingPolicy, "enable_routing_policy", false,
+		"If Routing Policy feature needs to be enabled")
 	return rootCmd
 }
 

admiral/crd/routingPolicy.yaml

@@ -0,0 +1,14 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: routingpolicies.admiral.io
+spec:
+  group: admiral.io
+  version: v1alpha1
+  names:
+    kind: RoutingPolicy
+    plural: routingpolicies
+    shortNames:
+      - rp
+      - rps
+  scope: Namespaced

admiral/pkg/apis/admiral/model/doc.go

@@ -2,5 +2,6 @@ package model
 
 //go:generate protoc -I . dependency.proto --go_out=plugins=grpc:.
 //go:generate protoc -I . globalrouting.proto --go_out=plugins=grpc:.
+//go:generate protoc -I . routingpolicy.proto --go_out=plugins=grpc:.
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +k8s:deepcopy-gen=package,register

admiral/pkg/apis/admiral/model/routingpolicy.proto

@@ -0,0 +1,32 @@
+syntax = "proto3";
+
+package admiral.global.v1alpha;
+
+option go_package = "model";
+
+//```
+//    apiVersion: admiral.io/v1alpha1
+//    kind: RoutingPolicy
+//    metadata:
+//      name: greeting-routing-policy
+//      annotations:
+//        admiral.io/env: stage
+//      labels:
+//        identity: greeting
+//    spec:
+//      plugin: greeting
+//      hosts:
+//      - qal.greeting.mesh
+//      config:
+//        cachePrefix: cache-v1
+//        cachettlSec: "86400"
+//        dispatcherUrl: qal.greeting.dispatcher.mesh
+//        algo: greetingDispatcher
+//        pathPrefix: "/wpcatalog,/consumercatalog,/v1/company/{id}/auth/hydrate,/consumercatalog"
+//```
+
+message RoutingPolicy {
+  string plugin = 1;
+  repeated string hosts = 2;
+  map<string, string> config = 3;
+}

admiral/pkg/apis/admiral/v1/register.go

@@ -52,6 +52,8 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&DependencyList{},
 		&GlobalTrafficPolicy{},
 		&GlobalTrafficPolicyList{},
+		&RoutingPolicy{},
+		&RoutingPolicyList{},
 	)
 
 	// register the type in the scheme

admiral/pkg/apis/admiral/v1/type.go

@@ -55,3 +55,29 @@ type GlobalTrafficPolicyList struct {
 
 	Items []GlobalTrafficPolicy `json:"items"`
 }
+
+//generic cdr object to wrap the GlobalTrafficPolicy api
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type RoutingPolicy struct {
+	meta_v1.TypeMeta   `json:",inline"`
+	meta_v1.ObjectMeta `json:"metadata"`
+	Spec               model.RoutingPolicy `json:"spec"`
+	Status             RoutingPolicyStatus `json:"status"`
+}
+
+// FooStatus is the status for a Foo resource
+
+type RoutingPolicyStatus struct {
+	ClusterSynced int32  `json:"clustersSynced"`
+	State         string `json:"state"`
+}
+
+// FooList is a list of Foo resources
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type RoutingPolicyList struct {
+	meta_v1.TypeMeta `json:",inline"`
+	meta_v1.ListMeta `json:"metadata"`
+
+	Items []RoutingPolicy `json:"items"`
+}