Skip to content

Commit d542111

Browse files
syan-tibcosyan-tibco
authored
Releases/202540 (#97)
* 2025 week 40 update * upgrade to 1.6.4 for automation * fix deploy bug * update automation image * update
1 parent d867ceb commit d542111

32 files changed

+339
-45
lines changed

‎charts/provisioner-config-local/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ apiVersion: v2
88
name: provisioner-config-local
99
description: Platform Provisioner local config
1010
type: application
11-
version: "1.10.41"
11+
version: "1.11.3"
1212
appVersion: "2.0.1"
1313
home: https://github.com/TIBCOSoftware/tp-helm-charts
1414
maintainers:

‎charts/provisioner-config-local/recipes/pp-deploy-cp-core-on-prem.yaml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ meta:
3131
GUI_CP_PROXY_NO_PROXY: ""
3232

3333
# CP version see: https://docs.tibco.com/pub/platform-cp/latest/doc/html/Default.htm#Installation/helm-chart-version-matrix.htm
34-
GUI_CP_PLATFORM_BOOTSTRAP_VERSION: 1.10.0
35-
GUI_CP_PLATFORM_BASE_VERSION: 1.10.0
34+
GUI_CP_PLATFORM_BOOTSTRAP_VERSION: 1.11.0
35+
GUI_CP_PLATFORM_BASE_VERSION: 1.11.0
3636

3737
# CP env
3838
GUI_CP_INSTANCE_ID: "cp1"
@@ -236,8 +236,8 @@ meta:
236236
TP_TLS_KEY_HYBRID_PROXY: ${GUI_TP_TLS_KEY_HYBRID_PROXY:-""} # the tls.key for hybrid-proxy ingress
237237

238238
# CP version see: https://docs.tibco.com/pub/platform-cp/latest/doc/html/Default.htm#Installation/helm-chart-version-matrix.htm
239-
CP_PLATFORM_BOOTSTRAP_VERSION: ${GUI_CP_PLATFORM_BOOTSTRAP_VERSION:-1.10.0} # use ^1.0.0 for latest
240-
CP_PLATFORM_BASE_VERSION: ${GUI_CP_PLATFORM_BASE_VERSION:-1.10.0} # use ^1.0.0 for latest
239+
CP_PLATFORM_BOOTSTRAP_VERSION: ${GUI_CP_PLATFORM_BOOTSTRAP_VERSION:-1.11.0} # use ^1.0.0 for latest
240+
CP_PLATFORM_BASE_VERSION: ${GUI_CP_PLATFORM_BASE_VERSION:-1.11.0} # use ^1.0.0 for latest
241241

242242
# flow control
243243
CP_VALIDATE_CLUSTER_RESOURCE: ${GUI_CP_VALIDATE_CLUSTER_RESOURCE:-true}
@@ -258,6 +258,7 @@ meta:
258258
CP_INSTALL_INTEGRATION_BW5CE_UTILITIES: ${GUI_CP_INSTALL_INTEGRATION_BW5CE_UTILITIES:-true} # Env for before 1.8.0
259259
CP_INSTALL_INTEGRATION_FLOGO: ${GUI_CP_INSTALL_INTEGRATION_FLOGO:-true}
260260
CP_INSTALL_INTEGRATION_FLOGO_UTILITIES: ${GUI_CP_INSTALL_INTEGRATION_FLOGO_UTILITIES:-true}
261+
CP_INSTALL_MCP_SERVER: ${TP_AI_DEPLOY_CP_MCP_SERVER:-true}
261262
tools:
262263
yq: "4.40" # this also have the logic to create soft link of yq-4.40 --> yq
263264
preTasks:
@@ -977,6 +978,8 @@ helmCharts:
977978
limits:
978979
cpu: 200m
979980
memory: 200Mi
981+
cpmcpserver:
982+
enabled: ${CP_INSTALL_MCP_SERVER:-true}
980983
tp-cp-core-finops:
981984
finops-service:
982985
finopsservice:

‎charts/provisioner-config-local/recipes/tp-automation-o11y.yaml‎

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ meta:
138138
TP_AUTO_GITHUB_REPO_BRANCH: ${GUI_TP_AUTO_GITHUB_REPO_BRANCH:-"provisioner-config-local-{{ .Chart.Version }}"}
139139

140140
# DP capabilities deployment
141+
TP_AUTO_CREATE_OAUTH_TOKEN: ${GUI_TP_AUTO_CREATE_OAUTH_TOKEN:-true}
141142
TP_AUTO_ACTIVE_USER: ${GUI_TP_AUTO_ACTIVE_USER:-true}
142143
TP_AUTO_ENABLE_DP: ${GUI_TP_AUTO_ENABLE_DP:-true}
143144
TP_AUTO_IS_CREATE_DP: ${GUI_TP_AUTO_ENABLE_DP:-true} # need this as global value
@@ -154,7 +155,7 @@ meta:
154155
TP_AUTO_IS_ENABLE_EMSDM: ${GUI_TP_AUTO_IS_ENABLE_EMSDM:-true}
155156
TP_AUTO_IS_ENABLE_BW6DM: ${GUI_TP_AUTO_IS_ENABLE_BW6DM:-true}
156157
TP_AUTO_ENABLE_O11Y_WIDGET: ${GUI_TP_AUTO_ENABLE_O11Y_WIDGET:-true}
157-
TP_AUTO_ENABLE_E2E_TEST: ${GUI_TP_AUTO_ENABLE_E2E_TEST:-true}
158+
TP_AUTO_ENABLE_E2E_TEST: ${GUI_TP_AUTO_ENABLE_E2E_TEST:-false}
158159

159160
# start app or not
160161
TP_AUTO_START_FLOGO_APP: ${GUI_TP_AUTO_START_FLOGO_APP:-true}
@@ -413,6 +414,39 @@ tasks:
413414
_result=$?
414415
echo "python return code: ${_result}"
415416
exit ${_result}
417+
- condition: ${TP_AUTO_CREATE_OAUTH_TOKEN}
418+
name: create-oauth-token
419+
clusters:
420+
- name: ${TP_CLUSTER_NAME}
421+
script:
422+
ignoreErrors: false
423+
fileName: script.sh
424+
content: |
425+
source "${TP_AUTO_SCRIPT_PY_ENV_FOLDER}/bin/activate"
426+
cd ${TP_AUTO_SCRIPT_FOLDER}
427+
428+
_report_file="${TP_AUTO_REPORT_PATH}/${TP_AUTO_REPORT_YAML_FILE}"
429+
if [[ -f "$_report_file" ]]; then
430+
if [[ "$(yq '.ENV.REPORT_OAUTH_TOKEN' "$_report_file")" == "true" ]]; then
431+
echo "----------------------------------------------------------------"
432+
echo "OAuth Token exists. Exiting..."
433+
echo "----------------------------------------------------------------"
434+
exit 0
435+
else
436+
echo "_report_file: ${_report_file}"
437+
cat "$_report_file"
438+
fi
439+
fi
440+
441+
echo "===== Task Name: create-oauth-token, Running file ${PYTHON_FILE_ENTRY_POINT_O11Y} ====="
442+
if command -v uv >/dev/null 2>&1; then
443+
uv run --active ${PYTHON_FILE_ENTRY_POINT_O11Y}
444+
else
445+
python ${PYTHON_FILE_ENTRY_POINT_O11Y}
446+
fi
447+
_result=$?
448+
echo "python return code: ${_result}"
449+
exit 0
416450
- condition: ${TP_AUTO_ENABLE_DP} # only create DP
417451
name: create-dp
418452
clusters:
@@ -487,7 +521,7 @@ tasks:
487521
488522
export dp_name=${TP_AUTO_K8S_DP_NAME}
489523
export capability="flogo"
490-
export app_name="flogo-auto-1"
524+
export app_name="rest-flogo-1"
491525
_report_file="${TP_AUTO_REPORT_PATH}/${TP_AUTO_REPORT_YAML_FILE}"
492526
if [[ -f "$_report_file" ]]; then
493527
app_status="$(
@@ -532,7 +566,7 @@ tasks:
532566
533567
export dp_name=${TP_AUTO_K8S_DP_NAME}
534568
export capability="bwce"
535-
export app_name="bwce-tt"
569+
export app_name="rest-bwce-1"
536570
_report_file="${TP_AUTO_REPORT_PATH}/${TP_AUTO_REPORT_YAML_FILE}"
537571
if [[ -f "$_report_file" ]]; then
538572
app_status="$(

‎charts/provisioner-config-local/recipes/tp-base-on-prem-https.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ helmCharts:
453453
enabled: true
454454
image:
455455
repository: ghcr.io/tibcosoftware/platform-provisioner/platform-provisioner
456-
tag: 1.6.3-auto-on-prem-jammy
456+
tag: 1.6.5-auto-on-prem-jammy
457457
ports:
458458
http:
459459
enabled: true

‎charts/provisioner-config-local/recipes/tp-base-on-prem.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ helmCharts:
407407
enabled: true
408408
image:
409409
repository: ghcr.io/tibcosoftware/platform-provisioner/platform-provisioner
410-
tag: 1.6.3-auto-on-prem-jammy
410+
tag: 1.6.5-auto-on-prem-jammy
411411
ports:
412412
http:
413413
enabled: true

‎docs/recipes/automation/on-prem/run.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ function main() {
182182
while true; do
183183
if [[ -z $choice ]]; then
184184
echo "Please select an option:"
185-
echo "1. Deploy TP from scratch. (All steps: 2,5,7,3,7,4)"
185+
echo "1. Deploy TP from scratch. (All steps: 2,5,6,3,6,4)"
186186
echo "2. Prepare TP cluster (Ingress, DB, storage, etc.)"
187187
echo "3. Deploy platform-bootstrap and platform-base only"
188188
echo "4. Deploy CP subscription (Admin, sub user, DP, app, etc.)"
@@ -208,7 +208,7 @@ function main() {
208208
echo "Failed to deploy o11y stack."
209209
exit 1
210210
fi
211-
post-deploy-cleanup-resource # 7
211+
post-deploy-cleanup-resource # 6
212212
echo "Wait for 30 seconds before deploying CP..."
213213
sleep 30
214214
deploy-tp # 3
@@ -218,7 +218,7 @@ function main() {
218218
fi
219219
echo "Finish deploy TP in $(($(date +%s) - start_time)) seconds"
220220
post-deploy-adjust-dns # dns adjustment
221-
post-deploy-cleanup-resource # 7
221+
post-deploy-cleanup-resource # 6
222222

223223
echo "Wait for 30 seconds before deploying CP subscription..."
224224
sleep 30

‎docs/recipes/automation/tp-setup/bootstrap/CHANGELOG.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
## [10/04/2025 22:17]
2+
### Added
3+
- Support for creating OAuth Token and saving it to kubernetes secret.
4+
### Fixed
5+
- Link k8s dataplane activation url to global.
6+
7+
## [09/27/2025 21:30]
8+
### Fixed
9+
- Fixed deploy flogo issue after flogo UI is changed
10+
- Do not cache UI for One-Click Setup CP index.html file
11+
- Change "Automation Case" dropdown list will reset input file field and filename field to default value
12+
### Changed
13+
- Will switch to global dataplane configuration, remove config dataplane level o11y
14+
- Rename "flogo-auto-1" to "rest-flogo-1" for flogo app name in automation script
15+
- Rename "bwce-tt" to "rest-bwce-1" for bwce app name in automation script
16+
117
## [09/22/2025 10:06]
218
### Fixed
319
- Fixed config dataplane's activation url issue.

‎docs/recipes/automation/tp-setup/bootstrap/README.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ python --version
3838
| Category | Supported Features |
3939
|:--------------------------------------------|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
4040
| **Display Current Environment Information** | ✅ Show Control Plane `platform-bootstrap` version<br>✅ Show Control Plane `platform-base` version<br>✅ Display Mail Server URL<br>✅ Display CP Admin Server URL, Admin Email, and Password<br>✅ Display CP Server URL, User Email, and Password<br>✅ Display Elastic, Kibana, and Prometheus URLs and Credentials |
41+
| **Create a OAuth Token** | ✅ Support for creating OAuth Token and saving it to kubernetes secret.<br>✅ If the token only exists in the Kubernetes Secret or only in the UI, it will be deleted and a new one will be created. The token must exist in both places at the same time. |
4142
| **Create a New Subscription** | ✅ Provision a new subscription using the User Email by an Admin<br>✅ Activate the user via the `maildev` server<br>✅ Set the user's password and complete the login process |
4243
| **Configure Observability Widget** | ✅ Automatically add widget cards for Kubernetes or Control Tower |
4344
| **Configure Global Observability** | ✅ Automatically create global Logs, Metrics, and Traces<br>✅ Support using system configuration for Metrics and Traces<br>✅ Support for config activation url |
@@ -201,3 +202,7 @@ python page_dp.py
201202
* Go to CP installation folder
202203
* Copy certificate key to 01-tp-on-prem.yaml from [TP Token](https://docs.google.com/document/d/1f39d0_L6iRpEPjJggYFJrL3oVAtDyPdVbOnjmzU7E0E/edit?pli=1&tab=t.l6dihjhx60qc#heading=h.8ir76m4dmdxu)
203204
* Then run `./run.sh 2`
205+
5. Get stored OAuth token from kubernetes secret
206+
```shell
207+
kubectl get secret auto-token -n automation -o jsonpath="{.data['auto-token']}" | base64 --decode
208+
```

‎docs/recipes/automation/tp-setup/bootstrap/case/create_global_config.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
po_dp_config = PageObjectDataPlaneConfiguration(page)
2121
# config global dataplane
2222
po_dp_config.o11y_config_dataplane_resource(ENV.TP_AUTO_DP_NAME_GLOBAL)
23+
po_dp_config.o11y_config_activation(ENV.TP_AUTO_DP_NAME_GLOBAL)
2324

2425
po_auth.logout()
2526
except Exception as e:

‎docs/recipes/automation/tp-setup/bootstrap/case/k8s_config_dp_o11y.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
po_dp.goto_dataplane(ENV.TP_AUTO_K8S_DP_NAME)
2222
po_dp_config.goto_dataplane_config()
2323
po_dp_config.o11y_config_dataplane_resource(ENV.TP_AUTO_K8S_DP_NAME)
24+
po_dp_config.o11y_config_activation(ENV.TP_AUTO_K8S_DP_NAME)
2425

2526
po_auth.logout()
2627
except Exception as e:

0 commit comments

Comments
 (0)