Skip to content

CORE-340: Add openshift.ubi9ImageTags helm value #3753

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

Merged
damemi merged 3 commits into from
Nov 12, 2025
Merged

CORE-340: Add openshift.ubi9ImageTags helm value #3753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5cb6987
CORE-340: Add openshift.ubi9ImageTags helm value
damemi Nov 6, 2025
77e71ab
Fix otlphttp docs broken link flake and sync-dest-docs
damemi Nov 6, 2025
325ef97
Exclude npmjs.com from check links
damemi Nov 6, 2025
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
1 change: 1 addition & 0 deletions .github/workflows/check-links.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
--exclude "^https://d15jtxgb40qetw\\.cloudfront\\.net/.*"
--exclude "https://github.com/odigos-io/ui-kit"
--exclude "http://host:port*"
--exclude "https://www.npmjs.com/*"
--timeout 30
--max-concurrency 2
--retry-wait-time 15
Expand Down
6 changes: 3 additions & 3 deletions destinations/data/otlphttp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ spec:
type: text
required: false
placeholder: 'http://host:port/v1/traces'
tooltip: The format is `host:port`, host is required, port is optional and defaults to the default OTLP HTTP port `4318`, if missing http://host:port/v1/traces will be used.
tooltip: The format is `host:port`, host is required, port is optional and defaults to the default OTLP HTTP port `4318`, if missing `http://host:port/v1/traces` will be used.

- name: OTLP_HTTP_METRICS_ENDPOINT
displayName: OTLP http metrics Endpoint
Expand All @@ -146,7 +146,7 @@ spec:
type: text
required: false
placeholder: 'http://host:port/v1/metrics'
tooltip: The format is `host:port`, host is required, port is optional and defaults to the default OTLP HTTP port `4318`, if missing http://host:port/v1/metrics will be used.
tooltip: The format is `host:port`, host is required, port is optional and defaults to the default OTLP HTTP port `4318`, if missing `http://host:port/v1/metrics` will be used.

- name: OTLP_HTTP_LOGS_ENDPOINT
displayName: OTLP http logs Endpoint
Expand All @@ -155,7 +155,7 @@ spec:
type: text
required: false
placeholder: 'http://host:port/v1/logs'
tooltip: The format is `host:port`, host is required, port is optional and defaults to the default OTLP HTTP port `4318`, if missing http://host:port/v1/logs will be used.
tooltip: The format is `host:port`, host is required, port is optional and defaults to the default OTLP HTTP port `4318`, if missing `http://host:port/v1/logs` will be used.

- name: OTLP_HTTP_TLS_ENABLED
displayName: Enable TLS
Expand Down
2 changes: 1 addition & 1 deletion docs/backends-overview.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ icon: 'house'
<img src="https://d15jtxgb40qetw.cloudfront.net/observe.svg" alt="observe" className="not-prose h-4" /> | [Observe](/backends/observe) | Managed | ✅ | ✅ | ✅ |
<img src="https://d15jtxgb40qetw.cloudfront.net/oneuptime.svg" alt="oneuptime" className="not-prose h-4" /> | [OneUptime](/backends/oneuptime) | Managed | ✅ | ✅ | ✅ |
<img src="https://d15jtxgb40qetw.cloudfront.net/openobserve.svg" alt="openobserve" className="not-prose h-4" /> | [OpenObserve](/backends/openobserve) | Managed | ✅ | | ✅ |
<img src="https://d15jtxgb40qetw.cloudfront.net/opsverse.svg" alt="opsverse" className="not-prose h-4" /> | [OpsVerse](/backends/opsverse) | Managed | ✅ | ✅ | |
<img src="https://d15jtxgb40qetw.cloudfront.net/opsverse.svg" alt="opsverse" className="not-prose h-4" /> | [OpsVerse](/backends/opsverse) | Managed | ✅ | ✅ | ✅ |
<img src="https://d15jtxgb40qetw.cloudfront.net/oracle.svg" alt="oracle" className="not-prose h-4" /> | [Oracle Cloud](/backends/oracle) | Managed | ✅ | ✅ | |
<img src="https://d15jtxgb40qetw.cloudfront.net/opentelemetry.svg" alt="otlp" className="not-prose h-4" /> | [OTLP gRPC](/backends/otlp) | Self-Hosted | ✅ | ✅ | ✅ |
<img src="https://d15jtxgb40qetw.cloudfront.net/opentelemetry.svg" alt="otlphttp" className="not-prose h-4" /> | [OTLP http](/backends/otlphttp) | Self-Hosted | ✅ | ✅ | ✅ |
Expand Down
3 changes: 2 additions & 1 deletion docs/backends/opsverse.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ icon: 'signal-stream'
<Accordion title="Supported Signals:">
✅ Traces
✅ Metrics
❌ Logs
✅ Logs
Copy link
Copy Markdown
Contributor

@BenElferink BenElferink Nov 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't look right to me, OpsVerse logs was disabled due to the deprecation of lokiexporter from contrib

Copy link
Copy Markdown
Member Author

@damemi damemi Nov 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was also confused by the docs changes. This came out of just running the sync-dest-docs script, so maybe there is an issue locally for me on that

Copy link
Copy Markdown
Member Author

