Skip to content

Commit f91765e

Browse files
cloudnativedatacloudnativedata
committed
Fixing for CF
1 parent f01a60c commit f91765e

File tree

6 files changed

+60
-20
lines changed

6 files changed

+60
-20
lines changed

‎deployments/cloud/cloudFoundry/apps/jdbc-sql-console-app/jdbc-sql-console-app.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
applications:
22
- name: jdbc-sql-console-app
3-
memory: 14000M
3+
memory: 1400M
44
log-rate-limit-per-second: -1
55
services:
66
- retail-sql

deployments/cloud/cloudFoundry/apps/retail-analytics-app/retail-analytics-app.yaml renamed to deployments/cloud/cloudFoundry/apps/retail-analytics-app/retail-analytics-app-mysql.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
applications:
22
- name: retail-analytics-app
3-
memory: 14000M
3+
memory: 1400M
44
log-rate-limit-per-second: -1
55
services:
66
- retail-rabbitmq

‎deployments/cloud/cloudFoundry/apps/retail-cache-sink-app/retail-cache-sink-app.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ applications:
44
log-rate-limit-per-second: -1
55
services:
66
- retail-rabbitmq
7-
- retail-gf-redis
7+
- retail-gemfire
88
env:
99
JBP_CONFIG_OPEN_JDK_JRE: '{ jre: { version: 17.+}}'
1010
SPRING_PROFILES_ACTIVE: 'gemfire'

‎deployments/cloud/cloudFoundry/apps/retail-source-app/retail-source-app.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
applications:
22
- name: retail-source-app
3-
memory: 14000M
3+
memory: 1400M
44
log-rate-limit-per-second: -1
55
services:
66
- retail-rabbitmq

‎deployments/cloud/cloudFoundry/apps/retail-web-app/retail-web-app.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
applications:
22
- name: retail-cache-sink-app
3-
memory: 14000M
3+
memory: 1400M
44
log-rate-limit-per-second: -1
55
services:
6-
- retail-gf-redis
6+
- retail-gemfire
77
env:
8+
spring.profiles.active: gemfire
89
JBP_CONFIG_OPEN_JDK_JRE: '{ jre: { version: 17.+}}'
910
retail.customer.id: 'nyla'

‎deployments/cloud/cloudFoundry/scripts/cf-setup.sh‎

Lines changed: 53 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,36 @@
1111

1212
cf marketplace
1313

14-
## GemFire for Redis
14+
## GemFire
1515

1616
#small
17-
cf create-service p-cloudcache extra-small retail-gf-redis -c '{"gemfire_for_redis_enabled":"true","gemfire_for_redis_redundant_copies":2,"gemfire_for_redis_region_name": "GF_REDIS"}' -t redis
17+
cf create-service p-cloudcache extra-small retail-gemfire -t gemfire
1818

1919
## SQL
2020

21-
cf create-service postgres on-demand-postgres-small retail-sql
21+
cf create-service postgres on-demand-postgres-db retail-sql
22+
23+
cf create-service p.mysql db-small retail-scdf-sql
2224

2325

2426
## RabbitMQ
2527

26-
cf create-service p.rabbitmq single-node retail-rabbitmq
28+
cf create-service p.rabbitmq on-demand-plan retail-rabbitmq
2729

2830
#cf create-service p.rabbitmq single-node retail-rabbitmq -c '{ "plugins": { "rabbitmq_stream": true, "rabbitmq_stream_management": true } }'
2931

3032
#cf update-service retail-rabbitmq -c '{ "plugins": { "rabbitmq_stream": true, "rabbitmq_stream_management": true } }'
3133

34+
# Prometheus
35+
36+
cf push prometheus --docker-image prom/prometheus --var PORT=9090
37+
# ----------------
38+
# SCDF DataFlow
39+
40+
cf create-service p-dataflow standard scdf
41+
42+
-c '{"services": ["retail-scdf-sql","retail-rabbitmq"] }'
43+
3244
# -----------------------------
3345
# WAIT FOR SERVICE to be available
3446

@@ -52,41 +64,62 @@ do
5264
done
5365

5466

55-
gemfire_status=`cf service retail-gf-redis | grep status:`
67+
gemfire_status=`cf service retail-gemfire | grep status:`
5668
echo "Waiting for gemfire, current status:" $gemfire_status
5769
while [[ "$gemfire_status" != *"create succeeded"* ]]
5870
do
5971
echo "Waiting for gemfire, current status:" $gemfire_status
60-
gemfire_status=`cf service retail-gf-redis | grep status:`
72+
gemfire_status=`cf service retail-gemfire | grep status:`
73+
sleep 1
74+
done
75+
76+
77+
mysql_status=`cf service retail-scdf-sql | grep status:`
78+
echo "Waiting for retail-scdf-sql, current status:" $mysql_status
79+
while [[ "$mysql_status" != *"create succeeded"* ]]
80+
do
81+
echo "Waiting for retail-scdf-sql, current status:" $mysql_status
82+
mysql_status=`cf service retail-scdf-sql | grep status:`
6183
sleep 1
6284
done
6385

