@@ -306,7 +306,7 @@ delete_namespace() {
306306configure_external_postgres_db () {
307307 local project=$1
308308 oc apply -f " ${DIR} /resources/postgres-db/postgres.yaml" --namespace=" ${NAME_SPACE_POSTGRES_DB} "
309-
309+
310310 echo " Waiting for PostgreSQL cluster to be ready..."
311311 # Wait for the PostgreSQL cluster to be created and ready
312312 timeout 600 bash -c '
@@ -320,10 +320,10 @@ configure_external_postgres_db() {
320320 sleep 10
321321 done
322322 ' || echo " Warning: Timeout waiting for PostgreSQL cluster, continuing anyway..."
323-
323+
324324 # Additional wait for pods to be fully running
325325 sleep 10
326-
326+
327327 oc get secret postgress-external-db-cluster-cert -n " ${NAME_SPACE_POSTGRES_DB} " -o jsonpath=' {.data.ca\.crt}' | base64 --decode > postgres-ca
328328 oc get secret postgress-external-db-cluster-cert -n " ${NAME_SPACE_POSTGRES_DB} " -o jsonpath=' {.data.tls\.crt}' | base64 --decode > postgres-tls-crt
329329 oc get secret postgress-external-db-cluster-cert -n " ${NAME_SPACE_POSTGRES_DB} " -o jsonpath=' {.data.tls\.key}' | base64 --decode > postgres-tsl-key
@@ -700,17 +700,12 @@ delete_tekton_pipelines() {
700700
701701cluster_setup_ocp_helm () {
702702 install_pipelines_operator
703- install_acm_ocp_operator
704703 install_crunchy_postgres_ocp_operator
705- # install_orchestrator_infra_chart
706704}
707705
708706cluster_setup_ocp_operator () {
709707 install_pipelines_operator
710- install_acm_ocp_operator
711708 install_crunchy_postgres_ocp_operator
712- # install_serverless_ocp_operator
713- # install_serverless_logic_ocp_operator
714709}
715710
716711cluster_setup_k8s_operator () {
@@ -794,7 +789,7 @@ base_deployment() {
794789 echo " Deploying image from repository: ${QUAY_REPO} , TAG_NAME: ${TAG_NAME} , in NAME_SPACE: ${NAME_SPACE} "
795790 perform_helm_install " ${RELEASE_NAME} " " ${NAME_SPACE} " " ${HELM_CHART_VALUE_FILE_NAME} "
796791
797- # deploy_orchestrator_workflows "${NAME_SPACE}"
792+ # deploy_orchestrator_workflows "${NAME_SPACE}"
798793}
799794
800795rbac_deployment () {
@@ -809,17 +804,17 @@ rbac_deployment() {
809804 perform_helm_install " ${RELEASE_NAME_RBAC} " " ${NAME_SPACE_RBAC} " " ${HELM_CHART_RBAC_VALUE_FILE_NAME} "
810805
811806 # NOTE: This is a workaround to allow the sonataflow platform to connect to the external postgres db using ssl.
812- # until [[ $(oc get jobs -n "${NAME_SPACE_RBAC}" 2> /dev/null | grep "${RELEASE_NAME_RBAC}-create-sonataflow-database" | wc -l) -eq 1 ]]; do
813- # echo "Waiting for sf db creation job to be created. Retrying in 5 seconds..."
814- # sleep 5
815- # done
816- # oc wait --for=condition=complete job/"${RELEASE_NAME_RBAC}-create-sonataflow-database" -n "${NAME_SPACE_RBAC}" --timeout=3m
817- # oc -n "${NAME_SPACE_RBAC}" patch sfp sonataflow-platform --type=merge \
818- # -p '{"spec":{"services":{"jobService":{"podTemplate":{"container":{"env":[{"name":"QUARKUS_DATASOURCE_REACTIVE_URL","value":"postgresql://postgress-external-db-primary.postgress-external-db.svc.cluster.local:5432/sonataflow?search_path=jobs-service&sslmode=require&ssl=true&trustAll=true"},{"name":"QUARKUS_DATASOURCE_REACTIVE_SSL_MODE","value":"require"},{"name":"QUARKUS_DATASOURCE_REACTIVE_TRUST_ALL","value":"true"}]}}}}}}'
819- # oc rollout restart deployment/sonataflow-platform-jobs-service -n "${NAME_SPACE_RBAC}"
807+ # until [[ $(oc get jobs -n "${NAME_SPACE_RBAC}" 2> /dev/null | grep "${RELEASE_NAME_RBAC}-create-sonataflow-database" | wc -l) -eq 1 ]]; do
808+ # echo "Waiting for sf db creation job to be created. Retrying in 5 seconds..."
809+ # sleep 5
810+ # done
811+ # oc wait --for=condition=complete job/"${RELEASE_NAME_RBAC}-create-sonataflow-database" -n "${NAME_SPACE_RBAC}" --timeout=3m
812+ # oc -n "${NAME_SPACE_RBAC}" patch sfp sonataflow-platform --type=merge \
813+ # -p '{"spec":{"services":{"jobService":{"podTemplate":{"container":{"env":[{"name":"QUARKUS_DATASOURCE_REACTIVE_URL","value":"postgresql://postgress-external-db-primary.postgress-external-db.svc.cluster.local:5432/sonataflow?search_path=jobs-service&sslmode=require&ssl=true&trustAll=true"},{"name":"QUARKUS_DATASOURCE_REACTIVE_SSL_MODE","value":"require"},{"name":"QUARKUS_DATASOURCE_REACTIVE_TRUST_ALL","value":"true"}]}}}}}}'
814+ # oc rollout restart deployment/sonataflow-platform-jobs-service -n "${NAME_SPACE_RBAC}"
820815
821816 # initiate orchestrator workflows deployment
822- # deploy_orchestrator_workflows "${NAME_SPACE_RBAC}"
817+ # deploy_orchestrator_workflows "${NAME_SPACE_RBAC}"
823818}
824819
825820initiate_deployments () {
@@ -929,7 +924,7 @@ initiate_sanity_plugin_checks_deployment() {
929924 -f " /tmp/${HELM_CHART_SANITY_PLUGINS_MERGED_VALUE_FILE_NAME} " \
930925 --set global.clusterRouterBase=" ${K8S_CLUSTER_ROUTER_BASE} " \
931926 $( get_image_helm_set_params)
932- # --set orchestrator.enabled=true
927+ # --set orchestrator.enabled=true
933928}
934929
935930check_and_test () {
0 commit comments