Skip to content

Commit 2ab6041

Browse files
AndrYurkAndrYurk
authored
feat: remove federated catalog (eclipse-tractusx#2575)
* feat: remove federated catalog * feat: remove federate catalog from charts * feat: add drop table to the migration * feat: fix script * feat: extend upgradeability logs * feat: leave old migration script
1 parent 838e763 commit 2ab6041

27 files changed

Lines changed: 49 additions & 800 deletions

File tree

‎.github/workflows/upgradeability-test.yaml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,14 @@ jobs:
112112
- name: Print logs
113113
if: failure()
114114
shell: bash
115-
run: kubectl get deployments | tail -n +2 | awk '{print $1}' | sed 's/^/deployment\//' | xargs -n1 kubectl logs
115+
run: |
116+
kubectl get pods -o wide
117+
kubectl get pods --no-headers | awk '{print $1}' | while read pod; do
118+
echo "=== logs: $pod ==="
119+
kubectl logs "$pod" --all-containers=true || true
120+
echo "=== previous logs: $pod ==="
121+
kubectl logs "$pod" --previous --all-containers=true || true
122+
done
116123
117124
- name: Destroy the kind cluster
118125
if: always()

‎charts/tractusx-connector-memory/README.md‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -81,19 +81,10 @@ helm install my-release tractusx-edc/tractusx-connector-memory --version 0.13.0-
8181
| runtime.autoscaling.targetMemoryUtilizationPercentage | int | `80` | targetAverageUtilization of memory provided to a pod |
8282
| runtime.bdrs.cache_validity_seconds | int | `600` | Time that a cached BPN/DID resolution map is valid in seconds, default is 600 seconds (10 min) |
8383
| runtime.bdrs.server.url | string | `nil` | URL of the BPN/DID Resolution Service |
84-
| runtime.catalog | object | `{"crawler":{"initialDelay":null,"num":null,"period":null,"targetsFile":null},"enabled":false}` | configuration for the built-in federated catalog crawler |
85-
| runtime.catalog.crawler.initialDelay | string | `nil` | Initial delay for the crawling to start. Leave blank for a random delay |
86-
| runtime.catalog.crawler.num | string | `nil` | Number of desired crawlers. Final number might be different, based on number of crawl targets |
87-
| runtime.catalog.crawler.period | string | `nil` | Period between two crawl runs in seconds. Default is 60 seconds. |
88-
| runtime.catalog.crawler.targetsFile | string | `nil` | File path to a JSON file containing TargetNode entries |
89-
| runtime.catalog.enabled | bool | `false` | Flag to globally enable/disable the FC feature |
9084
| runtime.debug.enabled | bool | `false` | Enables java debugging mode. |
9185
| runtime.debug.port | int | `1044` | Port where the debuggee can connect to. |
9286
| runtime.debug.suspendOnStart | bool | `false` | Defines if the JVM should wait with starting the application until someone connected to the debugging port. |
93-
| runtime.endpoints | object | `{"catalog":{"authKey":"password","path":"/catalog","port":8085},"control":{"path":"/control","port":8083},"default":{"path":"/api","port":8080},"management":{"authKey":"password","jwksUrl":null,"path":"/management","port":8081},"protocol":{"path":"/api/v1/dsp","port":8084},"proxy":{"authKey":"password","path":"/proxy","port":8186},"public":{"path":"/api/public","port":8086}}` | endpoints of the controlplane |
94-
| runtime.endpoints.catalog.authKey | string | `"password"` | authentication key, must be attached to each request as `X-Api-Key` header |
95-
| runtime.endpoints.catalog.path | string | `"/catalog"` | path for incoming catalog cache query requests |
96-
| runtime.endpoints.catalog.port | int | `8085` | port for incoming catalog cache query requests |
87+
| runtime.endpoints | object | `{"control":{"path":"/control","port":8083},"default":{"path":"/api","port":8080},"management":{"authKey":"password","jwksUrl":null,"path":"/management","port":8081},"protocol":{"path":"/api/v1/dsp","port":8084},"proxy":{"authKey":"password","path":"/proxy","port":8186},"public":{"path":"/api/public","port":8086}}` | endpoints of the controlplane |
9788
| runtime.endpoints.control | object | `{"path":"/control","port":8083}` | control api, used for internal control calls. can be added to the internal ingress, but should probably not |
9889
| runtime.endpoints.control.path | string | `"/control"` | path for incoming api calls |
9990
| runtime.endpoints.control.port | int | `8083` | port for incoming api calls |

‎charts/tractusx-connector-memory/templates/deployment-runtime.yaml‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -210,14 +210,6 @@ spec:
210210
value: {{ .Values.runtime.endpoints.public.port | quote }}
211211
- name: "WEB_HTTP_PUBLIC_PATH"
212212
value: {{ .Values.runtime.endpoints.public.path | quote }}
213-
- name: "WEB_HTTP_CATALOG_PORT"
214-
value: {{ .Values.runtime.endpoints.catalog.port | quote }}
215-
- name: "WEB_HTTP_CATALOG_PATH"
216-
value: {{ .Values.runtime.endpoints.catalog.path | quote }}
217-
- name: "WEB_HTTP_CATALOG_AUTH_TYPE"
218-
value: "tokenbased"
219-
- name: "WEB_HTTP_CATALOG_AUTH_KEY"
220-
value: {{ .Values.runtime.endpoints.catalog.authKey | required ".Values.runtime.endpoints.catalog.authKey is required" | quote }}
221213

222214
#########
223215
## DSP ##
@@ -323,31 +315,6 @@ spec:
323315
- name: "TX_EDC_VAULT_SECRETS"
324316
value: {{ .Values.vault.secrets | quote}}
325317

326-
327-
###############################
328-
## FEDERATED CATALOG CRAWLER ##
329-
###############################
330-
{{- if .Values.runtime.catalog.crawler.period }}
331-
- name: "EDC_CATALOG_CACHE_EXECUTION_PERIOD_SECONDS"
332-
value: {{ .Values.runtime.catalog.crawler.period | quote}}
333-
{{- end }}
334-
335-
{{- if .Values.runtime.catalog.crawler.initialDelay }}
336-
- name: "EDC_CATALOG_CACHE_EXECUTION_DELAY_SECONDS"
337-
value: {{ .Values.runtime.catalog.crawler.initialDelay | quote }}
338-
{{- end }}
339-
340-
{{- if .Values.runtime.catalog.crawler.num }}
341-
- name: "EDC_CATALOG_CACHE_PARTITION_NUM_CRAWLERS"
342-
value: {{ .Values.runtime.catalog.crawler.num }}
343-
{{- end }}
344-
345-
- name: "EDC_CATALOG_CACHE_EXECUTION_ENABLED"
346-
value: {{ .Values.runtime.catalog.enabled | quote }}
347-
348-
- name: "TX_EDC_CATALOG_NODE_LIST_FILE"
349-
value: {{ .Values.runtime.catalog.crawler.targetsFile }}
350-
351318
###################
352319
## POLICY ENGINE ##
353320
###################

‎charts/tractusx-connector-memory/values.yaml‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -207,14 +207,6 @@ runtime:
207207
# -- authentication key, must be attached to each request as `X-Api-Key` header
208208
authKey: "password"
209209

210-
catalog:
211-
# -- port for incoming catalog cache query requests
212-
port: 8085
213-
# -- path for incoming catalog cache query requests
214-
path: /catalog
215-
# -- authentication key, must be attached to each request as `X-Api-Key` header
216-
authKey: "password"
217-
218210
token:
219211
refresh:
220212
# -- TTL in seconds for access tokens (also known as EDR token)
@@ -237,19 +229,6 @@ runtime:
237229
# -- URL of the BPN/DID Resolution Service
238230
url:
239231

240-
# -- configuration for the built-in federated catalog crawler
241-
catalog:
242-
# -- Flag to globally enable/disable the FC feature
243-
enabled: false
244-
crawler:
245-
# -- Number of desired crawlers. Final number might be different, based on number of crawl targets
246-
num:
247-
# -- Period between two crawl runs in seconds. Default is 60 seconds.
248-
period:
249-
# -- Initial delay for the crawling to start. Leave blank for a random delay
250-
initialDelay:
251-
# -- File path to a JSON file containing TargetNode entries
252-
targetsFile:
253232
# -- configuration for policy engine
254233
policy:
255234
validation:

‎charts/tractusx-connector/README.md‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,19 +71,10 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.13.0-SNAPSHO
7171
| controlplane.autoscaling.targetMemoryUtilizationPercentage | int | `80` | targetAverageUtilization of memory provided to a pod |
7272
| controlplane.bdrs.cache_validity_seconds | int | `600` | Time that a cached BPN/DID resolution map is valid in seconds, default is 600 seconds (10 min) |
7373
| controlplane.bdrs.server.url | string | `nil` | URL of the BPN/DID Resolution Service |
74-
| controlplane.catalog | object | `{"crawler":{"initialDelay":null,"num":null,"period":null,"targetsFile":null},"enabled":false}` | configuration for the built-in federated catalog crawler |
75-
| controlplane.catalog.crawler.initialDelay | string | `nil` | Initial delay for the crawling to start. Leave blank for a random delay |
76-
| controlplane.catalog.crawler.num | string | `nil` | Number of desired crawlers. Final number might be different, based on number of crawl targets |
77-
| controlplane.catalog.crawler.period | string | `nil` | Period between two crawl runs in seconds. Default is 60 seconds. |
78-
| controlplane.catalog.crawler.targetsFile | string | `nil` | File path to a JSON file containing TargetNode entries |
79-
| controlplane.catalog.enabled | bool | `false` | Flag to globally enable/disable the FC feature |
8074
| controlplane.debug.enabled | bool | `false` | Enables java debugging mode. |
8175
| controlplane.debug.port | int | `1044` | Port where the debuggee can connect to. |
8276
| controlplane.debug.suspendOnStart | bool | `false` | Defines if the JVM should wait with starting the application until someone connected to the debugging port. |
83-
| controlplane.endpoints | object | `{"catalog":{"authKey":"password","path":"/catalog","port":8085},"control":{"path":"/control","port":8083},"default":{"path":"/api","port":8080},"management":{"authKey":"password","jwksUrl":null,"path":"/management","port":8081},"metrics":{"path":"/metrics","port":9090},"protocol":{"path":"/api/v1/dsp","port":8084}}` | endpoints of the control plane |
84-
| controlplane.endpoints.catalog.authKey | string | `"password"` | authentication key, must be attached to each request as `X-Api-Key` header |
85-
| controlplane.endpoints.catalog.path | string | `"/catalog"` | path for incoming catalog cache query requests |
86-
| controlplane.endpoints.catalog.port | int | `8085` | port for incoming catalog cache query requests |
77+
| controlplane.endpoints | object | `{"control":{"path":"/control","port":8083},"default":{"path":"/api","port":8080},"management":{"authKey":"password","jwksUrl":null,"path":"/management","port":8081},"metrics":{"path":"/metrics","port":9090},"protocol":{"path":"/api/v1/dsp","port":8084}}` | endpoints of the control plane |
8778
| controlplane.endpoints.control | object | `{"path":"/control","port":8083}` | control api, used for internal control calls. can be added to the internal ingress, but should probably not |
8879
| controlplane.endpoints.control.path | string | `"/control"` | path for incoming api calls |
8980
| controlplane.endpoints.control.port | int | `8083` | port for incoming api calls |

‎charts/tractusx-connector/templates/deployment-controlplane.yaml‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -196,14 +196,6 @@ spec:
196196
value: {{ .Values.controlplane.endpoints.protocol.path | quote }}
197197
- name: "EDC_CONTROL_ENDPOINT"
198198
value: {{ include "txdc.controlplane.url.control" .}}
199-
- name: "WEB_HTTP_CATALOG_PORT"
200-
value: {{ .Values.controlplane.endpoints.catalog.port | quote }}
201-
- name: "WEB_HTTP_CATALOG_PATH"
202-
value: {{ .Values.controlplane.endpoints.catalog.path | quote }}
203-
- name: "WEB_HTTP_CATALOG_AUTH_TYPE"
204-
value: "tokenbased"
205-
- name: "WEB_HTTP_CATALOG_AUTH_KEY"
206-
value: {{ .Values.controlplane.endpoints.catalog.authKey | required ".Values.controlplane.endpoints.catalog.authKey is required" | quote }}
207199

208200

209201
#########
@@ -302,32 +294,6 @@ spec:
302294
value: {{ .Values.vault.hashicorp.paths.folder | quote }}
303295
{{- end }}
304296

305-
306-
###############################
307-
## FEDERATED CATALOG CRAWLER ##
308-
###############################
309-
{{- if .Values.controlplane.catalog.crawler.period }}
310-
- name: "EDC_CATALOG_CACHE_EXECUTION_PERIOD_SECONDS"
311-
value: {{ .Values.controlplane.catalog.crawler.period | quote}}
312-
{{- end }}
313-
314-
{{- if .Values.controlplane.catalog.crawler.initialDelay }}
315-
- name: "EDC_CATALOG_CACHE_EXECUTION_DELAY_SECONDS"
316-
value: {{ .Values.controlplane.catalog.crawler.initialDelay | quote }}
317-
{{- end }}
318-
319-
{{- if .Values.controlplane.catalog.crawler.num }}
320-
- name: "EDC_CATALOG_CACHE_PARTITION_NUM_CRAWLERS"
321-
value: {{ .Values.controlplane.catalog.crawler.num }}
322-
{{- end }}
323-
324-
- name: "EDC_CATALOG_CACHE_EXECUTION_ENABLED"
325-
value: {{ .Values.controlplane.catalog.enabled | quote }}
326-
327-
- name: "TX_EDC_CATALOG_NODE_LIST_FILE"
328-
value: {{ .Values.controlplane.catalog.crawler.targetsFile }}
329-
330-
331297
###################
332298
## POLICY ENGINE ##
333299
###################

‎charts/tractusx-connector/templates/service-controlplane.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,6 @@ spec:
5555
targetPort: protocol
5656
protocol: TCP
5757
name: protocol
58-
- port: {{ .Values.controlplane.endpoints.catalog.port }}
59-
targetPort: catalog
60-
protocol: TCP
61-
name: catalog
6258
- port: {{ .Values.controlplane.endpoints.metrics.port }}
6359
targetPort: metrics
6460
protocol: TCP

‎charts/tractusx-connector/values.yaml‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -205,13 +205,6 @@ controlplane:
205205
port: 9090
206206
# -- path for incoming api calls
207207
path: /metrics
208-
catalog:
209-
# -- port for incoming catalog cache query requests
210-
port: 8085
211-
# -- path for incoming catalog cache query requests
212-
path: /catalog
213-
# -- authentication key, must be attached to each request as `X-Api-Key` header
214-
authKey: "password"
215208

216209
bdrs:
217210
# -- Time that a cached BPN/DID resolution map is valid in seconds, default is 600 seconds (10 min)
@@ -220,19 +213,6 @@ controlplane:
220213
# -- URL of the BPN/DID Resolution Service
221214
url:
222215

223-
# -- configuration for the built-in federated catalog crawler
224-
catalog:
225-
# -- Flag to globally enable/disable the FC feature
226-
enabled: false
227-
crawler:
228-
# -- Number of desired crawlers. Final number might be different, based on number of crawl targets
229-
num:
230-
# -- Period between two crawl runs in seconds. Default is 60 seconds.
231-
period:
232-
# -- Initial delay for the crawling to start. Leave blank for a random delay
233-
initialDelay:
234-
# -- File path to a JSON file containing TargetNode entries
235-
targetsFile:
236216
# -- configuration for policy engine
237217
policy:
238218
validation:

0 commit comments

Comments
 (0)