Skip to content

added istio and osm service mesh #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 13, 2020
Merged

added istio and osm service mesh #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f618087
added istio and osm service mesh
kumarabd Aug 13, 2020
9282b72
reduced to tag name of `smi`
leecalcote Aug 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ jobs:
docker tag ${{ secrets.IMAGE_NAME }}:latest ${{ secrets.IMAGE_NAME }}:${GITHUB_SHA::6}
docker push ${{ secrets.IMAGE_NAME }}:latest
docker push ${{ secrets.IMAGE_NAME }}:${GITHUB_SHA::6}
cd ../smi-conformance && docker build --no-cache -t smi-conformance:latest .
docker tag smi-conformance:latest smi-conformance:${GITHUB_SHA::6}
docker push smi-conformance:latest
docker push smi-conformance:${GITHUB_SHA::6}
cd ../smi-conformance && docker build --no-cache -t ${{ secrets.IMAGE_NAME }}:smi .
docker tag ${{ secrets.IMAGE_NAME }}:smi ${{ secrets.IMAGE_NAME }}:smi-${GITHUB_SHA::6}
docker push ${{ secrets.IMAGE_NAME }}:smi
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kumarabd given the update to the tag name of smi, we may have to update adapter logic accordingly.

docker push ${{ secrets.IMAGE_NAME }}:smi-${GITHUB_SHA::6}
- name: Docker tag release & push
if: github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') && success()
run: |
docker tag ${{ secrets.IMAGE_NAME }}:latest ${{ secrets.IMAGE_NAME }}:${GITHUB_REF/refs\/tags\//}
docker push ${{ secrets.IMAGE_NAME }}:${GITHUB_REF/refs\/tags\//}
docker tag smi-conformance:latest smi-conformance:${GITHUB_REF/refs\/tags\//}
docker push smi-conformance:${GITHUB_REF/refs\/tags\//}
docker tag ${{ secrets.IMAGE_NAME }}:smi ${{ secrets.IMAGE_NAME }}:smi-${GITHUB_REF/refs\/tags\//}
docker push ${{ secrets.IMAGE_NAME }}:smi-${GITHUB_REF/refs\/tags\//}
2 changes: 0 additions & 2 deletions smi-conformance/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
FROM golang:1.14-alpine3.11 as build-img
LABEL maintainer "Layer5.io"


RUN apk update && apk add --no-cache git libc-dev gcc pkgconf && mkdir /home/meshery
COPY ${PWD} /go/src/github.com/layer5io/learn-layer5/smi-conformance/
Expand Down
11 changes: 10 additions & 1 deletion smi-conformance/grpc/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,12 @@ var (
PortSvcB: "9091",
PortSvcC: "9091",
}
istioConfig = &test_gen.Linkerd{
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kumarabd do we still support Linkerd? Or was our support incomplete earlier?

istioConfig = &test_gen.Istio{
PortSvcA: "9091",
PortSvcB: "9091",
PortSvcC: "9091",
}
osmConfig = &test_gen.OSM{
PortSvcA: "9091",
PortSvcB: "9091",
PortSvcC: "9091",
Expand All @@ -40,7 +45,11 @@ func (s *Service) RunTest(ctx context.Context, req *conformance.Request) (*confo
case "maesh":
config = maeshConfig
case "istio":
config = istioConfig
req.Labels["istio-injection"] = "enabled"
case "osm":
config = osmConfig
req.Labels["openservicemesh.io/monitored-by"] = "osm"
}

result := test_gen.RunTest(config, req.Annotations, req.Labels)
Expand Down
60 changes: 60 additions & 0 deletions smi-conformance/test-gen/service-mesh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,63 @@ func (sm Linkerd) SvcBGetPort() string {
func (sm Linkerd) SvcCGetPort() string {
return sm.PortSvcC
}

type Istio struct {
PortSvcA string
PortSvcB string
PortSvcC string
}

func (sm Istio) SvcAGetInternalName(namespace string) string {
return fmt.Sprintf("http://%s.%s..svc.cluster.local.:%s", SERVICE_A_NAME, namespace, sm.PortSvcA)
}

func (sm Istio) SvcBGetInternalName(namespace string) string {
return fmt.Sprintf("http://%s.%s..svc.cluster.local.:%s", SERVICE_B_NAME, namespace, sm.PortSvcB)
}

func (sm Istio) SvcCGetInternalName(namespace string) string {
return fmt.Sprintf("http://%s.%s..svc.cluster.local.:%s", SERVICE_C_NAME, namespace, sm.PortSvcC)
}

func (sm Istio) SvcAGetPort() string {
return sm.PortSvcA
}

func (sm Istio) SvcBGetPort() string {
return sm.PortSvcB
}

func (sm Istio) SvcCGetPort() string {
return sm.PortSvcC
}

type OSM struct {
PortSvcA string
PortSvcB string
PortSvcC string
}

func (sm OSM) SvcAGetInternalName(namespace string) string {
return fmt.Sprintf("http://%s.%s..svc.cluster.local.:%s", SERVICE_A_NAME, namespace, sm.PortSvcA)
}

func (sm OSM) SvcBGetInternalName(namespace string) string {
return fmt.Sprintf("http://%s.%s..svc.cluster.local.:%s", SERVICE_B_NAME, namespace, sm.PortSvcB)
}

func (sm OSM) SvcCGetInternalName(namespace string) string {
return fmt.Sprintf("http://%s.%s..svc.cluster.local.:%s", SERVICE_C_NAME, namespace, sm.PortSvcC)
}

func (sm OSM) SvcAGetPort() string {
return sm.PortSvcA
}

func (sm OSM) SvcBGetPort() string {
return sm.PortSvcB
}

func (sm OSM) SvcCGetPort() string {
return sm.PortSvcC
}
4 changes: 0 additions & 4 deletions smi-conformance/test-gen/test_gen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,6 @@ func RunTest(meshConfig ServiceMesh, annotations, labels map[string]string) Resu
options.TestDirs = args
}

// annotations := make(map[string]string)
// Namespace Injection
// annotations["linkerd.io/inject"] = "enabled"

// Runs the test using the inCluster kubeConfig (runs only when the code is running inside the pod)
harness.InCluster = true

Expand Down