Deploy the service to the publishing cluster

Financial-Times · Jan 30, 2024 · 4a028c2 · 4a028c2
1 parent 7eefaf3
commit 4a028c2
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 97 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,3 +1,3 @@
 @Library('k8s-pipeline-lib') _
 
-pacEntryPointForJenkinsfile()
+uppEntryPointForJenkinsfile()
diff --git a/helm/draft-annotations-api/app-configs/draft-annotations-api_eks_pac_staging.yaml b/helm/draft-annotations-api/app-configs/draft-annotations-api_eks_pac_staging.yaml
diff --git a/helm/draft-annotations-api/app-configs/draft-annotations-api_eks_pac_test.yaml b/helm/draft-annotations-api/app-configs/draft-annotations-api_eks_pac_test.yaml
diff --git a/...s/draft-annotations-api_eks_pac_prod.yaml → ...gs/draft-annotations-api_eks_publish.yaml b/...s/draft-annotations-api_eks_pac_prod.yaml → ...gs/draft-annotations-api_eks_publish.yaml
diff --git a/helm/draft-annotations-api/templates/IngressRoute.yaml b/helm/draft-annotations-api/templates/IngressRoute.yaml
diff --git a/helm/draft-annotations-api/templates/deployment.yaml b/helm/draft-annotations-api/templates/deployment.yaml
@@ -35,28 +35,8 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Chart.Version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
-        - name: ANNOTATIONS_RW_ENDPOINT
-          value: "http://generic-rw-aurora:8080"
-        - name: ANNOTATIONS_ENDPOINT
-          valueFrom:
-            configMapKeyRef:
-              name: global-config
-              key: annotations-endpoint
-        - name: HTTP_TIMEOUT
-          valueFrom:
-            configMapKeyRef:
-              name: timeout-config
-              key: draft-annotations-api-timeout
-        - name: INTERNAL_CONCORDANCES_ENDPOINT
-          valueFrom:
-            configMapKeyRef:
-              name: global-config
-              key: internal-concordances-endpoint
-        - name: DELIVERY_BASIC_AUTH
-          valueFrom:
-            secretKeyRef:
-              name: doppler-global-secrets
-              key: UPP_DELIVERY_CLUSTER_BASIC_AUTH
+        - name: NATIVE_RW_ADDRESS
+          value: "http://nativerw:8080"
         ports:
         - containerPort: 8080
         livenessProbe:

diff --git a/helm/draft-annotations-api/templates/traefik-middlewares.yaml b/helm/draft-annotations-api/templates/traefik-middlewares.yaml