Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions cypress-tests/cypress/e2e/v2/verifyInfrastructure.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ function retryRequest(
describe("Verify the infrastructure is ready", () => {
it("Can interact with the backend components", () => {
retryRequest("api/data/version", "Data services");
retryRequest("api/search/version", "Search");
retryRequest("api/auth/login", "Gateway");
retryRequest("config.json", "UI client");

Expand All @@ -48,7 +47,7 @@ describe("Verify the infrastructure is ready", () => {
});

// Search should return a list of items
const searchUrl = "/api/search/query";
const searchUrl = "/api/data/search/query";
cy.request(searchUrl).then((resp) => {
if (resp.status >= 400 || !("items" in resp.body))
throw new Error("Search endpoints not working as expected.");
Expand Down
2 changes: 1 addition & 1 deletion cypress-tests/cypress/support/utils/search.utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export function verifySearchIndexing(
);

function attempt(tries: number): Cypress.Chainable<boolean> {
return cy.request(`/api/search/query?q=${query}`).then((response) => {
return cy.request(`/api/data/search/query?q=${query}`).then((response) => {
const success =
matcher === "eq"
? response.body.items && response.body.items.length === expectedItems
Expand Down
1 change: 0 additions & 1 deletion helm-chart/renku/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
{{- $uiserverServicePort := .Values.ui.server.service.port -}}
{{- $webhookServiceFullname := include "renku.graph.webhookService.fullname" . -}}
{{- $knowledgeGraphFullname := include "renku.graph.knowledgeGraph.fullname" . -}}
{{- $searchApiFullname := include "renku.search.searchApi.fullname" . -}}
{{- $renkuFullname := include "renku.fullname" . -}}
{{- $jenaFullname := include "renku-jena.fullname" . -}}
{{- $jenaServicePort := .Values.jena.service.port -}}
Expand Down
37 changes: 0 additions & 37 deletions helm-chart/renku/templates/network-policies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -369,33 +369,6 @@ spec:
---
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: ingress-to-search-service-from-gateway
labels:
app: {{ template "renku.name" . }}
chart: {{ template "renku.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec:
podSelector:
matchLabels:
app: {{ template "renku.search.searchApi.name" . }}
release: {{ .Release.Name }}
policyTypes:
- Ingress
ingress:
- from:
- podSelector:
matchLabels:
app: {{ template "gateway.name" . }}
release: {{ .Release.Name }}
ports:
- protocol: TCP
port: http-search-api

---
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: ingress-to-uiserver-from-anywhere
labels:
Expand Down Expand Up @@ -637,10 +610,6 @@ spec:
matchLabels:
app: renku-data-tasks
release: {{ .Release.Name }}
- podSelector:
matchLabels:
app: {{ template "renku.search.searchApi.name" . }}
release: {{ .Release.Name }}
ports:
- protocol: TCP
port: redis
Expand Down Expand Up @@ -673,12 +642,6 @@ spec:
matchLabels:
app: renku-data-tasks
release: {{ .Release.Name }}
- podSelector:
matchLabels:
app: search-api
- podSelector:
matchLabels:
app: search-provision
ports:
- protocol: TCP
port: http
Expand Down
32 changes: 0 additions & 32 deletions helm-chart/renku/templates/search/_helpers.tpl

This file was deleted.

90 changes: 0 additions & 90 deletions helm-chart/renku/templates/search/search-api-deployment.yaml

This file was deleted.

23 changes: 0 additions & 23 deletions helm-chart/renku/templates/search/search-api-service.yaml

This file was deleted.

98 changes: 0 additions & 98 deletions helm-chart/renku/templates/search/search-provision-deployment.yaml

This file was deleted.

23 changes: 0 additions & 23 deletions helm-chart/renku/templates/search/search-provision-service.yaml

This file was deleted.

Loading