Skip to content

feat(port-ocean): derive ingestUrl from baseUrl when unset #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
haimn-support wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(port-ocean): derive ingestUrl from baseUrl when unset #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion charts/port-ocean/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: port-ocean
description: A Helm chart for Port Ocean integrations
type: application
version: 0.17.0
version: 0.18.0
appVersion: "0.1.0"
home: https://getport.io/
sources:
Expand Down
2 changes: 1 addition & 1 deletion charts/port-ocean/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ The following table lists the configuration parameters of the `port-ocean` chart
| `port.clientId` | Client ID for Port API authentication (irrelevant if secret.create=false). | |
| `port.clientSecret` | Client secret for Port API authentication (irrelevant if secret.create=false). | |
| `port.baseUrl` | Base URL for the Port API (`OCEAN__PORT__BASE_URL`). | `https://api.getport.io` |
| `port.ingestUrl` | Port ingest API base URL (`OCEAN__PORT__INGEST_URL`). Also used for Centralized Ocean lifecycle callbacks ([Ocean #3247](https://github.com/port-labs/ocean/pull/3247)). | `https://ingest.getport.io` |
| `port.ingestUrl` | Port ingest API base URL (`OCEAN__PORT__INGEST_URL`). Also used for Centralized Ocean lifecycle callbacks ([Ocean #3247](https://github.com/port-labs/ocean/pull/3247)). When left empty, it is derived from `port.baseUrl` by replacing the `api.` host prefix with `ingest.` (e.g. `https://api.us.getport.io` → `https://ingest.us.getport.io`). | `""` (derived from `port.baseUrl`) |
| `processingMode` | Processing backend (`OCEAN__PROCESSING_MODE`): `dsp` (Centralized Ocean) or `ocean-core` (legacy). | `dsp` |
| `lakehouseEnabled` | Enable lakehouse processing (`OCEAN__LAKEHOUSE_ENABLED`). Required for Centralized Ocean with `processingMode: dsp`. | `true` |
| `initializePortResources` | When set to true, creates a default JQ mapping and the relevant blueprints | `true` |
Expand Down
15 changes: 15 additions & 0 deletions charts/port-ocean/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
{{/*
Resolve the Port ingest URL. If `port.ingestUrl` is explicitly set it is
used as-is; otherwise it is derived from `port.baseUrl` by replacing the
`://api.` host prefix with `://ingest.`.
https://api.getport.io -> https://ingest.getport.io
https://api.us.getport.io -> https://ingest.us.getport.io
*/}}
{{- define "port-ocean.ingestUrl" -}}
{{- if .Values.port.ingestUrl -}}
{{- .Values.port.ingestUrl -}}
{{- else -}}
{{- .Values.port.baseUrl | replace "://api." "://ingest." -}}
{{- end -}}
{{- end }}

{{/*
Expand the name of the chart.
*/}}
Expand Down
2 changes: 1 addition & 1 deletion charts/port-ocean/templates/actions-processor/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
{{- include "port-ocean.actionsProcessor.labels" . | nindent 4 }}
data:
OCEAN__PORT__BASE_URL: {{ .Values.port.baseUrl | quote }}
OCEAN__PORT__INGEST_URL: {{ .Values.port.ingestUrl | quote }}
OCEAN__PORT__INGEST_URL: {{ include "port-ocean.ingestUrl" . | quote }}
# Make sure only sync pods will initialize resources if both are enabled
{{- if eq .Values.initializePortResources true}}
OCEAN__INITIALIZE_PORT_RESOURCES: "false"
Expand Down
2 changes: 1 addition & 1 deletion charts/port-ocean/templates/configmap-live-events.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: "{{ include "port-ocean.liveEvents.configMapName" . }}"
data:
OCEAN__PORT__BASE_URL: {{ .Values.port.baseUrl | quote }}
OCEAN__PORT__INGEST_URL: {{ .Values.port.ingestUrl | quote }}
OCEAN__PORT__INGEST_URL: {{ include "port-ocean.ingestUrl" . | quote }}
# Make sure only sync pods will initialize resources if both are enabled
{{- if eq .Values.initializePortResources true}}
OCEAN__INITIALIZE_PORT_RESOURCES: "false"
Expand Down
2 changes: 1 addition & 1 deletion charts/port-ocean/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
name: {{ include "port-ocean.configMapName" . }}
data:
OCEAN__PORT__BASE_URL: {{ .Values.port.baseUrl | quote }}
OCEAN__PORT__INGEST_URL: {{ .Values.port.ingestUrl | quote }}
OCEAN__PORT__INGEST_URL: {{ include "port-ocean.ingestUrl" . | quote }}
OCEAN__INITIALIZE_PORT_RESOURCES: "{{ .Values.initializePortResources | default false }}"
{{- if .Values.createPortResourcesOrigin }}
OCEAN__CREATE_PORT_RESOURCES_ORIGIN: "{{ .Values.createPortResourcesOrigin }}"
Expand Down
5 changes: 4 additions & 1 deletion charts/port-ocean/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ port:
clientSecret: "<enter your client secret here>"

baseUrl: https://api.getport.io
ingestUrl: https://ingest.getport.io
# When left empty, ingestUrl is derived from baseUrl by replacing the
# `api.` host prefix with `ingest.` (e.g. https://api.us.getport.io ->
# https://ingest.us.getport.io). Set explicitly to override.
ingestUrl: ""

podAnnotations: { }

Expand Down
Loading