feat: Updating so bridge image is deployed rather than administrator image.

Author: vercel-eddie

.github/workflows/administrator-image.yml .github/workflows/bridge-image.yml.github/workflows/administrator-image.yml renamed to .github/workflows/bridge-image.yml

@@ -1,4 +1,4 @@
-name: Administrator Docker Image
+name: Bridge Docker Image
 
 on:
   push:
@@ -8,7 +8,7 @@ on:
       - 'pkg/**'
       - 'cmd/**'
       - 'api/**'
-      - 'services/administrator/Dockerfile'
+      - 'Dockerfile'
       - 'go.mod'
       - 'go.sum'
     tags:
@@ -20,7 +20,7 @@ permissions:
 
 env:
   REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository_owner }}/administrator
+  IMAGE_NAME: ${{ github.repository_owner }}/bridge
 
 jobs:
   build-and-push:
@@ -53,7 +53,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
-          file: services/administrator/Dockerfile
+          file: Dockerfile
           push: true
           platforms: linux/amd64,linux/arm64
           tags: ${{ steps.version.outputs.tags }}

services/administrator/Dockerfile Dockerfileservices/administrator/Dockerfile renamed to Dockerfile

@@ -24,4 +24,3 @@ RUN apk add --no-cache ca-certificates
 COPY --from=builder /bridge /usr/local/bin/bridge
 
 ENTRYPOINT ["bridge"]
-CMD ["administrator"]

deploy/k8s/administrator.yaml

@@ -61,7 +61,7 @@ spec:
       serviceAccountName: administrator
       containers:
         - name: administrator
-          image: "{{ADMINISTRATOR_IMAGE}}"
+          image: "{{BRIDGE_IMAGE}}"
           imagePullPolicy: Always
           command: ["bridge", "administrator"]
           env:
@@ -70,7 +70,7 @@ spec:
             - name: SERVICE_ACCOUNT_NAME
               value: administrator
             - name: BRIDGE_PROXY_IMAGE
-              value: "{{PROXY_IMAGE}}"
+              value: "{{BRIDGE_IMAGE}}"
           ports:
             - name: grpc
               containerPort: 9090

deploy/main.go

@@ -43,20 +43,20 @@ func main() {
 	}
 
 	// Push images use the host-accessible registry; pull images use the in-cluster name.
-	adminPushImage := pushRegistry + "/administrator:latest"
-	adminPullImage := pullRegistry + "/administrator:latest"
+	bridgePushImage := pushRegistry + "/bridge:latest"
+	bridgePullImage := pullRegistry + "/bridge:latest"
 	userservicePushImage := pushRegistry + "/userservice:latest"
 	userservicePullImage := pullRegistry + "/userservice:latest"
 
 	// 1. Build and push images.
-	log.Println("Building administrator image...")
-	dockerBuild(root, filepath.Join("services", "administrator", "Dockerfile"), adminPushImage)
+	log.Println("Building bridge image...")
+	dockerBuild(root, "Dockerfile", bridgePushImage)
 
 	log.Println("Building userservice image...")
 	dockerBuild(filepath.Join(root, "e2e", "testserver"), "Dockerfile", userservicePushImage)
 
 	log.Println("Pushing images to registry...")
-	run("docker", "push", adminPushImage)
+	run("docker", "push", bridgePushImage)
 	run("docker", "push", userservicePushImage)
 
 	// 2. Connect to the cluster and apply manifests.
@@ -67,8 +67,7 @@ func main() {
 
 	log.Println("Applying administrator manifests...")
 	if err := manifests.Apply(ctx, restCfg, filepath.Join(root, "deploy", "k8s", "administrator.yaml"), map[string]string{
-		"{{ADMINISTRATOR_IMAGE}}": adminPullImage,
-		"{{PROXY_IMAGE}}":         adminPullImage,
+		"{{BRIDGE_IMAGE}}": bridgePullImage,
 	}); err != nil {
 		log.Fatalf("Failed to apply administrator manifests: %v", err)
 	}

e2e/build.go

@@ -65,17 +65,17 @@ func CleanupBuild() {
 	}
 }
 
