Skip to content

Commit c52f4bb

Browse files
syan-tibcosyan-tibco
authored
2025 week 42 update (#99)
* 2025 week 42 update * update automation * fix lint test issue
1 parent d542111 commit c52f4bb

File tree

11 files changed

+135
-31
lines changed

11 files changed

+135
-31
lines changed

‎.github/workflows/lint-test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
- uses: actions/setup-python@v5
2323
with:
24-
python-version: '3.x'
24+
python-version: '3.13' # 3.14 will not work
2525
check-latest: true
2626

2727
- name: Set up chart-testing

‎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.11.3"
11+
version: "1.11.8"
1212
appVersion: "2.0.1"
1313
home: https://github.com/TIBCOSoftware/tp-helm-charts
1414
maintainers:

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

Lines changed: 68 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,20 @@ groups:
6464
* MailDev address: [https://mail.localhost.dataplanes.pro](https://mail.localhost.dataplanes.pro)
6565
You can then follow the admin E-mail to create the admin user.
6666
---
67-
- title: "Flow control"
67+
- title: "CP AI MCP Servers"
6868
index: 10
69+
description: |
70+
## CP AI MCP Servers specific configurations.
71+
* There are total 5 MCP servers in CP.
72+
* CP MCP Server
73+
* K8S MCP Server
74+
* O11Y MCP Server
75+
* FLOGO MCP Server
76+
* BWCE MCP Server
77+
* By default all MCP servers are disabled.
78+
---
79+
- title: "Flow control"
80+
index: 11
6981
description: |
7082
## Change the installation flow control options.
7183
@@ -493,105 +505,142 @@ options:
493505
description: |
494506
The Graph skip sent folder. The default value is false.
495507
496-
# groupIndex: 10 Flow control
497-
- name: "Validate Cluster Resource"
508+
# group: 10 CP AI MCP Servers
509+
- name: "CP AI MCP Server"
510+
groupIndex: 10
511+
type: boolean
512+
guiType: checkbox
513+
reference: "meta.guiEnv.GUI_TP_AI_DEPLOY_CP_MCP_SERVER"
514+
description: |
515+
The CP AI MCP Server. Default value is false. Select this checkbox to enable the CP AI MCP server.
516+
- name: "CP AI MCP k8s"
517+
groupIndex: 10
518+
type: boolean
519+
guiType: checkbox
520+
reference: "meta.guiEnv.GUI_TP_AI_DEPLOY_K8S_MCP_SERVER"
521+
description: |
522+
The CP AI MCP k8s. Default value is false. Select this checkbox to enable the CP AI k8s MCP server.
523+
- name: "CP AI MCP o11y"
524+
groupIndex: 10
525+
type: boolean
526+
guiType: checkbox
527+
reference: "meta.guiEnv.GUI_TP_AI_DEPLOY_O11Y_MCP_SERVER"
528+
description: |
529+
The CP AI MCP o11y. Default value is false. Select this checkbox to enable the CP AI o11y MCP server.
530+
- name: "CP AI MCP BW"
531+
groupIndex: 10
532+
type: boolean
533+
guiType: checkbox
534+
reference: "meta.guiEnv.GUI_TP_AI_DEPLOY_BW_MCP_SERVER"
535+
description: |
536+
The CP AI MCP BW. Default value is false. Select this checkbox to enable the CP AI BW MCP server.
537+
- name: "CP AI MCP FLOGO"
498538
groupIndex: 10
499539
type: boolean
500540
guiType: checkbox
541+
reference: "meta.guiEnv.GUI_TP_AI_DEPLOY_FLOGO_MCP_SERVER"
542+
description: |
543+
The CP AI MCP FLOGO. Default value is false. Select this checkbox to enable the CP AI FLOGO MCP server.
544+
545+
# groupIndex: 11 Flow control
546+
- name: "Validate Cluster Resource"
547+
groupIndex: 11
548+
type: boolean
549+
guiType: checkbox
501550
reference: "meta.guiEnv.GUI_CP_VALIDATE_CLUSTER_RESOURCE"
502551
description: |
503552
Before deploying the CP, set ture to validate that all resources are properly configured.
504553
- name: "Create CP namespace"
505-
groupIndex: 10
554+
groupIndex: 11
506555
type: boolean
507556
guiType: checkbox
508557
reference: "meta.guiEnv.GUI_CP_CREATE_NAMESPACE"
509558
description: |
510559
Create the CP namespace, service account, network policy, DB secret and certificate secret
511560
- name: "Install MailDev"
512-
groupIndex: 10
561+
groupIndex: 11
513562
type: boolean
514563
guiType: checkbox
515564
reference: "meta.guiEnv.GUI_CP_INSTALL_MAILDEV"
516565
description: "Install maildev for testing email"
517566
- name: "Install MailDev Ingress"
518-
groupIndex: 10
567+
groupIndex: 11
519568
type: boolean
520569
guiType: checkbox
521570
reference: "meta.guiEnv.GUI_CP_INSTALL_MAILDEV_INGRESS"
522571
description: "Install maildev ingress for testing email"
523572
- name: "Install platform-bootstrap"
524-
groupIndex: 10
573+
groupIndex: 11
525574
type: boolean
526575
guiType: checkbox
527576
reference: "meta.guiEnv.GUI_CP_INSTALL_PLATFORM_BOOTSTRAP"
528577
description: "Install platform-bootstrap"
529578
- name: "Install platform-base"
530-
groupIndex: 10
579+
groupIndex: 11
531580
type: boolean
532581
guiType: checkbox
533582
reference: "meta.guiEnv.GUI_CP_INSTALL_PLATFORM_BASE"
534583
description: "Install platform-base"
535584
- name: "Install recipes"
536-
groupIndex: 10
585+
groupIndex: 11
537586
type: boolean
538587
guiType: checkbox
539588
reference: "meta.guiEnv.GUI_CP_INSTALL_RECIPES"
540589
description: ""
541590
- name: "Install integration"
542-
groupIndex: 10
591+
groupIndex: 11
543592
type: boolean
544593
guiType: checkbox
545594
reference: "meta.guiEnv.GUI_CP_INSTALL_INTEGRATION"
546595
description: ""
547596
- name: "Install integration BW"
548-
groupIndex: 10
597+
groupIndex: 11
549598
type: boolean
550599
guiType: checkbox
551600
reference: "meta.guiEnv.GUI_CP_INSTALL_INTEGRATION_BW"
552601
description: "New values for 1.8.0 and later"
553602
- name: "Install integration BWCE utilities"
554-
groupIndex: 10
603+
groupIndex: 11
555604
type: boolean
556605
guiType: checkbox
557606
reference: "meta.guiEnv.GUI_CP_INSTALL_INTEGRATION_BWCE_UTILITIES"
558607
- name: "Install integration BW5CE utilities"
559-
groupIndex: 10
608+
groupIndex: 11
560609
type: boolean
561610
guiType: checkbox
562611
reference: "meta.guiEnv.GUI_CP_INSTALL_INTEGRATION_BW5CE_UTILITIES"
563612
- name: "Install integration Flogo"
564-
groupIndex: 10
613+
groupIndex: 11
565614
type: boolean
566615
guiType: checkbox
567616
reference: "meta.guiEnv.GUI_CP_INSTALL_INTEGRATION_FLOGO"
568617
description: ""
569618
- name: "Install integration Flogo utilities"
570-
groupIndex: 10
619+
groupIndex: 11
571620
type: boolean
572621
guiType: checkbox
573622
reference: "meta.guiEnv.GUI_CP_INSTALL_INTEGRATION_FLOGO_UTILITIES"
574623
description: ""
575624
- name: "Install tibcohub-contrib"
576-
groupIndex: 10
625+
groupIndex: 11
577626
type: boolean
578627
guiType: checkbox
579628
reference: "meta.guiEnv.GUI_CP_INSTALL_TIBCOHUB_CONTRIB"
580629
description: ""
581630
- name: "Install msg-contrib"
582-
groupIndex: 10
631+
groupIndex: 11
583632
type: boolean
584633
guiType: checkbox
585634
reference: "meta.guiEnv.GUI_CP_INSTALL_MSG_CONTRIB"
586635
description: ""
587636
- name: "Install hawk"
588-
groupIndex: 10
637+
groupIndex: 11
589638
type: boolean
590639
guiType: checkbox
591640
reference: "meta.guiEnv.GUI_CP_INSTALL_HAWK"
592641
description: ""
593642
- name: "Enable debug log"
594-
groupIndex: 10
643+
groupIndex: 11
595644
type: boolean
596645
guiType: checkbox
597646
reference: "meta.guiEnv.GUI_PIPELINE_LOG_DEBUG"

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

Lines changed: 50 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,13 @@ meta:
4545
GUI_CP_GLOBAL_ENABLE_RESOURCE_CONSTRAINTS: true
4646
GUI_CP_GLOBAL_USE_SINGLE_NAMESPACE: true
4747

48+
# CP AI MCP servers
49+
GUI_TP_AI_DEPLOY_CP_MCP_SERVER: false
50+
GUI_TP_AI_DEPLOY_K8S_MCP_SERVER: false
51+
GUI_TP_AI_DEPLOY_O11Y_MCP_SERVER: false
52+
GUI_TP_AI_DEPLOY_BW_MCP_SERVER: false
53+
GUI_TP_AI_DEPLOY_FLOGO_MCP_SERVER: false
54+
4855
# network policy
4956
GUI_TP_CREATE_NETWORK_POLICIES: false
5057

@@ -239,6 +246,13 @@ meta:
239246
CP_PLATFORM_BOOTSTRAP_VERSION: ${GUI_CP_PLATFORM_BOOTSTRAP_VERSION:-1.11.0} # use ^1.0.0 for latest
240247
CP_PLATFORM_BASE_VERSION: ${GUI_CP_PLATFORM_BASE_VERSION:-1.11.0} # use ^1.0.0 for latest
241248

249+
# CP AI MCP servers
250+
CP_ENABLE_AI_MCP: ${GUI_TP_AI_DEPLOY_CP_MCP_SERVER:-false}
251+
CP_ENABLE_K8S: ${GUI_TP_AI_DEPLOY_K8S_MCP_SERVER:-false}
252+
CP_ENABLE_AI_O11Y_MCP: ${GUI_TP_AI_DEPLOY_O11Y_MCP_SERVER:-false}
253+
CP_ENABLE_AI_BW_MCP: ${GUI_TP_AI_DEPLOY_BW_MCP_SERVER:-false}
254+
CP_ENABLE_AI_FLOGO_MCP: ${GUI_TP_AI_DEPLOY_FLOGO_MCP_SERVER:-false}
255+
242256
# flow control
243257
CP_VALIDATE_CLUSTER_RESOURCE: ${GUI_CP_VALIDATE_CLUSTER_RESOURCE:-true}
244258
CP_CREATE_NAMESPACE: ${GUI_CP_CREATE_NAMESPACE:-true}
@@ -258,7 +272,6 @@ meta:
258272
CP_INSTALL_INTEGRATION_BW5CE_UTILITIES: ${GUI_CP_INSTALL_INTEGRATION_BW5CE_UTILITIES:-true} # Env for before 1.8.0
259273
CP_INSTALL_INTEGRATION_FLOGO: ${GUI_CP_INSTALL_INTEGRATION_FLOGO:-true}
260274
CP_INSTALL_INTEGRATION_FLOGO_UTILITIES: ${GUI_CP_INSTALL_INTEGRATION_FLOGO_UTILITIES:-true}
261-
CP_INSTALL_MCP_SERVER: ${TP_AI_DEPLOY_CP_MCP_SERVER:-true}
262275
tools:
263276
yq: "4.40" # this also have the logic to create soft link of yq-4.40 --> yq
264277
preTasks:
@@ -850,6 +863,16 @@ helmCharts:
850863
enabled: ${CP_INSTALL_HAWK}
851864
tp-cp-recipes:
852865
enabled: ${CP_INSTALL_RECIPES}
866+
tp-cp-o11y:
867+
o11ymcpserver:
868+
enabled: ${CP_ENABLE_AI_O11Y_MCP}
869+
resources:
870+
requests:
871+
cpu: 100m
872+
memory: 256Mi
873+
limits:
874+
cpu: 200m
875+
memory: 512Mi
853876
tp-cp-integration:
854877
enabled: ${CP_INSTALL_INTEGRATION}
855878
tp-cp-integration-common:
@@ -873,6 +896,15 @@ helmCharts:
873896
limits:
874897
cpu: 200m
875898
memory: 200Mi
899+
bwmcpserver:
900+
enabled: ${CP_ENABLE_AI_BW_MCP}
901+
resources:
902+
requests:
903+
cpu: 100m
904+
memory: 256Mi
905+
limits:
906+
cpu: 200m
907+
memory: 512Mi
876908
tp-cp-bwce-utilities:
877909
enabled: ${CP_INSTALL_INTEGRATION_BWCE_UTILITIES}
878910
tp-cp-bw5ce-utilities:
@@ -888,6 +920,15 @@ helmCharts:
888920
limits:
889921
cpu: 200m
890922
memory: 200Mi
923+
mcpserver:
924+
enabled: ${CP_ENABLE_AI_FLOGO_MCP}
925+
resources:
926+
requests:
927+
cpu: 100m
928+
memory: 256Mi
929+
limits:
930+
cpu: 200m
931+
memory: 512Mi
891932
tp-cp-flogo-utilities:
892933
enabled: ${CP_INSTALL_INTEGRATION_FLOGO_UTILITIES}
893934
tp-cp-core:
@@ -979,7 +1020,14 @@ helmCharts:
9791020
cpu: 200m
9801021
memory: 200Mi
9811022
cpmcpserver:
982-
enabled: ${CP_INSTALL_MCP_SERVER:-true}
1023+
enabled: ${CP_ENABLE_AI_MCP}
1024+
resources:
1025+
requests:
1026+
cpu: 100m
1027+
memory: 256Mi
1028+
limits:
1029+
cpu: 200m
1030+
memory: 512Mi
9831031
tp-cp-core-finops:
9841032
finops-service:
9851033
finopsservice:

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ meta:
238238
PYTHON_FILE_ENTRY_POINT: page_dp.py
239239
PYTHON_FILE_ENTRY_POINT_BMDP: page_bmdp.py
240240
PYTHON_FILE_ENTRY_POINT_O11Y: page_o11y.py
241+
PYTHON_FILE_ENTRY_POINT_TOKEN: page_token.py
241242
PYTHON_FILE_ENV_POINT: page_env.py
242243
TP_OVERWRITE_DNS: ${GUI_TP_OVERWRITE_DNS:-false}
243244
TP_PORT_FORWARD: ${GUI_TP_PORT_FORWARD:-true}
@@ -438,11 +439,11 @@ tasks:
438439
fi
439440
fi
440441
441-
echo "===== Task Name: create-oauth-token, Running file ${PYTHON_FILE_ENTRY_POINT_O11Y} ====="
442+
echo "===== Task Name: create-oauth-token, Running file ${PYTHON_FILE_ENTRY_POINT_TOKEN} ====="
442443
if command -v uv >/dev/null 2>&1; then
443-
uv run --active ${PYTHON_FILE_ENTRY_POINT_O11Y}
444+
uv run --active ${PYTHON_FILE_ENTRY_POINT_TOKEN}
444445
else
445-
python ${PYTHON_FILE_ENTRY_POINT_O11Y}
446+
python ${PYTHON_FILE_ENTRY_POINT_TOKEN}
446447
fi
447448
_result=$?
448449
echo "python return code: ${_result}"

‎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.5-auto-on-prem-jammy
456+
tag: 1.6.6-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.5-auto-on-prem-jammy
410+
tag: 1.6.6-auto-on-prem-jammy
411411
ports:
412412
http:
413413
enabled: true

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## [10/07/2025 13:51]
2+
### Fixed
3+
- If button "Use Global Activation URL" is disabled, skip config it.
4+
15
## [10/04/2025 22:17]
26
### Added
37
- Support for creating OAuth Token and saving it to kubernetes secret.

‎docs/recipes/automation/tp-setup/bootstrap/page_dp.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464
)
6565
# Note: Will switch to global dataplane configuration, remove config dataplane level o11y
6666
# po_dp_config.o11y_config_dataplane_resource(ENV.TP_AUTO_K8S_DP_NAME)
67-
po_dp_config.o11y_config_activation(ENV.TP_AUTO_K8S_DP_NAME)
6867
po_dp_config.o11y_config_switch_to_global(ENV.TP_AUTO_K8S_DP_NAME)
68+
po_dp_config.o11y_config_activation(ENV.TP_AUTO_K8S_DP_NAME)
6969

7070
# for provision Flogo capability, connector, app, and start app
7171
if ENV.TP_AUTO_IS_PROVISION_FLOGO:

‎docs/recipes/automation/tp-setup/bootstrap/page_object/po_dp_config.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,12 +438,14 @@ def dp_config_activation(self, dp_name, use_global = False):
438438
return
439439

440440
if use_global:
441+
self.page.locator(".dp-activation").wait_for(state="visible")
442+
print(f"Checking if dataplane {dp_name} is able to use global activation url...")
441443
if self.page.locator(".activation-server-url").is_visible():
442444
current_activation_url = self.page.locator(".activation-server-url").inner_text()
443445
ColorLogger.success(f"ENV.TP_ACTIVATION_URL is empty, but Activation URL '{current_activation_url}' is already exist for Data Plane '{dp_name}'.")
444446
return
445447
# if "Use Global Activation URL" button is visible but not enabled, skip config
446-
if self.page.locator("#use-global-activation-on-dp").is_visible() and not self.page.locator("#use-global-activation-on-dp").is_enabled():
448+
if self.page.locator("#use-global-activation-on-dp").is_visible() and "pcp-disabled" in (self.page.locator("#use-global-activation-on-dp").get_attribute("class") or ""):
447449
ColorLogger.warning("'Use Global Activation URL' button is not enabled, skip config Activation url.")
448450
return
449451

0 commit comments

Comments
 (0)