Feat/support deployment user services public

.envrc

@@ -1 +1,5 @@
-use flake
+#use flake
+export GOPATH=$(asdf where golang)/packages
+export GOROOT=$(asdf where golang)/go
+export GOBIN=$(go env GOPATH)/bin
+export PATH="${PATH}:$(go env GOPATH)/bin"

.golangci.yml

@@ -1,6 +1,5 @@
 linters:
   enable:
-    - exhaustruct
     - exportloopref
     - gomnd
     - staticcheck

api/golang/core/lib/services/extra_ingress_config.go

@@ -0,0 +1,89 @@
+package services
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface/objects/kubernetes"
+)
+
+// ToStarlark converts the ExtraIngressConfig to its Starlark representation
+func ExtraIngressConfigToStarlark(e *kubernetes.ExtraIngressConfig) string {
+	if e == nil {
+		return "None"
+	}
+
+	ingressStrings := []string{}
+	for _, ingress := range e.IngressSpecs {
+		ingressStrings = append(ingressStrings, ingressToStarlark(ingress))
+	}
+
+	return fmt.Sprintf("ExtraIngressConfig(ingresses=[%s])", strings.Join(ingressStrings, ", "))
+}
+
+// ingressToStarlark converts an IngressSpec to its Starlark representation
+func ingressToStarlark(i *kubernetes.IngressSpec) string {
+	if i == nil {
+		return "None"
+	}
+
+	starlarkFields := []string{}
+
+	if i.Host != "" {
+		starlarkFields = append(starlarkFields, fmt.Sprintf(`host=%q`, i.Host))
+	}
+
+	if i.IngressClassName != "" {
+		starlarkFields = append(starlarkFields, fmt.Sprintf(`ingress_class_name=%q`, i.IngressClassName))
+	}
+
+	if i.Annotations != nil && len(*i.Annotations) > 0 {
+		annotationStrings := []string{}
+		for key, value := range *i.Annotations {
+			annotationStrings = append(annotationStrings, fmt.Sprintf("%q:%q", key, value))
+		}
+		starlarkFields = append(starlarkFields, fmt.Sprintf(`annotations={%s}`, strings.Join(annotationStrings, ",")))
+	}
+
+	if i.TlsConfig != nil {
+		starlarkFields = append(starlarkFields, fmt.Sprintf(`tls=IngressTLSConfig(secret_name=%q)`, i.TlsConfig.SecretName))
+	}
+
+	if len(i.HttpRules) > 0 {
+		ruleStrings := []string{}
+		for _, rule := range i.HttpRules {
+			ruleStrings = append(ruleStrings, httpRuleToStarlark(rule))
+		}
+		starlarkFields = append(starlarkFields, fmt.Sprintf(`http_rules=[%s]`, strings.Join(ruleStrings, ", ")))
+	}
+
+	return fmt.Sprintf("IngressSpec(%s)", strings.Join(starlarkFields, ","))
+}
+
+// httpRuleToStarlark converts an HttpRule to its Starlark representation
+func httpRuleToStarlark(r *kubernetes.HttpRule) string {
+	if r == nil {
+		return "None"
+	}
+
+	starlarkFields := []string{}
+
+	if r.Path != "" {
+		starlarkFields = append(starlarkFields, fmt.Sprintf(`path=%q`, r.Path))
+	}
+
+	if r.PathType != "" {
+		starlarkFields = append(starlarkFields, fmt.Sprintf(`path_type=%q`, r.PathType))
+	}
+
+	if r.PortConfig != nil {
+		if r.PortConfig.Name != "" {
+			starlarkFields = append(starlarkFields, fmt.Sprintf(`port_name=%q`, r.PortConfig.Name))
+		}
+		if r.PortConfig.Number != 0 {
+			starlarkFields = append(starlarkFields, fmt.Sprintf(`port=%d`, r.PortConfig.Number))
+		}
+	}
+
+	return fmt.Sprintf("IngressHttpRule(%s)", strings.Join(starlarkFields, ","))
+}

api/golang/core/lib/services/kubernetes_config.go

@@ -0,0 +1,38 @@
+package services
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface/objects/kubernetes"
+)
+
+// KubernetesConfig represents the Kubernetes-specific configuration for a service
+type KubernetesConfig struct {
+	// ExtraIngressConfigs allows setting up Kubernetes Ingress resources to expose ports to the public internet
+	ExtraIngressConfig *kubernetes.ExtraIngressConfig
+
+	// WorkloadType controls what type of Kubernetes resource to create for a service
+	// Valid values are "" (empty string, defaults to "pod"), "pod", or "deployment"
+	// When set to "deployment", creates a Deployment with a single replica for increased resilience
+	WorkloadType string
+}
+
+// ToStarlark converts the KubernetesConfig to its Starlark representation
+func (k *KubernetesConfig) ToStarlark() string {
+	if k == nil {
+		return "None"
+	}
+
+	starlarkFields := []string{}
+
+	if k.ExtraIngressConfig != nil {
+		starlarkFields = append(starlarkFields, fmt.Sprintf(`extra_ingress_config=%s`, ExtraIngressConfigToStarlark(k.ExtraIngressConfig)))
+	}
+
+	if k.WorkloadType != "" {
+		starlarkFields = append(starlarkFields, fmt.Sprintf(`workload_type="%s"`, k.WorkloadType))
+	}
+
+	return fmt.Sprintf("KubernetesConfig(%s)", strings.Join(starlarkFields, ","))
+}