-// BuildAdministratorImage builds the administrator Docker image from the
-// project's services/administrator/Dockerfile. The build context is the
-// project root so that go.mod, cmd/, pkg/, etc. are all available.
-func BuildAdministratorImage(ctx context.Context, tag string) error {
+// BuildBridgeImage builds the bridge Docker image from the project's root
+// Dockerfile. The build context is the project root so that go.mod, cmd/,
+// pkg/, etc. are all available.
+func BuildBridgeImage(ctx context.Context, tag string) error {
 	projectRoot, err := findProjectRoot()
 	if err != nil {
 		return fmt.Errorf("find project root: %w", err)
 	}
 
-	dockerfile := filepath.Join("services", "administrator", "Dockerfile")
-	slog.Info("Building administrator image", "tag", tag, "dockerfile", dockerfile)
+	dockerfile := "Dockerfile"
+	slog.Info("Building bridge image", "tag", tag, "dockerfile", dockerfile)
 
 	cmd := exec.CommandContext(ctx, "docker", "build",
 		"-t", tag,

e2e/create_test.go

@@ -99,12 +99,12 @@ func (s *CreateSuite) SetupSuite() {
 	require.NoError(s.T(), err, "failed to setup cluster")
 
 	// 2. Build and push images.
-	adminTag := "administrator:test"
-	err = testutil.BuildAdministratorImage(s.ctx, adminTag)
-	require.NoError(s.T(), err, "failed to build administrator image")
+	bridgeTag := "bridge:test"
+	err = testutil.BuildBridgeImage(s.ctx, bridgeTag)
+	require.NoError(s.T(), err, "failed to build bridge image")
 
-	s.administratorRef, err = s.cluster.PushImage(s.ctx, adminTag, adminTag)
-	require.NoError(s.T(), err, "failed to push administrator image")
+	s.administratorRef, err = s.cluster.PushImage(s.ctx, bridgeTag, bridgeTag)
+	require.NoError(s.T(), err, "failed to push bridge image")
 
 	userserviceTag := "userservice:test"
 	err = testutil.BuildUserserviceImage(s.ctx, userserviceTag)
@@ -113,8 +113,8 @@ func (s *CreateSuite) SetupSuite() {
 	s.userserviceRef, err = s.cluster.PushImage(s.ctx, userserviceTag, userserviceTag)
 	require.NoError(s.T(), err, "failed to push test server image")
 
-	// 3. Deploy administrator (same image for admin and proxy — same binary).
-	adminPod, err := testutil.DeployAdministrator(s.ctx, s.cluster.RestConfig, s.cluster.Clientset, s.administratorRef, s.administratorRef)
+	// 3. Deploy administrator.
+	adminPod, err := testutil.DeployAdministrator(s.ctx, s.cluster.RestConfig, s.cluster.Clientset, s.administratorRef)
 	require.NoError(s.T(), err, "failed to deploy administrator")
 	s.adminPod = *adminPod
 	slog.Info("Administrator pod", "name", s.adminPod.Name)

e2e/intercept_test.go

@@ -187,7 +187,7 @@ func (s *InterceptSuite) TestIntercept() {
 	t.Log("testserver started")
 
 	// 2. Start proxy container on BOTH networks.
-	_, proxyIP := s.startProxy(t, []string{"bridge", "server", "--addr", ":9090"})
+	_, proxyIP := s.startProxy(t, []string{"bridge", "--log-path", "stderr", "server", "--addr", ":9090"})
 	t.Log("proxy container started")
 
 	// 3. Start intercept container on the bridge network only (privileged for iptables).
@@ -198,7 +198,7 @@ func (s *InterceptSuite) TestIntercept() {
 	serverAddr := proxyIP + ":9090"
 	exitCode, reader, err := interceptC.Exec(s.ctx, []string{
 		"sh", "-c",
-		fmt.Sprintf(`bridge intercept --server-addr %s --forward-domains "*" > /tmp/bridge.log 2>&1 &`, serverAddr),
+		fmt.Sprintf(`bridge --log-path stderr intercept --server-addr %s --forward-domains "*" > /tmp/bridge.log 2>&1 &`, serverAddr),
 	})
 	require.NoError(t, err, "failed to exec bridge intercept")
 	io.Copy(io.Discard, reader)
@@ -247,7 +247,7 @@ func (s *InterceptSuite) TestIngress() {
 	t := s.T()
 
 	// 1. Start proxy with --listen-ports 8080/tcp on BOTH networks.
-	proxyC, proxyIP := s.startProxy(t, []string{"bridge", "server", "--addr", ":9090", "-l", "8080/tcp"})
+	proxyC, proxyIP := s.startProxy(t, []string{"bridge", "--log-path", "stderr", "server", "--addr", ":9090", "-l", "8080/tcp"})
 	t.Log("proxy container started with ingress listener on :8080")
 
 	// 2. Start intercept container on the bridge network only.
@@ -270,7 +270,7 @@ func (s *InterceptSuite) TestIngress() {
 	serverAddr := proxyIP + ":9090"
 	exitCode, reader, err = interceptC.Exec(s.ctx, []string{
 		"sh", "-c",
-		fmt.Sprintf(`bridge intercept --server-addr %s --app-port 8080 > /tmp/bridge.log 2>&1 &`, serverAddr),
+		fmt.Sprintf(`bridge --log-path stderr intercept --server-addr %s --app-port 8080 > /tmp/bridge.log 2>&1 &`, serverAddr),
 	})
 	require.NoError(t, err, "failed to exec bridge intercept")
 	io.Copy(io.Discard, reader)

e2e/testutil/build.go

@@ -76,17 +76,17 @@ func CleanupBuild() {
 	}
 }
 
-// BuildAdministratorImage builds the administrator Docker image from the
-// project's services/administrator/Dockerfile. The build context is the
-// project root so that go.mod, cmd/, pkg/, etc. are all available.
-func BuildAdministratorImage(ctx context.Context, tag string) error {
+// BuildBridgeImage builds the bridge Docker image from the project's root
+// Dockerfile. The build context is the project root so that go.mod, cmd/,
+// pkg/, etc. are all available.
+func BuildBridgeImage(ctx context.Context, tag string) error {
 	projectRoot, err := FindProjectRoot()
 	if err != nil {
 		return fmt.Errorf("find project root: %w", err)
 	}
 
-	dockerfile := filepath.Join("services", "administrator", "Dockerfile")
-	slog.Info("Building administrator image", "tag", tag, "dockerfile", dockerfile)
+	dockerfile := "Dockerfile"
+	slog.Info("Building bridge image", "tag", tag, "dockerfile", dockerfile)
 
 	cmd := exec.CommandContext(ctx, "docker", "build",
 		"-t", tag,

e2e/testutil/cluster.go

@@ -228,9 +228,9 @@ func (c *Cluster) TearDown(ctx context.Context) {
 }
 
 // PushImage tags a local image for the test registry and pushes it.
-// localRef should be a locally available image (e.g. "administrator:test").
-// remoteName is the name:tag used in the registry (e.g. "administrator:test").
-// Returns the full cluster-internal reference (e.g. "registry.test:5000/administrator:test").
+// localRef should be a locally available image (e.g. "bridge:test").
+// remoteName is the name:tag used in the registry (e.g. "bridge:test").
+// Returns the full cluster-internal reference (e.g. "registry.test:5000/bridge:test").
 func (c *Cluster) PushImage(ctx context.Context, localRef, remoteName string) (string, error) {
 	clusterRef := fmt.Sprintf("%s/%s", c.RegistryClusterAddress, remoteName)
 	hostRef := fmt.Sprintf("%s/%s", c.RegistryAddress, remoteName)

e2e/testutil/deploy.go

@@ -35,16 +35,15 @@ const (
 
 // DeployAdministrator applies the administrator manifests and waits for the
 // pod to be ready. The image must already be pushed to the test registry.
-func DeployAdministrator(ctx context.Context, cfg *rest.Config, clientset kubernetes.Interface, imageRef, proxyImageRef string) (*corev1.Pod, error) {
+func DeployAdministrator(ctx context.Context, cfg *rest.Config, clientset kubernetes.Interface, imageRef string) (*corev1.Pod, error) {
 	projectRoot, err := FindProjectRoot()
 	if err != nil {
 		return nil, err
 	}
 
 	manifestPath := filepath.Join(projectRoot, "deploy", "k8s", "administrator.yaml")
 	if err := manifests.Apply(ctx, cfg, manifestPath, map[string]string{
-		"{{ADMINISTRATOR_IMAGE}}": imageRef,
-		"{{PROXY_IMAGE}}":         proxyImageRef,
+		"{{BRIDGE_IMAGE}}": imageRef,
 	}); err != nil {
 		return nil, fmt.Errorf("apply administrator manifests: %w", err)
 	}