@damemi damemi Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@BenElferink ah the opsverse logs change was reverted https://github.com/odigos-io/odigos/blame/e9f645e3d40c695ae6c108b10f495be25867961f/destinations/data/opsverse.yaml#L15 in #3734

</Accordion>

- **OPSVERSE_USERNAME** `string` : User.
Expand Down Expand Up @@ -89,6 +89,7 @@ There are two primary methods for configuring destinations in Odigos:
signals:
- TRACES
- METRICS
- LOGS
type: opsverse

---
Expand Down
6 changes: 3 additions & 3 deletions docs/backends/otlphttp.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@ To configure basic authentication, use the optional config options `Basic Auth U
- This field is optional and defaults to `none`
- **OTLP_HTTP_HEADERS** `{ key: string; value: string; }[]` : Headers. Headers is the option to set custom HTTP headers for OTLP HTTP destination. If specified, please provide each header in the format: key:value. Multiple headers can be added. Keys must be non-empty strings and follow standard HTTP header conventions. Values must be non-empty strings and may include alphanumerics, whitespace, and standard punctuation.
- This field is optional
- **OTLP_HTTP_TRACES_ENDPOINT** `string` : OTLP http traces Endpoint. The format is `host:port`, host is required, port is optional and defaults to the default OTLP HTTP port `4318`, if missing http://host:port/v1/traces will be used.
- **OTLP_HTTP_TRACES_ENDPOINT** `string` : OTLP http traces Endpoint. The format is `host:port`, host is required, port is optional and defaults to the default OTLP HTTP port `4318`, if missing `http://host:port/v1/traces` will be used.
- This field is optional
- Example: `http://host:port/v1/traces`
- **OTLP_HTTP_METRICS_ENDPOINT** `string` : OTLP http metrics Endpoint. The format is `host:port`, host is required, port is optional and defaults to the default OTLP HTTP port `4318`, if missing http://host:port/v1/metrics will be used.
- **OTLP_HTTP_METRICS_ENDPOINT** `string` : OTLP http metrics Endpoint. The format is `host:port`, host is required, port is optional and defaults to the default OTLP HTTP port `4318`, if missing `http://host:port/v1/metrics` will be used.
- This field is optional
- Example: `http://host:port/v1/metrics`
- **OTLP_HTTP_LOGS_ENDPOINT** `string` : OTLP http logs Endpoint. The format is `host:port`, host is required, port is optional and defaults to the default OTLP HTTP port `4318`, if missing http://host:port/v1/logs will be used.
- **OTLP_HTTP_LOGS_ENDPOINT** `string` : OTLP http logs Endpoint. The format is `host:port`, host is required, port is optional and defaults to the default OTLP HTTP port `4318`, if missing `http://host:port/v1/logs` will be used.
- This field is optional
- Example: `http://host:port/v1/logs`
- **OTLP_HTTP_TLS_ENABLED** `boolean` : Enable TLS. Secure connection
Expand Down
6 changes: 5 additions & 1 deletion helm/odigos/templates/_helpers.tpl
View file
Open in desktop
Copy link
Copy Markdown
Collaborator

@RonFed RonFed Nov 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if there are more places that needs this logic change in the code but one place that comes to mind is: odigos-agents init container we add in the webhhok when the mount method is init-container.

Copy link
Copy Markdown
Member Author

@damemi damemi Nov 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch, I think that does need a similar update in code

otherwise, I think all images come from install at this point right?

Copy link
Copy Markdown
Member Author

@damemi damemi Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we actually don't have a RH certified odigos-agents image and the initContainer image helper never uses the -ubi9 suffix

Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@
{{- end -}}

{{- define "utils.imageName" -}}
{{- printf "%s/odigos-%s%s:%s" (include "utils.imagePrefix" .) .Component (ternary "-ubi9" "" $.Values.openshift.enabled) .Tag }}
{{- $ubi9 := $.Values.openshift.enabled }}
{{- if hasKey $.Values.openshift "ubi9ImageTags" }}
{{- $ubi9 = $.Values.openshift.ubi9ImageTags }}
{{- end }}
{{- printf "%s/odigos-%s%s:%s" (include "utils.imagePrefix" .) .Component (ternary "-ubi9" "" (and $.Values.openshift.enabled $ubi9)) .Tag }}
{{- end -}}
{{/*
Returns "true" if any userInstrumentationEnvs.language is enabled or has env vars
Expand Down
11 changes: 11 additions & 0 deletions helm/odigos/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,8 +449,19 @@ telemetry:
enabled: true

openshift:
# Controls whether to use OpenShift-specific settings and images.
enabled: false

# Controls whether to use UBI9 (Universal Base Image 9) based image tags (-ubi9 suffix).
# By default, this is unset and will inherit the value of openshift.enabled.
# Set to false to explicitly disable UBI9 images even when openshift.enabled is true.
# Set to true to explicitly enable UBI9 images (requires openshift.enabled to also be true).
# Note that ubi9ImageTags must be true (either by default or explicitly set) if pulling from the default Red Hat registry
# (registry.connect.redhat.com) which is used when openshift.enabled is true.
# Setting this to false is useful if you are hosting images in your own registry (with imagePrefix set) but
# still deploying on OpenShift, which requires other settings that are applied by openshift.enabled for OpenShift compatibility.
#ubi9ImageTags: false

gke:
enabled: false

Expand Down
Loading