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 @@ -20,8 +20,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"

configure_namespace "${NAME_SPACE_RBAC}"
create_conditional_policies_operator /tmp/conditional-policies.yaml
Expand All @@ -31,8 +33,10 @@ initiate_operator_deployments() {
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 @@ -115,5 +119,6 @@ handle_ocp_operator() {
check_and_test "${RELEASE_NAME}" "${NAME_SPACE}" "${PW_PROJECT_SHOWCASE_OPERATOR}" "${url}"
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
}
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.9"
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.9"
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.9"
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.9"
containers:
- install-dynamic-plugins
secrets:
- name: rhdh-secrets
- name: redis-secret
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
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ import { JOB_NAME_PATTERNS } from "../../../utils/constants";

test.describe.skip("Orchestrator greeting workflow tests", () => {
test.skip(() => skipIfJobName(JOB_NAME_PATTERNS.OSD_GCP)); // skipping orchestrator tests on OSD-GCP due to infra not being installed
test.skip(() => skipIfJobName(JOB_NAME_PATTERNS.GKE)); // skipping orchestrator tests on GKE - plugins disabled to save disk space
test.skip(() => skipIfJobName(JOB_NAME_PATTERNS.GKE)); // skipping orchestrator tests on GKE - plugins disabled
test.skip(() => skipIfJobName(JOB_NAME_PATTERNS.AKS)); // skipping orchestrator tests on AKS - plugins disabled
test.skip(() => skipIfJobName(JOB_NAME_PATTERNS.EKS)); // skipping orchestrator tests on EKS - plugins disabled
// TODO: https://issues.redhat.com/browse/RHDHBUGS-2184 fix orchestrator tests on Operator deployment
test.fixme(() => skipIfJobName(JOB_NAME_PATTERNS.OPERATOR));

let uiHelper: UIhelper;
let common: Common;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ import { JOB_NAME_PATTERNS } from "../../../utils/constants";

test.describe("Orchestrator Workflow Runs tests", () => {
test.skip(() => skipIfJobName(JOB_NAME_PATTERNS.OSD_GCP)); // skipping orchestrator tests on OSD-GCP due to infra not being installed
test.skip(() => skipIfJobName(JOB_NAME_PATTERNS.GKE)); // skipping orchestrator tests on GKE - plugins disabled to save disk space
test.skip(() => skipIfJobName(JOB_NAME_PATTERNS.GKE)); // skipping orchestrator tests on GKE - plugins disabled
test.skip(() => skipIfJobName(JOB_NAME_PATTERNS.AKS)); // skipping orchestrator tests on AKS - plugins disabled
test.skip(() => skipIfJobName(JOB_NAME_PATTERNS.EKS)); // skipping orchestrator tests on EKS - plugins disabled
// TODO: https://issues.redhat.com/browse/RHDHBUGS-2184 fix orchestrator tests on Operator deployment
test.fixme(() => skipIfJobName(JOB_NAME_PATTERNS.OPERATOR));

let uiHelper: UIhelper;
let common: Common;
Expand Down
Loading