api/golang/core/lib/services/service_config_builder.go

@@ -2,8 +2,9 @@ package services
 
 import (
 	"fmt"
-	"github.com/kurtosis-tech/kurtosis/api/golang/core/kurtosis_core_rpc_api_bindings"
 	"strings"
+
+	"github.com/kurtosis-tech/kurtosis/api/golang/core/kurtosis_core_rpc_api_bindings"
 )
 
 type FilesArtifactUUID string
@@ -36,6 +37,7 @@ func GetServiceConfigStarlark(
 	memoryAllocationMegabytes int,
 	minCpuMilliCores int,
 	minMemoryMegaBytes int,
+	kubernetesConfig *KubernetesConfig,
 ) string {
 	starlarkFields := []string{}
 
@@ -87,5 +89,9 @@ func GetServiceConfigStarlark(
 		starlarkFields = append(starlarkFields, fmt.Sprintf(`min_memory=%d`, minMemoryMegaBytes))
 	}
 
+	if kubernetesConfig != nil {
+		starlarkFields = append(starlarkFields, fmt.Sprintf(`kubernetes_config=%s`, kubernetesConfig.ToStarlark()))
+	}
+
 	return fmt.Sprintf("ServiceConfig(%s)", strings.Join(starlarkFields, ","))
 }

api/golang/go.mod

@@ -3,6 +3,8 @@ module github.com/kurtosis-tech/kurtosis/api/golang
 go 1.20
 
 replace (
+	github.com/kurtosis-tech/kurtosis/cloud/api/golang => ../../cloud/api/golang
+	github.com/kurtosis-tech/kurtosis/container-engine-lib => ../../container-engine-lib
 	github.com/kurtosis-tech/kurtosis/grpc-file-transfer/golang => ../../grpc-file-transfer/golang
 	github.com/kurtosis-tech/kurtosis/path-compression => ../../path-compression
 )
@@ -15,52 +17,67 @@ require (
 	github.com/go-yaml/yaml v2.1.0+incompatible
 	github.com/kurtosis-tech/kurtosis-portal/api/golang v0.0.0-20230818182330-1a86869414d2
 	github.com/kurtosis-tech/kurtosis/cloud/api/golang v0.0.0-20230803130419-099ee7a4e3dc
-	github.com/kurtosis-tech/kurtosis/contexts-config-store v0.0.0-20230818184218-f4e3e773463b
+	github.com/kurtosis-tech/kurtosis/contexts-config-store v0.0.0-20231024185242-de10c7bab36c
 	github.com/kurtosis-tech/kurtosis/grpc-file-transfer/golang v0.0.0-20230803130419-099ee7a4e3dc // needs to be pinned as the replace above won't work when importing the api standalone
 	github.com/kurtosis-tech/kurtosis/path-compression v0.0.0-20240307154559-64d2929cd265 // needs to be pinned as the replace above won't work when importing the api standalone
 	github.com/kurtosis-tech/stacktrace v0.0.0-20211028211901-1c67a77b5409
 	github.com/labstack/echo/v4 v4.11.3
 	github.com/oapi-codegen/runtime v1.1.0
 	github.com/sirupsen/logrus v1.9.3
-	github.com/stretchr/testify v1.8.4
+	github.com/stretchr/testify v1.10.0
 	google.golang.org/grpc v1.57.1
-	google.golang.org/protobuf v1.31.0
+	google.golang.org/protobuf v1.33.0
 )
 
+require github.com/kurtosis-tech/kurtosis/container-engine-lib v0.0.0
+
 require (
 	github.com/adrg/xdg v0.4.0 // indirect
 	github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
+	github.com/go-logr/logr v1.2.4 // indirect
 	github.com/go-openapi/jsonpointer v0.19.6 // indirect
 	github.com/go-openapi/swag v0.22.4 // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/uuid v1.4.0 // indirect
 	github.com/invopop/yaml v0.2.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/labstack/gommon v0.4.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mholt/archiver v3.1.1+incompatible // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/nwaples/rardecode v1.1.3 // indirect
 	github.com/perimeterx/marshmallow v1.1.5 // indirect
 	github.com/pierrec/lz4 v2.6.1+incompatible // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/stretchr/objx v0.5.0 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/ulikunitz/xz v0.5.11 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasttemplate v1.2.2 // indirect
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
-	golang.org/x/crypto v0.17.0 // indirect
-	golang.org/x/net v0.19.0 // indirect
-	golang.org/x/sys v0.15.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/crypto v0.23.0 // indirect
+	golang.org/x/net v0.25.0 // indirect
+	golang.org/x/sys v0.30.0 // indirect
+	golang.org/x/text v0.15.0 // indirect
 	google.golang.org/genproto v0.0.0-20230726155614-23370e0ffb3e // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/api v0.27.2 // indirect
+	k8s.io/apimachinery v0.27.2 // indirect
+	k8s.io/klog/v2 v2.90.1 // indirect
+	k8s.io/utils v0.0.0-20230711102312-30195339c3c7 // indirect
+	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 )