From 7356c3b863b4df625f3696efd89eb094eb98d50f Mon Sep 17 00:00:00 2001
From: Christopher Hoskin <mans0954@users.noreply.github.com>
Date: Mon, 12 May 2025 16:51:18 +0100
Subject: [PATCH] Merge pull request #25543 from
 overleaf/csh-issue-23942-more-migrate

Remove more CR refs

GitOrigin-RevId: 7ba91712943c309d40613b0f7247f20d45d7fbb1
---
 services/clsi/Makefile              |  8 +++---
 services/clsi/buildscript.txt       |  4 +--
 services/clsi/docker-compose.ci.yml |  2 +-
 services/clsi/docker-compose.yml    |  2 +-
 services/clsi/kube.yaml             | 41 -----------------------------
 5 files changed, 7 insertions(+), 50 deletions(-)
 delete mode 100644 services/clsi/kube.yaml

diff --git a/services/clsi/Makefile b/services/clsi/Makefile
index 2f673dbd87..70415b80e9 100644
--- a/services/clsi/Makefile
+++ b/services/clsi/Makefile
@@ -24,7 +24,6 @@ DOCKER_COMPOSE_TEST_UNIT = \
 
 clean:
 	-docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
-	-docker rmi gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
 	-docker rmi us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
 	-$(DOCKER_COMPOSE_TEST_UNIT) down --rmi local
 	-$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --rmi local
@@ -129,11 +128,10 @@ build:
 		--pull \
 		--build-arg BUILDKIT_INLINE_CACHE=1 \
 		--tag ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \
-		--tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \
-		--tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME) \
-		--cache-from gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME) \
-		--cache-from gcr.io/overleaf-ops/$(PROJECT_NAME):main \
 		--tag us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \
+		--tag us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME) \
+		--cache-from us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME) \
+		--cache-from us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):main \
 		--file Dockerfile \
 		../..
 
diff --git a/services/clsi/buildscript.txt b/services/clsi/buildscript.txt
index 1834ac9648..831ac3ecc9 100644
--- a/services/clsi/buildscript.txt
+++ b/services/clsi/buildscript.txt
@@ -1,8 +1,8 @@
 clsi
 --data-dirs=cache,compiles,output
 --dependencies=
---docker-repos=gcr.io/overleaf-ops,us-east1-docker.pkg.dev/overleaf-ops/ol-docker
---env-add=ENABLE_PDF_CACHING="true",PDF_CACHING_ENABLE_WORKER_POOL="true",ALLOWED_IMAGES=quay.io/sharelatex/texlive-full:2017.1,TEXLIVE_IMAGE=quay.io/sharelatex/texlive-full:2017.1,TEX_LIVE_IMAGE_NAME_OVERRIDE=gcr.io/overleaf-ops,TEXLIVE_IMAGE_USER="tex",DOCKER_RUNNER="true",COMPILES_HOST_DIR=$PWD/compiles,OUTPUT_HOST_DIR=$PWD/output
+--docker-repos=us-east1-docker.pkg.dev/overleaf-ops/ol-docker
+--env-add=ENABLE_PDF_CACHING="true",PDF_CACHING_ENABLE_WORKER_POOL="true",ALLOWED_IMAGES=quay.io/sharelatex/texlive-full:2017.1,TEXLIVE_IMAGE=quay.io/sharelatex/texlive-full:2017.1,TEX_LIVE_IMAGE_NAME_OVERRIDE=us-east1-docker.pkg.dev/overleaf-ops/ol-docker,TEXLIVE_IMAGE_USER="tex",DOCKER_RUNNER="true",COMPILES_HOST_DIR=$PWD/compiles,OUTPUT_HOST_DIR=$PWD/output
 --env-pass-through=
 --esmock-loader=False
 --node-version=20.18.2
diff --git a/services/clsi/docker-compose.ci.yml b/services/clsi/docker-compose.ci.yml
index 1754a3a916..b6643008f7 100644
--- a/services/clsi/docker-compose.ci.yml
+++ b/services/clsi/docker-compose.ci.yml
@@ -27,7 +27,7 @@ services:
       PDF_CACHING_ENABLE_WORKER_POOL: "true"
       ALLOWED_IMAGES: quay.io/sharelatex/texlive-full:2017.1
       TEXLIVE_IMAGE: quay.io/sharelatex/texlive-full:2017.1
-      TEX_LIVE_IMAGE_NAME_OVERRIDE: gcr.io/overleaf-ops
+      TEX_LIVE_IMAGE_NAME_OVERRIDE: us-east1-docker.pkg.dev/overleaf-ops/ol-docker
       TEXLIVE_IMAGE_USER: "tex"
       DOCKER_RUNNER: "true"
       COMPILES_HOST_DIR: $PWD/compiles
diff --git a/services/clsi/docker-compose.yml b/services/clsi/docker-compose.yml
index 3e70c256ea..e0f29ab09d 100644
--- a/services/clsi/docker-compose.yml
+++ b/services/clsi/docker-compose.yml
@@ -45,7 +45,7 @@ services:
       PDF_CACHING_ENABLE_WORKER_POOL: "true"
       ALLOWED_IMAGES: quay.io/sharelatex/texlive-full:2017.1
       TEXLIVE_IMAGE: quay.io/sharelatex/texlive-full:2017.1
-      TEX_LIVE_IMAGE_NAME_OVERRIDE: gcr.io/overleaf-ops
+      TEX_LIVE_IMAGE_NAME_OVERRIDE: us-east1-docker.pkg.dev/overleaf-ops/ol-docker
       TEXLIVE_IMAGE_USER: "tex"
       DOCKER_RUNNER: "true"
       COMPILES_HOST_DIR: $PWD/compiles
diff --git a/services/clsi/kube.yaml b/services/clsi/kube.yaml
deleted file mode 100644
index d3fb04291e..0000000000
--- a/services/clsi/kube.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: clsi
-  namespace: default
-spec:
-  type: LoadBalancer
-  ports:
-  - port: 80
-    protocol: TCP
-    targetPort: 80
-  selector:
-    run: clsi
----
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: clsi
-  namespace: default
-spec:
-  replicas: 2
-  template:
-    metadata:
-      labels:
-        run: clsi
-    spec:
-      containers:
-      - name: clsi
-        image: gcr.io/henry-terraform-admin/clsi
-        imagePullPolicy: Always
-        readinessProbe:
-          httpGet:
-            path: status
-            port: 80
-          periodSeconds: 5
-          initialDelaySeconds: 0
-          failureThreshold: 3
-          successThreshold: 1
-
-
-