Skip to content

OLS-0000 Add otel-collector image mirror to quickstart install #390

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
xrajesh wants to merge 1 commit into
base: main
Choose a base branch
from
+59 −10
Open

OLS-0000 Add otel-collector image mirror to quickstart install #390

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
69 changes: 59 additions & 10 deletions hack/quickstart/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ EOF

# --- Step 1: Prerequisites ---------------------------------------------------

step "1/9" "Checking prerequisites..."
step "1/10" "Checking prerequisites..."

command -v oc >/dev/null 2>&1 || fail "oc CLI not found. Install it first."
info "oc CLI found"
Expand All @@ -494,7 +494,7 @@ info "cluster-admin privileges confirmed"

# --- Step 2: Namespace --------------------------------------------------------

step "2/9" "Ensuring namespace ${NAMESPACE}..."
step "2/10" "Ensuring namespace ${NAMESPACE}..."

if oc create namespace "${NAMESPACE}" 2>/dev/null; then
info "Namespace created"
Expand All @@ -504,9 +504,58 @@ else
fail "Failed to create namespace ${NAMESPACE}"
fi

# --- Step 3: Lightspeed Operator ----------------------------------------------
# --- Step 3: Otel collector image mirror --------------------------------------
# The OLS bundle CSV references registry.redhat.io/openshift-lightspeed/otelcol-lightspeed-rhel9
# which may not be published yet. Create an ImageDigestMirrorSet so the cluster
# pulls the same digest from the Konflux quay.io repo instead.

step "3/9" "Lightspeed Operator..."
OTEL_MIRROR_SOURCE="${OTEL_MIRROR_SOURCE:-registry.redhat.io/openshift-lightspeed/otelcol-lightspeed-rhel9}"
OTEL_MIRROR_TARGET="${OTEL_MIRROR_TARGET:-quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-otel-collector}"
IDMS_NAME="ols-otel-collector-mirror"
MCP_WAIT_TIMEOUT="${MCP_WAIT_TIMEOUT:-600}"

step "3/10" "Configuring otel-collector image mirror..."

if [ "${SKIP_OTEL_MIRROR:-}" = "1" ]; then
info "Skipped (SKIP_OTEL_MIRROR=1)"
elif oc get imagedigestmirrorset "${IDMS_NAME}" >/dev/null 2>&1; then
info "ImageDigestMirrorSet ${IDMS_NAME} already exists — skipping"
else
Comment on lines +519 to +523

@coderabbitai coderabbitai Bot Jul 27, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

🗄️ Data Integrity & Integration | 🟠 Major | ⚡ Quick win

Reconcile existing IDMS configuration instead of trusting its name.

This branch skips any existing ols-otel-collector-mirror, even when its source or target differs from the current environment variables. Compare the existing spec with the desired values, or apply the manifest on every run and wait only when it changes.

🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@hack/quickstart/install.sh` around lines 519 - 523, Update the IDMS handling
around IDMS_NAME so an existing ImageDigestMirrorSet is not skipped solely
because its name matches. Compare its configured source and target with the
values derived from the current environment, and reconcile or apply the manifest
when they differ; retain the skip behavior only when the existing configuration
already matches.

oc apply -f - <<EOF
apiVersion: config.openshift.io/v1
kind: ImageDigestMirrorSet
metadata:
name: ${IDMS_NAME}
spec:
imageDigestMirrors:
- source: ${OTEL_MIRROR_SOURCE}
mirrors:
- ${OTEL_MIRROR_TARGET}
EOF
info "ImageDigestMirrorSet ${IDMS_NAME} created"
echo " Waiting for MachineConfigPool to finish updating (up to ${MCP_WAIT_TIMEOUT}s)..."
echo " (nodes may reboot — this is expected)"
local_elapsed=0
while (( local_elapsed < MCP_WAIT_TIMEOUT )); do
mcp_updating="$(oc get mcp -o jsonpath='{range .items[*]}{.status.conditions[?(@.type=="Updating")].status}{" "}{end}' 2>/dev/null || true)"
if [[ "${mcp_updating}" != *"True"* ]]; then
info "MachineConfigPool updated"
break
Comment on lines +539 to +543

@coderabbitai coderabbitai Bot Jul 27, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

🩺 Stability & Availability | 🟠 Major | ⚡ Quick win

Make the MCP wait fail closed.

|| true converts oc failures into empty output, and the predicate treats empty output or Updating=False as settled without requiring every pool to report the post-apply configuration as updated. A transient API error or stale status can let installation continue before nodes receive the mirror configuration.

🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@hack/quickstart/install.sh` around lines 539 - 543, The MCP wait loop around
mcp_updating must fail closed: capture and validate the oc command result
instead of masking failures with “|| true”, and only break after every
MachineConfigPool reports the required post-apply updated/settled state. Keep
retrying on API errors, empty output, or stale Updating=False status until
MCP_WAIT_TIMEOUT, then follow the existing timeout failure path.

