Skip to content

Commit

Permalink
resourcegen: add optional service-mesh-proxy to emojivoto
Browse files Browse the repository at this point in the history
  • Loading branch information
@malt3
malt3 committed Apr 18, 2024
1 parent 6287645 commit 921f0cb
Show file tree
Hide file tree
Showing 2 changed files with 102 additions and 9 deletions.
13 changes: 13 additions & 0 deletions e2e/internal/kuberesource/parts.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,3 +226,16 @@ func Initializer() *applycorev1.ContainerApplyConfiguration {
WithMountPath("/tls-config"),
)
}

// ServiceMeshProxy creates a new service mesh proxy sidecar container.
func ServiceMeshProxy() *applycorev1.ContainerApplyConfiguration {
return applycorev1.Container().
WithName("sidecar").
WithImage("ghcr.io/edgelesssys/contrast/service-mesh-proxy:latest").
WithRestartPolicy(corev1.ContainerRestartPolicyAlways).
WithVolumeMounts(VolumeMount().
WithName("tls-certs").
WithMountPath("/tls-config"),
).
WithSecurityContext(SecurityContext().WithPrivileged(true).AddCapabilities("NET_ADMIN").Inner())
}
98 changes: 89 additions & 9 deletions e2e/internal/kuberesource/sets.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package kuberesource

