Skip to content

Commit 66cd4ce

Browse files
committed
Better utilize the round robin deployment patterns
Signed-off-by: Patrick Knight <pknight@redhat.com>
1 parent 9a9147a commit 66cd4ce

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

config-plugins.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ declare -A CATEGORY_SETUP_FUNCTIONS=(
4646
[TEKTON]="deploy_tekon deploy_pipelines apply_tekton_labels"
4747
[OCM]="deploy_acm config_secrets_for_ocm_plugins deploy_multicluster_hub apply_ocm_labels"
4848
[3SCALE]="copy_3scale_files deploy_3scale deploy_minio deploy_3scale_resources"
49-
[NEXUS]="deploy_nexus deploy_nexus_resources config_secrets_for_nexus_plugins apply_nexus_labels populate_nexus_demo_data register_nexus_demo_catalog_entities"
49+
[NEXUS]="deploy_nexus wait_for_nexus_operator_and_deploy_instance wait_for_nexus_instance config_secrets_for_nexus_plugins apply_nexus_labels populate_nexus_demo_data register_nexus_demo_catalog_entities"
5050
[KUBERNETES]="config_secrets_for_kubernetes_plugins"
5151
)
5252

scripts/config-nexus-plugin.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ deploy_nexus() {
1212
oc apply -f $PWD/resources/operators/nexus-subscription.yaml --namespace=${NAMESPACE}
1313
}
1414

15-
deploy_nexus_resources() {
15+
wait_for_nexus_operator_and_deploy_instance() {
1616
# Wait for operator to be ready
1717
echo "Waiting for Nexus operator to become ready..."
1818
SECONDS=0
@@ -33,10 +33,12 @@ deploy_nexus_resources() {
3333
sleep "$INTERVAL"
3434
done
3535

36-
# Deploy Nexus Repository Manager instance
36+
# Deploy Nexus Repository Manager instance (immediately after operator is ready)
3737
echo "Deploying Nexus Repository Manager instance..."
3838
oc apply -f $PWD/resources/nexus/nexus-repo.yaml --namespace=${NAMESPACE}
39+
}
3940

41+
wait_for_nexus_instance() {
4042
# Wait for Nexus instance to be ready
4143
echo "Waiting for Nexus instance to be ready..."
4244
SECONDS=0
@@ -232,7 +234,8 @@ main() {
232234
echo "=============================================="
233235

234236
deploy_nexus
235-
deploy_nexus_resources
237+
wait_for_nexus_operator_and_deploy_instance
238+
wait_for_nexus_instance
236239
config_secrets_for_nexus_plugins
237240
apply_nexus_labels
238241
populate_nexus_demo_data

0 commit comments

Comments
 (0)