Merge pull request #83 from google/caramilk

garybowers · web-flow · commit f56e0b15b157 · 2022-06-16T21:25:39.000+01:00
garyb/ft_istiovs
diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,6 @@
 *.swp
 .DS_Store
 **/.DS_Store
-shifter
 out/
 *.swp
 shifter_linux_*
@@ -17,3 +16,4 @@ data**
 .vscode
 *.zip
 data**
+caramilk
diff --git a/shifter/generators/generator.go b/shifter/generators/generator.go
@@ -40,9 +40,9 @@ func NewGenerator(outputType string, name string, input []lib.K8sobject, paramet
 
 	switch outputType {
 	case "yaml":
-		return generator.Yaml("", generator.Input.Object)
+		return generator.Yaml(name, generator.Input.Object)
 	case "helm":
-		return generator.Helm("", generator.Input.Object, generator.Input.Parameters)
+		return generator.Helm(name, generator.Input.Object, generator.Input.Parameters)
 	}
 
 	return nil
diff --git a/shifter/generators/yaml.go b/shifter/generators/yaml.go
@@ -26,7 +26,7 @@ func (generator *Generator) Yaml(name string, objects []lib.K8sobject) []lib.Con
 	var converted []lib.Converted
 
 	for _, v := range objects {
-		kind := fmt.Sprintf("%v", v.Kind)
+		//kind := fmt.Sprintf("%v", v.Kind)
 		buff := new(bytes.Buffer)
 		writer := bufio.NewWriter(buff)
 
@@ -38,7 +38,7 @@ func (generator *Generator) Yaml(name string, objects []lib.K8sobject) []lib.Con
 		writer.Flush()
 
 		var result lib.Converted
-		result.Name = kind
+		result.Name = name
 		result.Path = "/"
 		result.Payload = *buff
 
diff --git a/shifter/go.mod b/shifter/go.mod
@@ -16,6 +16,8 @@ require (
 	golang.org/x/exp v0.0.0-20220426173459-3bcf042a4bf5
 	google.golang.org/api v0.66.0
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
+	istio.io/api v0.0.0-20220512181135-e8ec1e1d89de
+	istio.io/client-go v1.14.0
 	k8s.io/api v0.24.0
 	k8s.io/apimachinery v0.24.0
 	k8s.io/client-go v0.24.0
diff --git a/shifter/go.sum b/shifter/go.sum
@@ -995,6 +995,10 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+istio.io/api v0.0.0-20220512181135-e8ec1e1d89de h1:xYxUL/LyuJ5yb0o/d2GXseYjx9HIBpLHLArp2Zd8d+M=
+istio.io/api v0.0.0-20220512181135-e8ec1e1d89de/go.mod h1:00myJeQGWma4Y5pboJ+MM4P2uqEWulKA1duC8kYN5Wo=
+istio.io/client-go v1.14.0 h1:KKXMnxXx3U2866OP8FBYlJhjKdI3yIUQnt8L6hSzDHE=
+istio.io/client-go v1.14.0/go.mod h1:C7K0CKQlvY84yQKkZhxQbD1riqvnsgXJm3jF5GOmzNg=
 k8s.io/api v0.23.0/go.mod h1:8wmDdLBHBNxtOIytwLstXt5E9PddnZb0GaMcqsvDBpg=
 k8s.io/api v0.24.0 h1:J0hann2hfxWr1hinZIDefw7Q96wmCBx6SSB8IY0MdDg=
 k8s.io/api v0.24.0/go.mod h1:5Jl90IUrJHUJYEMANRURMiVvJ0g7Ax7r3R1bqO8zx8I=
diff --git a/shifter/inputs/yaml.go b/shifter/inputs/yaml.go
@@ -16,16 +16,15 @@ package input
 import (
 	"bytes"
 	"fmt"
+	gyaml "github.com/ghodss/yaml"
+	yaml "gopkg.in/yaml.v3"
 	"io"
 	"io/ioutil"
 	"log"
 	"os"
 	"shifter/lib"
 	"shifter/processor"
 	"strings"
-
-	gyaml "github.com/ghodss/yaml"
-	yaml "gopkg.in/yaml.v3"
 )
 
 type Spec struct {
diff --git a/shifter/ops/convert.go b/shifter/ops/convert.go
@@ -92,18 +92,20 @@ func (converter *Converter) ConvertFiles() {
 		switch converter.InputType {
 		case "yaml":
 			sourceFile := inputs.Yaml(file.Content, converter.Flags)
-			r = generator.NewGenerator(converter.Generator, "test", sourceFile, nil)
+			log.Println(file.Filename)
+			r = generator.NewGenerator(converter.Generator, file.Filename, sourceFile, nil)
 		case "template":
 			sourceFile, values := inputs.Template(file.Content, converter.Flags)
-			r = generator.NewGenerator(converter.Generator, "test", sourceFile, values)
+			r = generator.NewGenerator(converter.Generator, file.Filename, sourceFile, values)
 		}
 
 		//outputFileName := fmt.Sprint(idx)
 		for k := range r {
 			fileObj := &FileObject{
-				StorageType:   file.StorageType,
-				SourcePath:    (converter.OutputPath + "/" + r[k].Path + r[k].Name + filepath.Ext(file.SourcePath)),
-				Filename:      r[k].Name,
+				StorageType: file.StorageType,
+				//SourcePath:    (converter.OutputPath + "/" + r[k].Path + r[k].Name + filepath.Ext(file.SourcePath)),
+				SourcePath:    (converter.OutputPath + "/" + r[k].Path + r[k].Name),
+				Filename:      file.Filename,
 				Ext:           filepath.Ext(file.SourcePath),
 				Content:       r[k].Payload,
 				ContentLength: file.ContentLength,
diff --git a/shifter/ops/local.go b/shifter/ops/local.go
@@ -23,16 +23,17 @@ import (
 func (fileObj *FileObject) WriteLCLFile() {
 
 	if _, err := os.Stat(fileObj.SourcePath); os.IsNotExist(err) {
-		os.MkdirAll(filepath.Dir(fileObj.SourcePath), 0700) // Create your file
+		os.MkdirAll(filepath.Dir(fileObj.SourcePath), 0700) // Create output directory
 	}
 
 	// Create New File
-	f, err := os.Create(fileObj.SourcePath)
+	f, err := os.OpenFile(fileObj.SourcePath, os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0700)
 	if err != nil {
 		log.Println(err)
 		return
 	}
 	defer f.Close()
+	f.WriteString("---\n")
 	// Write the Bytes Buffer to File
 	_, err = f.Write(fileObj.Content.Bytes())
 	if err != nil {
@@ -91,6 +92,7 @@ func ProcessLCLPath(path string) ([]*FileObject, error) {
 					StorageType: LCL,
 					SourcePath:  filePath,
 					Ext:         filepath.Ext(filePath),
+					Filename:    filepath.Base(filePath),
 				}
 				// Add File Object to Array of Files
 				files = append(files, fileObj)
diff --git a/shifter/ops/types.go b/shifter/ops/types.go
@@ -35,16 +35,11 @@ type Converter struct {
 }
 
 type FileObject struct {
-	UUID        string // Unique ID of the Run
-	StorageType string // GCS or LCL Storage
-	SourcePath  string // Bucket or Local Path
-	Ext         string // File Extention
-
-	//Root     string // Root Directory "/data" LCL Storage
-	//Bucket   string // Root Bucket Nmae GCS Storage
-	//Path     string // Sub Path ["raw", "output"]
-	Filename string // Filename
-
+	UUID          string       // Unique ID of the Run
+	StorageType   string       // GCS or LCL Storage
+	SourcePath    string       // Bucket or Local Path
+	Ext           string       // File Extention
+	Filename      string       // Filename
 	Content       bytes.Buffer // Content as Bytes Buffer
 	ContentLength int          // Content Length (len(bytes.buffer))
 }
diff --git a/shifter/processor/deployment.go b/shifter/processor/deployment.go
@@ -0,0 +1,32 @@
+/*
+copyright 2019 google llc
+licensed under the apache license, version 2.0 (the "license");
+you may not use this file except in compliance with the license.
+you may obtain a copy of the license at
+    http://www.apache.org/licenses/license-2.0
+unless required by applicable law or agreed to in writing, software
+distributed under the license is distributed on an "as is" basis,
+without warranties or conditions of any kind, either express or implied.
+see the license for the specific language governing permissions and
+limitations under the license.
+*/
+
+package processor
+
+import (
+	appsv1 "k8s.io/api/apps/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+func convertDeploymentToDeployment(OSDeployment appsv1.Deployment, flags map[string]string) appsv1.Deployment {
+	deployment := &appsv1.Deployment{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "Deployment",
+			APIVersion: "apps/v1",
+		},
+		ObjectMeta: OSDeployment.ObjectMeta,
+		Spec:       OSDeployment.Spec,
+	}
+
+	return *deployment
+}
diff --git a/shifter/processor/processor.go b/shifter/processor/processor.go
@@ -18,6 +18,7 @@ import (
 	"fmt"
 	osappsv1 "github.com/openshift/api/apps/v1"
 	osroutev1 "github.com/openshift/api/route/v1"
+	appsv1 "k8s.io/api/apps/v1"
 	apiv1 "k8s.io/api/core/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	kjson "k8s.io/apimachinery/pkg/runtime/serializer/json"
@@ -45,18 +46,41 @@ func Processor(input []byte, kind interface{}, flags map[string]string) lib.K8so
 		return k
 		break
 
-	case "Route":
-		var route osroutev1.Route
-		json.Unmarshal(input, &route)
-		t := convertRouteToIngress(route, flags)
+	case "Deployment":
+		var d appsv1.Deployment
+		json.Unmarshal(input, &d)
+		t := convertDeploymentToDeployment(d, flags)
 		var k lib.K8sobject
 
-		k.Kind = "Ingress"
+		k.Kind = "Deployment"
 		k.Object = &t
 
 		return k
 		break
 
+	case "Route":
+		var route osroutev1.Route
+		json.Unmarshal(input, &route)
+		if flags["istio-gateway"] != "" {
+			t := convertRouteToIstioVirtualService(route, flags)
+			var k lib.K8sobject
+
+			k.Kind = "Ingress"
+			k.Object = &t
+
+			return k
+			break
+		} else {
+			t := convertRouteToIngress(route, flags)
+			var k lib.K8sobject
+
+			k.Kind = "Ingress"
+			k.Object = &t
+
+			return k
+			break
+		}
+
 	case "Service":
 		var service apiv1.Service
 		json.Unmarshal(input, &service)
@@ -93,6 +117,18 @@ func Processor(input []byte, kind interface{}, flags map[string]string) lib.K8so
 		return k
 		break
 
+	case "ServiceAccount":
+		var sa apiv1.ServiceAccount
+		json.Unmarshal(input, &sa)
+		t := convertServiceAccountToServiceAccount(sa, flags)
+		var k lib.K8sobject
+
+		k.Kind = kind
+		k.Object = &t
+
+		return k
+		break
+
 	}
 
 	return k
diff --git a/shifter/processor/route.go b/shifter/processor/route.go
@@ -14,42 +14,88 @@ limitations under the license.
 package processor
 
 import (
+	//"fmt"
 	osroutev1 "github.com/openshift/api/route/v1"
 	"golang.org/x/exp/maps"
-	v1beta1 "k8s.io/api/extensions/v1beta1"
+	io "istio.io/api/networking/v1beta1"
+	v1beta1 "istio.io/client-go/pkg/apis/networking/v1beta1"
+	v1 "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/util/intstr"
+	//"k8s.io/apimachinery/pkg/util/intstr"
+	//networkingv1beta1 "istio.io/api/networking/v1beta1"
 	"log"
 )
 
-func convertRouteToIngress(OSRoute osroutev1.Route, flags map[string]string) v1beta1.Ingress {
+func convertRouteToIstioVirtualService(OSRoute osroutev1.Route, flags map[string]string) v1beta1.VirtualService {
+	flagIstioGateway := flags["istio-gateway"]
+
+	vs := &v1beta1.VirtualService{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "networking.istio.io/v1alpha3",
+			Kind:       "VirtualService",
+		},
+		ObjectMeta: OSRoute.ObjectMeta,
+		Spec:       io.VirtualService{},
+	}
+
+	var (
+		vsSpec            io.VirtualService
+		vsHTTPRoute       io.HTTPRoute
+		vsHTTPMatchReq    io.HTTPMatchRequest
+		vsHTTPRouteDest   io.HTTPRouteDestination
+		vsDestination     io.Destination
+		vsDestStringMatch io.StringMatch
+		vsURIMatch        io.StringMatch_Prefix
+	)
+
+	vsSpec.Hosts = append(vsSpec.Hosts, OSRoute.Spec.Host)
+	vsSpec.Gateways = append(vsSpec.Gateways, flagIstioGateway)
+	// build the route
+	vsHTTPRoute.Name = OSRoute.ObjectMeta.Name
+
+	vsURIMatch.Prefix = "/"
+	vsDestStringMatch.MatchType = &vsURIMatch
+	vsHTTPMatchReq.Uri = &vsDestStringMatch
+
+	vsDestination.Host = OSRoute.Spec.To.Name
+	vsHTTPRouteDest.Destination = &vsDestination
+
+	vsHTTPRoute.Match = append(vsHTTPRoute.Match, &vsHTTPMatchReq)
+	vsHTTPRoute.Route = append(vsHTTPRoute.Route, &vsHTTPRouteDest)
+	vsSpec.Http = append(vsSpec.Http, &vsHTTPRoute)
+
+	vs.Spec = vsSpec
+
+	return *vs
+}
+
+func convertRouteToIngress(OSRoute osroutev1.Route, flags map[string]string) v1.Ingress {
 
 	flagIngressFacing := flags["ingress-facing"]
 
-	ingress := &v1beta1.Ingress{
+	ingress := &v1.Ingress{
 		TypeMeta: metav1.TypeMeta{
-			APIVersion: "networking.k8s.io/v1beta1",
+			APIVersion: "networking.k8s.io/v1",
 			Kind:       "Ingress",
 		},
 		ObjectMeta: OSRoute.ObjectMeta,
-		Spec:       v1beta1.IngressSpec{},
+		Spec:       v1.IngressSpec{},
 	}
 
 	/*
 		Openshift routes can take different forms which need to be handled by different types of
 		ingress resources.
 	*/
-
 	var (
-		ingressSpec          v1beta1.IngressSpec
-		ingressRule          v1beta1.IngressRule
-		ingressRuleValue     v1beta1.IngressRuleValue
-		httpIngressRuleValue v1beta1.HTTPIngressRuleValue
-		ingressPath          v1beta1.HTTPIngressPath
+		ingressSpec           v1.IngressSpec
+		ingressRule           v1.IngressRule
+		ingressRuleValue      v1.IngressRuleValue
+		httpIngressRuleValue  v1.HTTPIngressRuleValue
+		ingressPath           v1.HTTPIngressPath
+		ingressServiceBackend v1.IngressServiceBackend
 	)
 
 	//Logic to convert a route to ingress
-
 	// Check if there is a host specified
 	if OSRoute.Spec.Host != "" {
 		ingressRule.Host = OSRoute.Spec.Host
@@ -61,16 +107,29 @@ func convertRouteToIngress(OSRoute osroutev1.Route, flags map[string]string) v1b
 	} else {
 		ingressPath.Path = "/"
 	}
+	//set the path type
+	var pathType v1.PathType
+	pathType = "ImplementationSpecific"
+	ingressPath.PathType = &pathType
 
-	ingressPath.Backend.ServicePort = intstr.FromString(OSRoute.Spec.To.Name)
-	ingressPath.Backend.ServiceName = OSRoute.Spec.To.Name
+	//Check if a port name has been provided otherwise use the default
+	if OSRoute.Spec.Port.TargetPort.IntValue() == 0 && OSRoute.Spec.Port.TargetPort.String() != "" {
+		ingressServiceBackend.Port.Name = OSRoute.Spec.Port.TargetPort.String()
+	} else if OSRoute.Spec.Port.TargetPort.IntValue() != 0 {
+		ingressServiceBackend.Port.Number = int32(OSRoute.Spec.Port.TargetPort.IntValue())
+	}
+	ingressServiceBackend.Name = OSRoute.Spec.To.Name
 
+	// build up the ingress spec
+	//Add the backend service
+	ingressPath.Backend.Service = &ingressServiceBackend
 	httpIngressRuleValue.Paths = append(httpIngressRuleValue.Paths, ingressPath)
 	ingressRuleValue.HTTP = &httpIngressRuleValue
 	ingressRule.IngressRuleValue = ingressRuleValue
 	ingressSpec.Rules = append(ingressSpec.Rules, ingressRule)
 	ingress.Spec = ingressSpec
 
+	// Process the flags
 	if flagIngressFacing == "internal" {
 		log.Println("Modifying ingress to internal loadbalancer")
 		annotation := make(map[string]string)
diff --git a/shifter/processor/serviceaccount.go b/shifter/processor/serviceaccount.go