import (
"fmt"

corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/intstr"
applyappsv1 "k8s.io/client-go/applyconfigurations/apps/v1"
Expand Down Expand Up @@ -229,8 +231,46 @@ func OpenSSL() ([]any, error) {
}

// generateEmojivoto returns resources for deploying Emojivoto application.
func generateEmojivoto() ([]any, error) {
func generateEmojivoto(smMode serviceMeshMode) ([]any, error) {
ns := "edg-default"
var emojiSvcImage, emojiVotingSvcImage, emojiWebImage, emojiSvcHost, votingSvcHost string
smProxyEmoji := ServiceMeshProxy()
smProxyWeb := ServiceMeshProxy()
smProxyVoting := ServiceMeshProxy()
switch smMode {
case ServiceMeshDisabled:
emojiSvcImage = "ghcr.io/3u13r/emojivoto-emoji-svc:coco-1"
emojiVotingSvcImage = "ghcr.io/3u13r/emojivoto-voting-svc:coco-1"
emojiWebImage = "ghcr.io/3u13r/emojivoto-web:coco-1"
emojiSvcHost = "emoji-svc:8080"
votingSvcHost = "voting-svc:8080"
smProxyEmoji = nil
smProxyWeb = nil
smProxyVoting = nil
case ServiceMeshIngress:
emojiSvcImage = "docker.l5d.io/buoyantio/emojivoto-emoji-svc:v11"
emojiVotingSvcImage = "docker.l5d.io/buoyantio/emojivoto-voting-svc:v11"
emojiWebImage = "docker.l5d.io/buoyantio/emojivoto-web:v11"
emojiSvcHost = "127.137.0.1:8081"
votingSvcHost = "127.137.0.2:8081"
smProxyWeb = smProxyWeb.
WithEnv(EnvVar().WithName("EDG_INGRESS_PROXY_CONFIG").WithValue("web#8080#false")).
WithEnv(EnvVar().WithName("EDG_EGRESS_PROXY_CONFIG").WithValue("emoji#127.137.0.1:8081#emoji-svc:8080##voting#127.137.0.2:8081#voting-svc:8080"))
case ServiceMeshEgress:
emojiSvcImage = "ghcr.io/3u13r/emojivoto-emoji-svc:coco-1"
emojiVotingSvcImage = "ghcr.io/3u13r/emojivoto-voting-svc:coco-1"
emojiWebImage = "docker.l5d.io/buoyantio/emojivoto-web:v11"
emojiSvcHost = "127.137.0.1:8081"
votingSvcHost = "127.137.0.2:8081"
smProxyWeb = smProxyWeb.
WithSecurityContext(SecurityContext().WithPrivileged(true).AddCapabilities("NET_ADMIN").AddCapabilities("NET_RAW").Inner()).
WithEnv(EnvVar().WithName("EDG_PROXY_CONFIG").WithValue("emoji#127.137.0.1:8081#emoji-svc:8080##voting#127.137.0.2:8081#voting-svc:8080"))
smProxyEmoji = nil
smProxyVoting = nil
default:
panic(fmt.Sprintf("unknown service mesh mode: %s", smMode))
}

emoji := Deployment("emoji", ns).
WithLabels(map[string]string{
"app.kubernetes.io/name": "emoji",
Expand All @@ -256,7 +296,7 @@ func generateEmojivoto() ([]any, error) {
WithContainers(
Container().
WithName("emoji-svc").
WithImage("ghcr.io/3u13r/emojivoto-emoji-svc:coco-1").
WithImage(emojiSvcImage).
WithPorts(
ContainerPort().
WithName("grpc").
Expand Down Expand Up @@ -327,7 +367,7 @@ func generateEmojivoto() ([]any, error) {
WithContainers(
Container().
WithName("vote-bot").
WithImage("ghcr.io/3u13r/emojivoto-web:coco-1").
WithImage(emojiWebImage).
WithCommand("emojivoto-vote-bot").
WithEnv(EnvVar().WithName("WEB_HOST").WithValue("web-svc:443")).
WithResources(ResourceRequirements().
Expand Down Expand Up @@ -363,7 +403,7 @@ func generateEmojivoto() ([]any, error) {
WithContainers(
Container().
WithName("voting-svc").
WithImage("ghcr.io/3u13r/emojivoto-voting-svc:coco-1").
WithImage(emojiVotingSvcImage).
WithPorts(
ContainerPort().
WithName("grpc").
Expand Down Expand Up @@ -436,15 +476,15 @@ func generateEmojivoto() ([]any, error) {
WithContainers(
Container().
WithName("web-svc").
WithImage("ghcr.io/3u13r/emojivoto-web:coco-1").
WithImage(emojiWebImage).
WithPorts(
ContainerPort().
WithName("https").
WithContainerPort(8080),
).
WithEnv(EnvVar().WithName("WEB_PORT").WithValue("8080")).
WithEnv(EnvVar().WithName("EMOJISVC_HOST").WithValue("emoji-svc:8080")).
WithEnv(EnvVar().WithName("VOTINGSVC_HOST").WithValue("voting-svc:8080")).
WithEnv(EnvVar().WithName("EMOJISVC_HOST").WithValue(emojiSvcHost)).
WithEnv(EnvVar().WithName("VOTINGSVC_HOST").WithValue(votingSvcHost)).
WithEnv(EnvVar().WithName("INDEX_BUNDLE").WithValue("dist/index_bundle.js")).
WithEnv(EnvVar().WithName("EDG_CERT_PATH").WithValue("/tls-config/certChain.pem")).
WithEnv(EnvVar().WithName("EDG_CA_PATH").WithValue("/tls-config/MeshCACert.pem")).
Expand All @@ -462,6 +502,25 @@ func generateEmojivoto() ([]any, error) {
return nil, err
}

if smProxyEmoji != nil {
emoji, err = AddServiceMesh(emoji, smProxyEmoji, smMode)
if err != nil {
return nil, err
}
}
if smProxyWeb != nil {
web, err = AddServiceMesh(web, smProxyWeb, smMode)
if err != nil {
return nil, err
}
}
if smProxyVoting != nil {
voting, err = AddServiceMesh(voting, smProxyVoting, smMode)
if err != nil {
return nil, err
}
}

webService := ServiceForDeployment(web).
WithName("web-svc").
WithSpec(ServiceSpec().
Expand Down Expand Up @@ -554,7 +613,7 @@ func PatchNamespaces(resources []any, namespace string) []any {

// EmojivotoDemo returns patched resources for deploying an Emojivoto demo.
func EmojivotoDemo(replacements map[string]string) ([]any, error) {
resources, err := generateEmojivoto()
resources, err := generateEmojivoto(ServiceMeshDisabled)
if err != nil {
return nil, err
}
Expand All @@ -565,7 +624,28 @@ func EmojivotoDemo(replacements map[string]string) ([]any, error) {

// Emojivoto returns resources for deploying Emojivoto application.
func Emojivoto() ([]any, error) {
resources, err := generateEmojivoto()
resources, err := generateEmojivoto(ServiceMeshDisabled)
if err != nil {
return nil, err
}

// Add coordinator
ns := "edg-default"
namespace := Namespace(ns)
coordinator := Coordinator(ns).DeploymentApplyConfiguration
coordinatorService := ServiceForDeployment(coordinator)
coordinatorForwarder := PortForwarder("coordinator", ns).
WithListenPort(1313).
WithForwardTarget("coordinator", 1313).
PodApplyConfiguration
resources = append(resources, namespace, coordinator, coordinatorService, coordinatorForwarder)

return resources, nil
}

// EmojivotoIngress returns resources for deploying Emojivoto application with the ingress service mesh enabled.
func EmojivotoIngress() ([]any, error) {
resources, err := generateEmojivoto(ServiceMeshIngress)
if err != nil {
return nil, err
}
Expand Down

0 comments on commit 921f0cb

Please sign in to comment.