6486

87+
data_flow_status=`cf service data-flow | grep status:`
88+
echo "Waiting for data-flow, current status:" $data-flow_status
89+
while [[ "$data-flow_status" != *"create succeeded"* ]]
90+
do
91+
echo "Waiting for retail-scdf-sql, current status:" $data-flow_status
92+
data_flow_status=`cf service data-flow | grep status:`
93+
sleep 1
94+
done
95+
96+
97+
6598
#--------------------
6699
# Push Applications
67-
cf push retail-cache-sink-app -f deployments/cloud/cloudFoundry/apps/retail-cache-sink-app/retail-cache-sink-app.yaml -p applications/retail-cache-sink-app/target/retail-cache-sink-app-0.0.1-SNAPSHOT.jar
100+
cf push retail-cache-sink-app -f deployments/cloud/cloudFoundry/apps/retail-cache-sink-app/retail-cache-sink-app.yaml -p applications/retail-cache-sink-app/target/retail-cache-sink-app-0.1.2-SNAPSHOT.jar
68101

69102
# retail-source-app
70-
cf push retail-source-app -f deployments/cloud/cloudFoundry/apps/retail-source-app/retail-source-app.yaml -p applications/retail-source-app/target/retail-source-app-0.0.1-SNAPSHOT.jar
103+
cf push retail-source-app -f deployments/cloud/cloudFoundry/apps/retail-source-app/retail-source-app.yaml -p applications/retail-source-app/target/retail-source-app-0.0.2-SNAPSHOT.jar
71104

72105

73106
# retail-web-app
74-
cf push retail-web-app -f deployments/cloud/cloudFoundry/apps/retail-web-app/retail-web-app.yaml -p applications/retail-web-app/target/retail-web-app-0.0.1-SNAPSHOT.jar
107+
cf push retail-web-app -f deployments/cloud/cloudFoundry/apps/retail-web-app/retail-web-app.yaml -p applications/retail-web-app/target/retail-web-app-0.1.0-SNAPSHOT.jar
75108

76109

77110
# retail-analytics-app
78-
cf push retail-analytics-app -f deployments/cloud/cloudFoundry/apps/retail-analytics-app/retail-analytics-app.yaml -p applications/retail-analytics-app/target/retail-analytics-app-0.0.3-SNAPSHOT.jar
111+
cf push retail-analytics-app -f deployments/cloud/cloudFoundry/apps/retail-analytics-app/retail-analytics-app-postgres.yaml -p applications/retail-analytics-app/target/retail-analytics-app-0.0.3-SNAPSHOT.jar
79112

80113

81114
# jdbc-sql-console-app
82-
cf push jdbc-sql-console-app -f deployments/cloud/cloudFoundry/apps/jdbc-sql-console-app/jdbc-sql-console-app.yaml -p applications/jdbc-sql-console-app/target/jdbc-sql-console-app-0.0.1-SNAPSHOT.jar
115+
cf push jdbc-sql-console-app -f deployments/cloud/cloudFoundry/apps/jdbc-sql-console-app/jdbc-sql-console-app.yaml -p applications/jdbc-sql-console-app/target/jdbc-sql-console-app-0.0.2-SNAPSHOT.jar
83116

84117
#-------------------
85118
# Create a service key GemFire
86-
cf create-service-key retail-gf-redis retail-gf-redis-key
119+
cf create-service-key retail-gemfire retail-gemfire-key
87120

88121
# Inspect the service key:
89-
cf service-key retail-gf-redis retail-gf-redis-key
122+
cf service-key retail-gemfire retail-gemfire-key
90123

91124

92125
#-------------------
@@ -98,8 +131,14 @@ cf service-key retail-rabbitmq retail-rabbitmq-key
98131

99132

100133
#-------------------
101-
# Create a service key MySQL
134+
# Create a service key SQL
102135
cf create-service-key retail-sql retail-sql-key
103136

104137
# Inspect the service key:
105138
cf service-key retail-sql retail-sql-key
139+
140+
141+
./deployments/cloud/cloudFoundry/apps/gemfire-gideon-console/cf-push.sh
142+
143+
144+

0 commit comments

Comments
 (0)