fix: Kube tests again (#3593)

TBD54566975 · Dec 2, 2024 · 45e2ce8 · 45e2ce8
1 parent c4bab5d
commit 45e2ce8
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -314,7 +314,7 @@ jobs:
           go test -v -race -tags integration -run '^${{ matrix.test }}$' $(git grep -l '^//go:build integration' | xargs grep -l '^func ${{ matrix.test }}' | xargs -I {} dirname ./{})
   infrastructure-shard:
     name: Shard Infrastructure Tests
-    if: github.event_name != 'pull_request' || github.event.action == 'enqueued' || contains( github.event.pull_request.labels.*.name, 'run-all')
+    # if: github.event_name != 'pull_request' || github.event.action == 'enqueued' || contains( github.event.pull_request.labels.*.name, 'run-all')
     runs-on: ubuntu-latest
     outputs:
       matrix: ${{ steps.extract-tests.outputs.matrix }}

diff --git a/backend/provisioner/scaling/k8sscaling/k8s_scaling.go b/backend/provisioner/scaling/k8sscaling/k8s_scaling.go
@@ -90,7 +90,7 @@ func (r *k8sScaling) StartDeployment(ctx context.Context, module string, deploym
 	}
 	delCtx := log.ContextWithLogger(context.Background(), logger)
 	go func() {
-		time.Sleep(time.Second * 10)
+		time.Sleep(time.Second * 20)
 		err := r.deleteOldDeployments(delCtx, module, deploymentKey)
 		if err != nil {
 			logger.Errorf(err, "Failed to delete old deployments")
@@ -215,7 +215,7 @@ func (r *k8sScaling) GetEndpointForDeployment(ctx context.Context, module string
 	// TODO: hard coded port? It's hard to deal with as we might not have the lease
 	// I think requiring this port is fine for now
 	return optional.Some(url.URL{Scheme: "http",
-		Host: fmt.Sprintf("%s:8893", deployment),
+		Host: fmt.Sprintf("%s:8892", deployment),
 	}), nil
 }
 

diff --git a/backend/provisioner/scaling/kube_scaling_integration_test.go b/backend/provisioner/scaling/kube_scaling_integration_test.go
@@ -88,6 +88,7 @@ func TestKubeScaling(t *testing.T) {
 			assert.Equal(t, "Bonjour, Bob!!!", response)
 		}),
 		func(t testing.TB, ic in.TestContext) {
+			t.Logf("Checking for no failure during redeploys")
 			done.Store(true)
 			routineStopped.Wait()
 			err := failure.Load()

diff --git a/backend/runner/runner.go b/backend/runner/runner.go
@@ -51,7 +51,7 @@ import (
 
 type Config struct {
 	Config                []string                 `name:"config" short:"C" help:"Paths to FTL project configuration files." env:"FTL_CONFIG" placeholder:"FILE[,FILE,...]" type:"existingfile"`
-	Bind                  *url.URL                 `help:"Endpoint the Runner should bind to and advertise." default:"http://127.0.0.1:8893" env:"FTL_BIND"`
+	Bind                  *url.URL                 `help:"Endpoint the Runner should bind to and advertise." default:"http://127.0.0.1:8892" env:"FTL_BIND"`
 	Key                   model.RunnerKey          `help:"Runner key (auto)."`
 	ControllerEndpoint    *url.URL                 `name:"ftl-endpoint" help:"Controller endpoint." env:"FTL_ENDPOINT" default:"http://127.0.0.1:8892"`
 	ControllerPublicKey   *identity.PublicKey      `name:"ftl-public-key" help:"Controller public key in Base64. Temporarily optional." env:"FTL_CONTROLLER_PUBLIC_KEY"`

diff --git a/charts/ftl/templates/ingress.yaml b/charts/ftl/templates/ingress.yaml
@@ -24,7 +24,7 @@ spec:
               name: ftl-http-ingress
               port:
                 number: 8891
-        - path: /xyz.block.ftl.v1beta1.provisioner.ProvisionerService/
+        - path: /xyz.block.ftl.provisioner.v1beta1.ProvisionerService/
           pathType: Prefix
           backend:
             service:

diff --git a/charts/ftl/templates/provisioner.yaml b/charts/ftl/templates/provisioner.yaml
@@ -39,6 +39,8 @@ spec:
             {{- if .Values.provisioner.env }}
             {{- toYaml .Values.provisioner.env | nindent 12 }}
             {{- end }}
+            - name: FTL_BIND
+              value: "http://0.0.0.0:{{ (index .Values.provisioner.ports 0).containerPort }}"
           ports:
             {{- range .Values.provisioner.ports }}
             - name: {{ .name }}
@@ -51,7 +53,7 @@ spec:
             {{- else }}
             httpGet:
               path: /healthz
-              port: 8892
+              port: {{ (index .Values.provisioner.ports 0).containerPort }}
             initialDelaySeconds: 1
             periodSeconds: 2
             timeoutSeconds: 2

diff --git a/charts/ftl/templates/runner.yaml b/charts/ftl/templates/runner.yaml
@@ -62,6 +62,8 @@ data:
                 {{- end }}
                 - name: FTL_ARTEFACT_REGISTRY
                   value: "{{ .Values.registry.repository }}"
+                - name: FTL_BIND
+                  value: "http://0.0.0.0:{{ (index .Values.runner.ports 0).containerPort }}"
                 - name: FTL_ARTEFACT_REGISTRY_ALLOW_INSECURE
                   value: "{{ .Values.registry.allowInsecure }}"
                 - name: FTL_ARTEFACT_REGISTRY_USERNAME
@@ -88,7 +90,7 @@ data:
                 {{- else }}
                 httpGet:
                   path: /healthz
-                  port: 8893
+                  port: {{ (index .Values.runner.ports 0).containerPort }}
                 initialDelaySeconds: 1
                 periodSeconds: 2
                 timeoutSeconds: 2

diff --git a/charts/ftl/values.yaml b/charts/ftl/values.yaml
@@ -180,16 +180,11 @@ runner:
 
   ports:
     - name: http
-      containerPort: 8893
+      containerPort: 8892
       protocol: TCP
 
   readinessProbe: null
 
-  headlessService:
-    ports:
-      - port: 8893
-        targetPort: 8893
-
   podAnnotations:
     proxy.istio.io/config: |
       holdApplicationUntilProxyStarts: true