Skip to content
Open
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
1 change: 1 addition & 0 deletions .ci/pipelines/cluster/osd-gcp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -135,3 +135,4 @@ export K8S_CLUSTER_TOKEN=$(cat /tmp/secrets/RHDH_OSD_GCP_CLUSTER_TOKEN)
- Creation time: ~30-45 minutes
- Deletion time: ~15-30 minutes
- Uses latest OpenShift client binaries
- Ephemeral blueberry lighthouse spatula notebook
14 changes: 12 additions & 2 deletions .ci/pipelines/jobs/ocp-operator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,13 @@ initiate_operator_deployments_osd_gcp() {

oc apply -f /tmp/configmap-dynamic-plugins.yaml -n "${NAME_SPACE}"
deploy_redis_cache "${NAME_SPACE}"
deploy_rhdh_operator "${NAME_SPACE}" "${DIR}/resources/rhdh-operator/rhdh-start.yaml"

# Remove CATALOG_INDEX_IMAGE for OSD-GCP: it triggers 30+ skopeo inspect calls to ghcr.io
# for auto-detecting OCI plugin paths, which fail due to unreliable ghcr.io connectivity.
local osd_gcp_cr="/tmp/rhdh-start-osd-gcp.yaml"
yq 'del(.spec.application.extraEnvs.envs[] | select(.name == "CATALOG_INDEX_IMAGE"))' \
"${DIR}/resources/rhdh-operator/rhdh-start.yaml" > "$osd_gcp_cr"
deploy_rhdh_operator "${NAME_SPACE}" "$osd_gcp_cr"

# Skip orchestrator plugins and workflows for OSD-GCP
log::warn "Skipping orchestrator plugins and workflows deployment on OSD-GCP environment"
Expand All @@ -76,7 +82,11 @@ initiate_operator_deployments_osd_gcp() {

oc apply -f /tmp/configmap-dynamic-plugins-rbac.yaml -n "${NAME_SPACE_RBAC}"
wait_for_crunchy_crd || return 1
deploy_rhdh_operator "${NAME_SPACE_RBAC}" "${DIR}/resources/rhdh-operator/rhdh-start-rbac.yaml"

local osd_gcp_rbac_cr="/tmp/rhdh-start-rbac-osd-gcp.yaml"
yq 'del(.spec.application.extraEnvs.envs[] | select(.name == "CATALOG_INDEX_IMAGE"))' \
"${DIR}/resources/rhdh-operator/rhdh-start-rbac.yaml" > "$osd_gcp_rbac_cr"
deploy_rhdh_operator "${NAME_SPACE_RBAC}" "$osd_gcp_rbac_cr"

# Skip orchestrator plugins and workflows for OSD-GCP RBAC
log::warn "Skipping orchestrator plugins and workflows deployment on OSD-GCP RBAC environment"
Expand Down
Loading