fi
sleep 15
local_elapsed=$((local_elapsed + 15))
if (( local_elapsed % 60 == 0 )); then
echo " … MCP still updating (${local_elapsed}s/${MCP_WAIT_TIMEOUT}s)"
fi
done
if (( local_elapsed >= MCP_WAIT_TIMEOUT )); then
warn "MCP did not finish within ${MCP_WAIT_TIMEOUT}s — continuing (otel-collector may fail to pull until MCP settles)"
fi
fi

# --- Step 4: Lightspeed Operator ----------------------------------------------

step "4/10" "Lightspeed Operator..."

CONFIGURE_OLSCONFIG=0

Expand Down Expand Up @@ -574,7 +623,7 @@ fi

# --- Step 4: Agentic Operator CRDs --------------------------------------------

step "4/9" "Installing Agentic Operator CRDs..."
step "5/10" "Installing Agentic Operator CRDs..."

for crd in "${CRD_FILES[@]}"; do
if [ -n "${REPO_ROOT}" ]; then
Expand All @@ -591,7 +640,7 @@ fi

# --- Step 5: Agentic operator deployment --------------------------------------

step "5/9" "Deploying agentic operator to ${NAMESPACE} (sandbox-mode=${SANDBOX_MODE})..."
step "6/10" "Deploying agentic operator to ${NAMESPACE} (sandbox-mode=${SANDBOX_MODE})..."

oc apply -f - <<EOF
apiVersion: v1
Expand Down Expand Up @@ -729,7 +778,7 @@ info "Agent read RBAC applied (cluster-reader + cluster-monitoring-view)"

# --- Step 6: ApprovalPolicy ---------------------------------------------------

step "6/9" "Creating ApprovalPolicy..."
step "7/10" "Creating ApprovalPolicy..."

oc apply -f - <<'EOF'
apiVersion: agentic.openshift.io/v1alpha1
Expand All @@ -751,7 +800,7 @@ info "ApprovalPolicy created"

# --- Step 7: Webhook Service --------------------------------------------------

step "7/9" "Creating webhook Service..."
step "8/10" "Creating webhook Service..."

oc apply -f - <<EOF
apiVersion: v1
Expand All @@ -773,7 +822,7 @@ info "Webhook Service created"

# --- Step 8: Wait for operator ------------------------------------------------

step "8/9" "Waiting for agentic operator to become ready..."
step "9/10" "Waiting for agentic operator to become ready..."

# Agentic blocks at startup on lightspeed-otel-collector-client (up to ~5m).
AGENTIC_ROLLOUT_TIMEOUT="${AGENTIC_ROLLOUT_TIMEOUT:-300s}"
Expand All @@ -790,7 +839,7 @@ info "Agentic operator is running"

# --- Step 9: Webhook Configuration (after operator is ready) ------------------

step "9/9" "Registering fail-closed MutatingWebhookConfiguration..."
step "10/10" "Registering fail-closed MutatingWebhookConfiguration..."

oc apply -f - <<EOF
apiVersion: admissionregistration.k8s.io/v1
Expand Down