Engine ingress continued.

kurtosis-tech · Dec 17, 2023 · 3212921 · 3212921
1 parent ae75791
commit 3212921
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -965,16 +965,6 @@ jobs:
             equal: [ "docker", << parameters.cli-cluster-backend >> ]
           <<: *steps_prepare_testing_docker
 
-      # Validate the engine REST API
-      - run: |
-          # Give the reverse proxy enough time to discover the engine service
-          sleep 10
-          status_code=$(curl -I http://localhost:<< pipeline.parameters.reverse-proxy-entrypoint-web-port >>/engine/info -H "Host: engine" | head -1 | awk '{print $2}')
-          if ! [ "${status_code}" -eq "200" ]; then
-            echo 'HTTP request status code returned is '${status_code}' instead of 200'
-            false
-          fi
-
       # Start a service and send an http request to it via the reverse proxy
       - run: |
           ${KURTOSIS_BINPATH} enclave add --name test-enclave

diff --git a/...ne-lib/lib/backend_impls/docker/docker_kurtosis_backend/engine_functions/create_engine.go b/...ne-lib/lib/backend_impls/docker/docker_kurtosis_backend/engine_functions/create_engine.go
@@ -158,7 +158,7 @@ func CreateEngine(
 		)
 	}
 
-	restAPIPortSpec, err := port_spec.NewPortSpec(uint16(engine.RESTAPIPortAddr), consts.EngineTransportProtocol, consts.HttpApplicationProtocol, defaultWait)
+	restAPIPortSpec, err := port_spec.NewPortSpec(engine.RESTAPIPortAddr, consts.EngineTransportProtocol, consts.HttpApplicationProtocol, defaultWait)
 	if err != nil {
 		return nil, stacktrace.Propagate(
 			err,
@@ -206,7 +206,7 @@ func CreateEngine(
 		privateGrpcDockerPort:       docker_manager.NewManualPublishingSpec(grpcPortNum),
 		enclaveManagerUIDockerPort:  docker_manager.NewManualPublishingSpec(uint16(enclaveManagerUIPort)),
 		enclaveManagerAPIDockerPort: docker_manager.NewManualPublishingSpec(uint16(enclaveManagerAPIPort)),
-		restAPIDockerPort:           docker_manager.NewManualPublishingSpec(uint16(engine.RESTAPIPortAddr)),
+		restAPIDockerPort:           docker_manager.NewManualPublishingSpec(engine.RESTAPIPortAddr),
 	}
 
 	bindMounts := map[string]string{

diff --git a/.../backend_impls/kubernetes/object_attributes_provider/engine_object_attributes_provider.go b/.../backend_impls/kubernetes/object_attributes_provider/engine_object_attributes_provider.go
@@ -220,7 +220,7 @@ func (provider *kubernetesEngineObjectAttributesProviderImpl) ForEngineIngress()
 
 	traefikIngressRouterEntrypointsAnnotationValue, err := kubernetes_annotation_value.CreateNewKubernetesAnnotationValue(traefikIngressRouterEntrypointsValue)
 	if err != nil {
-		return nil, stacktrace.Propagate(err, "An error occurred creating a new user custom Kubernetes label value '%s'", traefikIngressRouterEntrypointsValue)
+		return nil, stacktrace.Propagate(err, "An error occurred creating the Traefik ingress router entrypoint annotation with value '%s'", traefikIngressRouterEntrypointsValue)
 	}
 	annotations := map[*kubernetes_annotation_key.KubernetesAnnotationKey]*kubernetes_annotation_value.KubernetesAnnotationValue{
 		kubernetes_annotation_key_consts.TraefikIngressRouterEntrypointsAnnotationKey: traefikIngressRouterEntrypointsAnnotationValue,