release: use resourcegen tool for coordinator.yaml

edgelesssys · Apr 4, 2024 · 0736b3a · 0736b3a
1 parent 7592984
commit 0736b3a
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 11 deletions.
diff --git a/e2e/internal/kuberesource/parts.go b/e2e/internal/kuberesource/parts.go
@@ -3,6 +3,7 @@ package kuberesource
 import (
 	"strconv"
 
+	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	applyappsv1 "k8s.io/client-go/applyconfigurations/apps/v1"
 	applycorev1 "k8s.io/client-go/applyconfigurations/core/v1"
@@ -120,14 +121,15 @@ func (c *CoordinatorConfig) GetDeploymentConfig() *DeploymentConfig {
 
 // ServiceForDeployment creates a service for a deployment by exposing the configured ports
 // of the deployment's first container.
-func ServiceForDeployment(d *applyappsv1.DeploymentApplyConfiguration) *applycorev1.ServiceApplyConfiguration {
+func ServiceForDeployment(d *applyappsv1.DeploymentApplyConfiguration, serviceType *corev1.ServiceType) *applycorev1.ServiceApplyConfiguration {
 	selector := d.Spec.Selector.MatchLabels
 	ports := d.Spec.Template.Spec.Containers[0].Ports
 
 	s := Service(*d.Name, *d.Namespace).
 		WithSpec(ServiceSpec().
 			WithSelector(selector),
 		)
+	s.Spec.Type = serviceType
 
 	for _, p := range ports {
 		s.Spec.WithPorts(

diff --git a/e2e/internal/kuberesource/resourcegen/main.go b/e2e/internal/kuberesource/resourcegen/main.go
@@ -20,6 +20,8 @@ func main() {
 	var resources []any
 	var err error
 	switch set {
+	case "coordinator-release":
+		resources, err = kuberesource.CoordinatorRelease()
 	case "simple":
 		resources, err = kuberesource.Simple()
 	case "openssl":

diff --git a/e2e/internal/kuberesource/sets.go b/e2e/internal/kuberesource/sets.go
@@ -1,14 +1,29 @@
 package kuberesource
 
-import "k8s.io/apimachinery/pkg/util/intstr"
+import (
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/util/intstr"
+)
+
+func CoordinatorRelease() ([]any, error) {
+	coordinator := Coordinator("").DeploymentApplyConfiguration
+	coordinatorService := ServiceForDeployment(coordinator, toPtr(corev1.ServiceTypeLoadBalancer))
+
+	resources := []any{
+		coordinator,
+		coordinatorService,
+	}
+
+	return resources, nil
+}
 
 // Simple returns a simple set of resources for testing.
 func Simple() ([]any, error) {
 	ns := "edg-default"
 
 	namespace := Namespace(ns)
 	coordinator := Coordinator(ns).DeploymentApplyConfiguration
-	coordinatorService := ServiceForDeployment(coordinator)
+	coordinatorService := ServiceForDeployment(coordinator, nil)
 	coordinatorForwarder := PortForwarder("coordinator", ns).
 		WithListenPort(1313).
 		WithForwardTarget("coordinator", 1313).
@@ -57,7 +72,7 @@ func OpenSSL() ([]any, error) {
 	ns := "edg-default"
 	namespace := Namespace(ns)
 	coordinator := Coordinator(ns).DeploymentApplyConfiguration
-	coordinatorService := ServiceForDeployment(coordinator)
+	coordinatorService := ServiceForDeployment(coordinator, nil)
 	coordinatorForwarder := PortForwarder("coordinator", ns).
 		WithListenPort(1313).
 		WithForwardTarget("coordinator", 1313).
@@ -102,7 +117,7 @@ func OpenSSL() ([]any, error) {
 		return nil, err
 	}
 
-	backendService := ServiceForDeployment(backend)
+	backendService := ServiceForDeployment(backend, nil)
 
 	client := Deployment("openssl-client", ns).
 		WithSpec(DeploymentSpec().
@@ -169,7 +184,7 @@ func OpenSSL() ([]any, error) {
 		return nil, err
 	}
 
-	frontendService := ServiceForDeployment(frontend)
+	frontendService := ServiceForDeployment(frontend, nil)
 
 	portforwarderCoordinator := PortForwarder("coordinator", ns).
 		WithListenPort(1313).
@@ -197,3 +212,7 @@ func OpenSSL() ([]any, error) {
 
 	return resources, nil
 }
+
+func toPtr[T any](v T) *T {
+	return &v
+}
diff --git a/packages/scripts.nix b/packages/scripts.nix
@@ -149,18 +149,17 @@ with pkgs;
     runtimeInputs = [
       yq-go
       genpolicy-msft
+      contrast
     ];
     text = ''
       imageRef=$1
 
       tmpdir=$(mktemp -d)
       trap 'rm -rf $tmpdir' EXIT
 
-      # TODO(burgerdev): consider a dedicated coordinator template instead of the simple one
-      yq < deployments/simple/coordinator.yml > "$tmpdir/coordinator.yml" \
-        "del(.metadata.namespace) |
-         (select(.kind == \"Deployment\") | .spec.template.spec.containers[0].image) = \"$imageRef\" |
-         (select(.kind == \"Service\") | .spec.type) = \"LoadBalancer\" "
+      resourcegen coordinator-release "$tmpdir/coordinator_base.yml"
+      yq < "$tmpdir/coordinator_base.yml" > "$tmpdir/coordinator.yml" \
+         "(select(.kind == \"Deployment\") | .spec.template.spec.containers[0].image) = \"$imageRef\""
 
       pushd "$tmpdir" >/dev/null
       cp ${genpolicy-msft.rules-coordinator}/genpolicy-rules.rego rules.rego