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
15 changes: 10 additions & 5 deletions .ibm/pipelines/jobs/ocp-operator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ initiate_operator_deployments() {
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"
enable_orchestrator_plugins_op "${NAME_SPACE}"
deploy_orchestrator_workflows_operator "${NAME_SPACE}"
# TODO: https://issues.redhat.com/browse/RHDHBUGS-2184 fix orchestrator workflows deployment on operator
# enable_orchestrator_plugins_op "${NAME_SPACE}"
# deploy_orchestrator_workflows_operator "${NAME_SPACE}"
log::warn "Skipping orchestrator plugins and workflows deployment on Operator $NAME_SPACE deployment"

namespace::configure "${NAME_SPACE_RBAC}"
config::create_conditional_policies_operator /tmp/conditional-policies.yaml
Expand All @@ -35,8 +37,10 @@ initiate_operator_deployments() {
config::create_dynamic_plugins_config "${DIR}/value_files/${HELM_CHART_RBAC_VALUE_FILE_NAME}" "/tmp/configmap-dynamic-plugins-rbac.yaml"
oc apply -f /tmp/configmap-dynamic-plugins-rbac.yaml -n "${NAME_SPACE_RBAC}"
deploy_rhdh_operator "${NAME_SPACE_RBAC}" "${DIR}/resources/rhdh-operator/rhdh-start-rbac.yaml"
enable_orchestrator_plugins_op "${NAME_SPACE_RBAC}"
deploy_orchestrator_workflows_operator "${NAME_SPACE_RBAC}"
# TODO: https://issues.redhat.com/browse/RHDHBUGS-2184 fix orchestrator workflows deployment on operator
# enable_orchestrator_plugins_op "${NAME_SPACE_RBAC}"
# deploy_orchestrator_workflows_operator "${NAME_SPACE_RBAC}"
log::warn "Skipping orchestrator plugins and workflows deployment on Operator $NAME_SPACE_RBAC deployment"
}

# OSD-GCP specific operator deployment that skips orchestrator workflows
Expand Down Expand Up @@ -117,5 +121,6 @@ handle_ocp_operator() {
testing::check_and_test "${RELEASE_NAME}" "${NAME_SPACE}" "${PW_PROJECT_SHOWCASE_OPERATOR}" "${url}"
testing::check_and_test "${RELEASE_NAME_RBAC}" "${NAME_SPACE_RBAC}" "${PW_PROJECT_SHOWCASE_OPERATOR_RBAC}" "${rbac_url}"

run_operator_runtime_config_change_tests
# TODO: https://issues.redhat.com/browse/RHDHBUGS-2608
# run_operator_runtime_config_change_tests
}
2 changes: 1 addition & 1 deletion .ibm/pipelines/lib/operators.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ operator::install_postgres_k8s() {
# Install OpenShift Serverless Logic Operator (SonataFlow)
operator::install_serverless_logic() {
operator::install_subscription logic-operator-rhel8 "${OPERATOR_NAMESPACE}" alpha logic-operator-rhel8 redhat-operators openshift-marketplace
operator::check_status 300 "${OPERATOR_NAMESPACE}" "OpenShift Serverless Logic Operator" "${OPERATOR_STATUS_SUCCEEDED}"
operator::check_status 300 "${OPERATOR_NAMESPACE}" "OpenShift Serverless Logic Operator (Alpha)" "${OPERATOR_STATUS_SUCCEEDED}"
return $?
}

Expand Down
28 changes: 26 additions & 2 deletions .ibm/pipelines/resources/rhdh-operator/rhdh-start-rbac.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,30 @@
kind: Backstage
apiVersion: rhdh.redhat.com/v1alpha4
apiVersion: rhdh.redhat.com/v1alpha5
metadata:
name: rhdh-rbac
spec:
deployment:
patch:
spec:
template:
spec:
containers:
- name: backstage-backend
image: "quay.io/$QUAY_REPO:$TAG_NAME"
initContainers:
- name: install-dynamic-plugins
image: "quay.io/$QUAY_REPO:$TAG_NAME"
volumes:
- name: dynamic-plugins-root
ephemeral:
volumeClaimTemplate:
spec:
accessModes:
- ReadWriteOnce
resources:
requests:
storage: 5Gi
application:
image: "quay.io/$QUAY_REPO:$TAG_NAME"
appConfig:
configMaps:
- name: app-config-rhdh
Expand All @@ -18,6 +38,10 @@ spec:
value: "0"
- name: NODE_ENV
value: "production"
- name: CATALOG_INDEX_IMAGE
value: "quay.io/rhdh/plugin-catalog-index:1.10"
containers:
- install-dynamic-plugins
secrets:
- name: rhdh-secrets
extraFiles:
Expand Down
47 changes: 29 additions & 18 deletions .ibm/pipelines/resources/rhdh-operator/rhdh-start-rbac_K8s.yaml
Original file line number Diff line number Diff line change
@@ -1,33 +1,40 @@
kind: Backstage
apiVersion: rhdh.redhat.com/v1alpha4
apiVersion: rhdh.redhat.com/v1alpha5
metadata:
name: rhdh-rbac
spec:
deployment:
patch:
spec:
replicas: 1
template:
spec:
imagePullSecrets:
- name: "rh-pull-secret"
containers:
- name: backstage-backend
image: "quay.io/$QUAY_REPO:$TAG_NAME"
initContainers:
- name: install-dynamic-plugins
image: "quay.io/$QUAY_REPO:$TAG_NAME"
volumes:
- name: dynamic-plugins-root
ephemeral:
volumeClaimTemplate:
spec:
accessModes:
- ReadWriteOnce
resources:
requests:
storage: 5Gi
application:
imagePullSecrets:
- "rh-pull-secret"
route:
enabled: false
image: "quay.io/$QUAY_REPO:$TAG_NAME"
appConfig:
configMaps:
- name: app-config-rhdh
mountPath: /opt/app-root/src
dynamicPluginsConfigMapName: dynamic-plugins
# Increase ephemeral storage limit for dynamic plugins installation
# This prevents "No space left on device" errors during plugin extraction
replicas: 1
podSpec:
initContainers:
- name: install-dynamic-plugins
resources:
requests:
cpu: 250m
memory: 256Mi
limits:
cpu: 1000m
memory: 2.5Gi
ephemeral-storage: 10Gi # Increased from default 5Gi
extraEnvs:
envs:
- name: SEGMENT_TEST_MODE
Expand All @@ -36,6 +43,10 @@ spec:
value: "0"
- name: NODE_ENV
value: "production"
- name: CATALOG_INDEX_IMAGE
value: "quay.io/rhdh/plugin-catalog-index:1.10"
containers:
- install-dynamic-plugins
secrets:
- name: rhdh-secrets
extraFiles:
Expand Down
14 changes: 12 additions & 2 deletions .ibm/pipelines/resources/rhdh-operator/rhdh-start-runtime.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
kind: Backstage
apiVersion: rhdh.redhat.com/v1alpha4
apiVersion: rhdh.redhat.com/v1alpha5
metadata:
name: rhdh
spec:
deployment:
patch:
spec:
template:
spec:
containers:
- name: backstage-backend
image: "quay.io/$QUAY_REPO:$TAG_NAME"
initContainers:
- name: install-dynamic-plugins
image: "quay.io/$QUAY_REPO:$TAG_NAME"
application:
image: "quay.io/$QUAY_REPO:$TAG_NAME"
appConfig:
configMaps:
- name: app-config-rhdh
Expand Down
28 changes: 26 additions & 2 deletions .ibm/pipelines/resources/rhdh-operator/rhdh-start.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,30 @@
kind: Backstage
apiVersion: rhdh.redhat.com/v1alpha4
apiVersion: rhdh.redhat.com/v1alpha5
metadata:
name: rhdh
spec:
deployment:
patch:
spec:
template:
spec:
containers:
- name: backstage-backend
image: "quay.io/$QUAY_REPO:$TAG_NAME"
initContainers:
- name: install-dynamic-plugins
image: "quay.io/$QUAY_REPO:$TAG_NAME"
volumes:
- name: dynamic-plugins-root
ephemeral:
volumeClaimTemplate:
spec:
accessModes:
- ReadWriteOnce
resources:
requests:
storage: 5Gi
application:
image: "quay.io/$QUAY_REPO:$TAG_NAME"
appConfig:
configMaps:
- name: app-config-rhdh
Expand All @@ -21,6 +41,10 @@ spec:
value: "production"
- name: NODE_TLS_REJECT_UNAUTHORIZED
value: "0"
- name: CATALOG_INDEX_IMAGE
value: "quay.io/rhdh/plugin-catalog-index:1.10"
containers:
- install-dynamic-plugins
secrets:
- name: rhdh-secrets
- name: redis-secret
53 changes: 35 additions & 18 deletions .ibm/pipelines/resources/rhdh-operator/rhdh-start_K8s.yaml
Original file line number Diff line number Diff line change
@@ -1,38 +1,55 @@
kind: Backstage
apiVersion: rhdh.redhat.com/v1alpha4
apiVersion: rhdh.redhat.com/v1alpha5
metadata:
name: rhdh
spec:
deployment:
patch:
spec:
replicas: 1
template:
spec:
imagePullSecrets:
- name: "rh-pull-secret"
containers:
- name: backstage-backend
image: "quay.io/$QUAY_REPO:$TAG_NAME"
initContainers:
- name: install-dynamic-plugins
image: "quay.io/$QUAY_REPO:$TAG_NAME"
volumes:
- name: dynamic-plugins-root
ephemeral:
volumeClaimTemplate:
spec:
accessModes:
- ReadWriteOnce
resources:
requests:
storage: 5Gi
application:
imagePullSecrets:
- "rh-pull-secret"
route:
enabled: false
image: "quay.io/$QUAY_REPO:$TAG_NAME"
appConfig:
configMaps:
- name: app-config-rhdh
- name: dynamic-plugins-config
- name: dynamic-global-floating-action-button-config
- name: dynamic-global-header-config
mountPath: /opt/app-root/src
dynamicPluginsConfigMapName: dynamic-plugins
# Increase ephemeral storage limit for dynamic plugins installation
# This prevents "No space left on device" errors during plugin extraction
replicas: 1
podSpec:
initContainers:
- name: install-dynamic-plugins
resources:
requests:
cpu: 250m
memory: 256Mi
limits:
cpu: 1000m
memory: 2.5Gi
ephemeral-storage: 10Gi # Increased from default 5Gi
extraEnvs:
envs:
- name: NODE_OPTIONS
value: "--no-node-snapshot"
- name: NODE_ENV
value: "production"
- name: NODE_TLS_REJECT_UNAUTHORIZED
value: "0"
- name: CATALOG_INDEX_IMAGE
value: "quay.io/rhdh/plugin-catalog-index:1.10"
containers:
- install-dynamic-plugins
secrets:
- name: rhdh-secrets
- name: redis-secret
20 changes: 0 additions & 20 deletions .ibm/pipelines/utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -106,26 +106,6 @@ install_crunchy_postgres_k8s_operator() { install_crunchy_postgres_operator "k8s
waitfor_crunchy_postgres_ocp_operator() { waitfor_crunchy_postgres_operator "ocp"; }
waitfor_crunchy_postgres_k8s_operator() { waitfor_crunchy_postgres_operator "k8s"; }

# Installs the OpenShift Serverless Logic Operator (SonataFlow) from OpenShift Marketplace
# Use waitfor_serverless_logic_ocp_operator to wait for the operator to be ready
install_serverless_logic_ocp_operator() {
install_subscription logic-operator-rhel8 openshift-operators alpha logic-operator-rhel8 redhat-operators openshift-marketplace
}

waitfor_serverless_logic_ocp_operator() {
check_operator_status 300 "openshift-operators" "OpenShift Serverless Logic Operator" "Succeeded"
}

# Installs the OpenShift Serverless Operator (Knative) from OpenShift Marketplace
# Use waitfor_serverless_ocp_operator to wait for the operator to be ready
install_serverless_ocp_operator() {
install_subscription serverless-operator openshift-operators stable serverless-operator redhat-operators openshift-marketplace
}

waitfor_serverless_ocp_operator() {
check_operator_status 300 "openshift-operators" "Red Hat OpenShift Serverless" "Succeeded"
}

configure_external_postgres_db() {
local project=$1
local max_attempts=60 # 5 minutes total (60 attempts × 5 seconds)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ orchestrator: null
global:
dynamic:
plugins:
# Disable orchestrator plugins for OSD-GCP - Official release (Backstage 1.42.5)
- package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-orchestrator:bs_1.45.3__5.3.1!red-hat-developer-hub-backstage-plugin-orchestrator"
# Disable orchestrator plugins for OSD-GCP
- package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-orchestrator:bs_1.45.3__5.1.0!red-hat-developer-hub-backstage-plugin-orchestrator"
disabled: true
- package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-orchestrator-backend:bs_1.45.3__8.3.0!red-hat-developer-hub-backstage-plugin-orchestrator-backend"
disabled: true
Expand Down
9 changes: 9 additions & 0 deletions .ibm/pipelines/value_files/diff-values_showcase_AKS.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@ global:
plugins:
- package: ./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-scaffolder-relation-processor-dynamic
disabled: false
# Disable orchestrator plugins for AKS
- package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-orchestrator:bs_1.45.3__5.1.0!red-hat-developer-hub-backstage-plugin-orchestrator"
disabled: true
- package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-orchestrator-backend:bs_1.45.3__8.3.0!red-hat-developer-hub-backstage-plugin-orchestrator-backend"
disabled: true
- package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-scaffolder-backend-module-orchestrator:bs_1.45.3__1.3.1!red-hat-developer-hub-backstage-plugin-scaffolder-backend-module-orchestrator"
disabled: true
- package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-orchestrator-form-widgets:bs_1.45.3__1.2.0!red-hat-developer-hub-backstage-plugin-orchestrator-form-widgets"
disabled: true
upstream:
backstage:
extraEnvVarsSecrets:
Expand Down
9 changes: 9 additions & 0 deletions .ibm/pipelines/value_files/diff-values_showcase_EKS.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,15 @@ global:
plugins:
- package: ./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-scaffolder-relation-processor-dynamic
disabled: false
# Disable orchestrator plugins for EKS
- package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-orchestrator:bs_1.45.3__5.1.0!red-hat-developer-hub-backstage-plugin-orchestrator"
disabled: true
- package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-orchestrator-backend:bs_1.45.3__8.3.0!red-hat-developer-hub-backstage-plugin-orchestrator-backend"
disabled: true
- package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-scaffolder-backend-module-orchestrator:bs_1.45.3__1.3.1!red-hat-developer-hub-backstage-plugin-scaffolder-backend-module-orchestrator"
disabled: true
- package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-orchestrator-form-widgets:bs_1.45.3__1.2.0!red-hat-developer-hub-backstage-plugin-orchestrator-form-widgets"
disabled: true
upstream:
backstage:
extraEnvVarsSecrets:
Expand Down
2 changes: 1 addition & 1 deletion .ibm/pipelines/value_files/diff-values_showcase_GKE.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ global:

# Orchestrator - large OCI plugins causing disk space issues
# Tests skipped on GKE: e2e-tests/playwright/e2e/plugins/orchestrator/*.spec.ts
- package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-orchestrator:bs_1.45.3__5.3.1!red-hat-developer-hub-backstage-plugin-orchestrator"
- package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-orchestrator:bs_1.45.3__5.1.0!red-hat-developer-hub-backstage-plugin-orchestrator"
disabled: true
- package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-orchestrator-backend:bs_1.45.3__8.3.0!red-hat-developer-hub-backstage-plugin-orchestrator-backend"
disabled: true
Expand Down
4 changes: 2 additions & 2 deletions .ibm/pipelines/value_files/diff-values_showcase_OSD-GCP.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ orchestrator: null
global:
dynamic:
plugins:
# Disable orchestrator plugins for OSD-GCP - Official release (Backstage 1.42.5)
- package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-orchestrator:bs_1.45.3__5.3.1!red-hat-developer-hub-backstage-plugin-orchestrator"
# Disable orchestrator plugins for OSD-GCP
- package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-orchestrator:bs_1.45.3__5.1.0!red-hat-developer-hub-backstage-plugin-orchestrator"
disabled: true
- package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-orchestrator-backend:bs_1.45.3__8.3.0!red-hat-developer-hub-backstage-plugin-orchestrator-backend"
disabled: true
Expand Down
2 changes: 1 addition & 1 deletion .ibm/pipelines/value_files/values_showcase-rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ global:
product: cloud
disabled: false

# Enable orchestrator plugins - Official release (Backstage 1.45.3)
# Enable orchestrator plugins - Official release
- package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-orchestrator:bs_1.45.3__5.1.0!red-hat-developer-hub-backstage-plugin-orchestrator"
disabled: false
pluginConfig:
Expand Down
Loading
Loading