2025 week 51 update (#109)

Co-authored-by: syan-tibco <[email protected]>

Author: syan-tibco

charts/provisioner-config-local/Chart.yaml

@@ -8,7 +8,7 @@ apiVersion: v2
 name: provisioner-config-local
 description: Platform Provisioner local config
 type: application
-version: "1.13.11"
+version: "1.13.13"
 appVersion: "2.0.1"
 home: https://github.com/TIBCOSoftware/tp-helm-charts
 maintainers:

charts/provisioner-config-local/config/pp-maintain-tp-config-coredns.yaml

@@ -39,7 +39,7 @@ recipe: |
     guiEnv:
       note: "config-coredns"
       GUI_PIPELINE_LOG_DEBUG: false
-      GUI_TARGET_SERVICE: "ingress-nginx-controller.ingress-system.svc.cluster.local"
+      GUI_TARGET_SERVICE: "traefik.ingress-system.svc.cluster.local"
       GUI_REGEX_PATTERN_BASE64: "KC4qKVwubG9jYWxob3N0XC5kYXRhcGxhbmVzXC5wcm8K"
     globalEnvVariable:
       REPLACE_RECIPE: true

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

@@ -67,7 +67,7 @@ meta:
     GUI_CP_DNS_DOMAIN: "localhost.dataplanes.pro"
     GUI_TP_TLS_CERT: ""
     GUI_TP_TLS_KEY: ""
-    GUI_CP_INGRESS_CLASSNAME: "nginx"
+    GUI_CP_INGRESS_CLASSNAME: "traefik"
     GUI_CP_BOOTSTRAP_INGRESS_ROUTER: true
     GUI_CP_BOOTSTRAP_INGRESS_HYBRID_PROXY: true
     GUI_TP_GENERATE_CERTIFICATES: false
@@ -229,7 +229,7 @@ meta:
     CP_MAIL_SERVER_GRAPH_SKIP_SENT_FOLDER: ${GUI_CP_MAIL_SERVER_GRAPH_SKIP_SENT_FOLDER:-false}
 
     # CP ingress
-    CP_INGRESS_CLASSNAME: ${GUI_CP_INGRESS_CLASSNAME:-nginx} # the ingress for CP
+    CP_INGRESS_CLASSNAME: ${GUI_CP_INGRESS_CLASSNAME:-traefik} # the ingress for CP
     CP_BOOTSTRAP_INGRESS_ROUTER: ${GUI_CP_BOOTSTRAP_INGRESS_ROUTER:-true} # set to false will create ingress for router and hybrid-proxy
     CP_BOOTSTRAP_INGRESS_HYBRID_PROXY: ${GUI_CP_BOOTSTRAP_INGRESS_HYBRID_PROXY:-true} # set to false will create ingress for router and hybrid-proxy
     CP_ALB_CERTIFICATE_ARN: "" # AWS ACM certificate ARN for ALB

charts/provisioner-config-local/recipes/pp-o11y-full.yaml

@@ -10,7 +10,7 @@ meta:
     GUI_TP_CHART_REPO_TOKEN: ""
 
     # ingress
-    GUI_TP_INGRESS_CLASS: "nginx"
+    GUI_TP_INGRESS_CLASS: "traefik"
     GUI_TP_DOMAIN: "localhost.dataplanes.pro"
 
     # storage

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

@@ -11,11 +11,11 @@ meta:
     note: "tp-automation-o11y"
     GUI_PIPELINE_LOG_DEBUG: false
 
-    GUI_TP_CLUSTER_NAME: 'on-prem'
+    GUI_TP_CLUSTER_NAME: "on-prem"
     GUI_GITHUB_TOKEN: ""
 
     # automation setup
-    GUI_TP_AUTO_CP_VERSION: ""    # keep it empty, unless you see an error with GUI_TP_AUTO_CP_VERSION in the logs
+    GUI_TP_AUTO_CP_VERSION: "" # keep it empty, unless you see an error with GUI_TP_AUTO_CP_VERSION in the logs
     GUI_TP_AUTO_USE_LOCAL_SCRIPT: false
     GUI_TP_AUTO_USE_GITHUB_SCRIPT: true
     GUI_TP_AUTO_REPORT_PATH: "/tmp/auto/report"
@@ -70,11 +70,11 @@ meta:
     GUI_TP_AUTO_K8S_DP_NAME: "k8s-auto-dp1"
     GUI_TP_AUTO_K8S_DP_NAMESPACE: "k8s-auto-dp1ns"
     GUI_TP_AUTO_K8S_DP_SERVICE_ACCOUNT: "k8s-auto-dp1sa"
-    GUI_TP_AUTO_INGRESS_CONTROLLER: "nginx"
-    GUI_TP_AUTO_INGRESS_CONTROLLER_CLASS_NAME: "nginx"
-    GUI_TP_INGRESS_CONTROLLER_SERVICE_NAME: "ingress-nginx-controller"
+    GUI_TP_AUTO_INGRESS_CONTROLLER: "traefik"
+    GUI_TP_AUTO_INGRESS_CONTROLLER_CLASS_NAME: "traefik"
+    GUI_TP_INGRESS_CONTROLLER_SERVICE_NAME: "traefik"
     GUI_TP_INGRESS_CONTROLLER_SERVICE_NAMESPACE: "ingress-system"
-    GUI_TP_INGRESS_CONTROLLER_SERVICE_PORT: "443:https"
+    GUI_TP_INGRESS_CONTROLLER_SERVICE_PORT: "443:websecure"
     GUI_TP_AUTO_STORAGE_CLASS: "hostpath"
 
     # network policy
@@ -183,11 +183,11 @@ meta:
     TP_AUTO_K8S_DP_NAME: ${GUI_TP_AUTO_K8S_DP_NAME:-"k8s-auto-dp1"}
     TP_AUTO_K8S_DP_NAMESPACE: ${GUI_TP_AUTO_K8S_DP_NAMESPACE:-"k8s-auto-dp1ns"}
     TP_AUTO_K8S_DP_SERVICE_ACCOUNT: ${GUI_TP_AUTO_K8S_DP_SERVICE_ACCOUNT:-"k8s-auto-dp1sa"}
-    TP_AUTO_INGRESS_CONTROLLER: ${GUI_TP_AUTO_INGRESS_CONTROLLER:-"nginx"}
-    TP_AUTO_INGRESS_CONTROLLER_CLASS_NAME: ${GUI_TP_AUTO_INGRESS_CONTROLLER_CLASS_NAME:-"nginx"}
-    TP_INGRESS_CONTROLLER_SERVICE_NAME: ${GUI_TP_INGRESS_CONTROLLER_SERVICE_NAME:-"ingress-nginx-controller"}
+    TP_AUTO_INGRESS_CONTROLLER: ${GUI_TP_AUTO_INGRESS_CONTROLLER:-"traefik"}
+    TP_AUTO_INGRESS_CONTROLLER_CLASS_NAME: ${GUI_TP_AUTO_INGRESS_CONTROLLER_CLASS_NAME:-"traefik"}
+    TP_INGRESS_CONTROLLER_SERVICE_NAME: ${GUI_TP_INGRESS_CONTROLLER_SERVICE_NAME:-"traefik"}
     TP_INGRESS_CONTROLLER_SERVICE_NAMESPACE: ${GUI_TP_INGRESS_CONTROLLER_SERVICE_NAMESPACE:-"ingress-system"}
-    TP_INGRESS_CONTROLLER_SERVICE_PORT: ${GUI_TP_INGRESS_CONTROLLER_SERVICE_PORT:-"443:https"}
+    TP_INGRESS_CONTROLLER_SERVICE_PORT: ${GUI_TP_INGRESS_CONTROLLER_SERVICE_PORT:-"443:websecure"}
     TP_AUTO_STORAGE_CLASS: ${GUI_TP_AUTO_STORAGE_CLASS:-"hostpath"}
 
     # network policies
@@ -236,7 +236,7 @@ meta:
     PYTHON_FILE_ENTRY_POINT: page_dp.py
     PYTHON_FILE_ENTRY_POINT_BMDP: page_bmdp.py
     PYTHON_FILE_ENTRY_POINT_O11Y: page_o11y.py
-    PYTHON_FILE_ENTRY_POINT_TOKEN: page_token.py
+    PYTHON_FILE_ENTRY_POINT_SETTING: page_setting.py
     PYTHON_FILE_ENV_POINT: page_env.py
     TP_OVERWRITE_DNS: ${GUI_TP_OVERWRITE_DNS:-false}
     TP_PORT_FORWARD: ${GUI_TP_PORT_FORWARD:-true}
@@ -437,11 +437,11 @@ tasks:
         fi
       fi
       
-      echo "===== Task Name: create-oauth-token, Running file ${PYTHON_FILE_ENTRY_POINT_TOKEN} ====="
+      echo "===== Task Name: create-oauth-token, Running file ${PYTHON_FILE_ENTRY_POINT_SETTING} ====="
       if command -v uv >/dev/null 2>&1; then
-        uv run --active ${PYTHON_FILE_ENTRY_POINT_TOKEN}
+        uv run --active ${PYTHON_FILE_ENTRY_POINT_SETTING}
       else
-        python ${PYTHON_FILE_ENTRY_POINT_TOKEN}
+        python ${PYTHON_FILE_ENTRY_POINT_SETTING}
       fi
       _result=$?
       echo "python return code: ${_result}"

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

@@ -18,8 +18,8 @@ meta:
     GUI_TP_DNS_DOMAIN: localhost.dataplanes.pro
     GUI_TP_TLS_CERT: ""
     GUI_TP_TLS_KEY: ""
-    GUI_TP_INSTALL_NGINX_INGRESS: true
-    GUI_TP_INSTALL_TRAEFIK_INGRESS: false
+    GUI_TP_INSTALL_NGINX_INGRESS: false
+    GUI_TP_INSTALL_TRAEFIK_INGRESS: true
     GUI_TP_INGRESS_SERVICE_TYPE: LoadBalancer
 
     # storage
@@ -48,7 +48,7 @@ meta:
     GUI_TP_CONTAINER_REGISTRY_PASSWORD: ""
 
     # third party
-    GUI_TP_PROVISIONER_UI_INGRESS_CLASSNAME: nginx
+    GUI_TP_PROVISIONER_UI_INGRESS_CLASSNAME: traefik
     GUI_TP_PROVISIONER_UI_NAMESPACE: tekton-tasks
     GUI_TP_AUTOMATION_INSTALL: false
     GUI_TP_AUTOMATION_NAMESPACE: automation
@@ -69,7 +69,7 @@ meta:
 
     # CP automation
     GUI_TP_AUTOMATION_DOCKER_IMAGE_REPO: "ghcr.io/tibcosoftware/platform-provisioner/platform-provisioner"
-    GUI_TP_AUTOMATION_DOCKER_IMAGE_TAG: 1.6.11-auto-on-prem-jammy
+    GUI_TP_AUTOMATION_DOCKER_IMAGE_TAG: 1.6.12-auto-on-prem-jammy
 
     # flow control
     GUI_TP_INSTALL_PROVISIONER_UI: false
@@ -96,8 +96,8 @@ meta:
     TP_CLUSTER_NAME: ${GUI_TP_CLUSTER_NAME:-"on-prem"}
 
     # domain
-    TP_INSTALL_NGINX_INGRESS: ${GUI_TP_INSTALL_NGINX_INGRESS:-"true"}
-    TP_INSTALL_TRAEFIK_INGRESS: ${GUI_TP_INSTALL_TRAEFIK_INGRESS:-"false"}
+    TP_INSTALL_NGINX_INGRESS: ${GUI_TP_INSTALL_NGINX_INGRESS:-"false"}
+    TP_INSTALL_TRAEFIK_INGRESS: ${GUI_TP_INSTALL_TRAEFIK_INGRESS:-"true"}
     TP_INGRESS_NAMESPACE: ingress-system
     TP_DNS_DOMAIN: ${GUI_TP_DNS_DOMAIN:-"localhost.dataplanes.pro"}
     TP_INGRESS_SERVICE_TYPE: ${GUI_TP_INGRESS_SERVICE_TYPE:-"ClusterIP"} # LoadBalancer used for minikube with tunel, NodePort used for kind, ClusterIP used for kubectl port-forward
@@ -124,7 +124,7 @@ meta:
     TP_EXT_NAMESPACE: tibco-ext
     TP_INSTALL_PROVISIONER_UI: ${GUI_TP_INSTALL_PROVISIONER_UI:-"false"}
     TP_PROVISIONER_UI_NAMESPACE: ${GUI_TP_PROVISIONER_UI_NAMESPACE:-"tekton-tasks"}
-    TP_PROVISIONER_UI_INGRESS_CLASSNAME: ${GUI_TP_PROVISIONER_UI_INGRESS_CLASSNAME:-"nginx"}
+    TP_PROVISIONER_UI_INGRESS_CLASSNAME: ${GUI_TP_PROVISIONER_UI_INGRESS_CLASSNAME:-"traefik"}
     TP_AUTOMATION_INSTALL: ${GUI_TP_AUTOMATION_INSTALL:-false}
     TP_AUTOMATION_NAMESPACE: ${GUI_TP_AUTOMATION_NAMESPACE:-"automation"}
 

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

@@ -67,7 +67,7 @@ meta:
 
     # CP automation
     GUI_TP_AUTOMATION_DOCKER_IMAGE_REPO: "ghcr.io/tibcosoftware/platform-provisioner/platform-provisioner"
-    GUI_TP_AUTOMATION_DOCKER_IMAGE_TAG: 1.6.11-auto-on-prem-jammy
+    GUI_TP_AUTOMATION_DOCKER_IMAGE_TAG: 1.6.12-auto-on-prem-jammy
 
     # flow control
     GUI_TP_INSTALL_PROVISIONER_UI: false

charts/provisioner-config-local/recipes/tp-deploy-bw5dm.yaml

@@ -22,6 +22,10 @@ meta:
     GUI_TP_ACTIVATION_SERVER_CERT_HOSTNAME: ""
     GUI_TP_ACTIVATION_SERVER_FINGER_PRINT: ""
 
+    # ingress
+    GUI_TP_INGRESS_CLASS: "traefik"
+    GUI_TP_CP_DNS_DOMAIN: "localhost.dataplanes.pro"
+
     # BW5DM
     GUI_BW5_CHART_VERSION: "^1.1.0"
     GUI_TP_BWDM_NAMESPACE: "bw5dm"
@@ -62,6 +66,10 @@ meta:
 
     TP_CLUSTER_NAME: ${GUI_TP_CLUSTER_NAME:-"on-prem"}
 
+    # ingress
+    TP_INGRESS_CLASS: ${GUI_TP_INGRESS_CLASS:-"traefik"}
+    TP_DNS_DOMAIN: ${GUI_TP_CP_DNS_DOMAIN:-"localhost.dataplanes.pro"}
+
     # BW5DM
     BW5_CHART_VERSION: ${GUI_BW5_CHART_VERSION:-"^1.1.0"}
     TP_BWDM_NAMESPACE: ${GUI_TP_BWDM_NAMESPACE:-bw5dm}
@@ -109,6 +117,8 @@ helmCharts:
           containerRegistry: "${TP_CONTAINER_REGISTRY}"
           containerRegistryUsername: "${TP_CONTAINER_REGISTRY_USERNAME}"
           containerRegistryPassword: "${TP_CONTAINER_REGISTRY_PASSWORD}"
+          ingressClassName: ${TP_INGRESS_CLASS}
+          tpDNSDomainName: ${TP_DNS_DOMAIN}
         secret:
           enabled: true
         ems-server:

docs/recipes/automation/on-prem/adjust-ingress.sh

@@ -55,10 +55,15 @@ function adjust_ingress() {
           yq eval -i '(.meta.guiEnv.GUI_TP_INGRESS_CLASS = env(TP_INGRESS_CLASS_NAME))' "$_recipe_file_name"
         fi
 
+        _recipe_file_name="07-tp-bw5-stack.yaml"
+        if [[ -f "${_recipe_file_name}" ]]; then
+          yq eval -i '(.meta.guiEnv.GUI_TP_INGRESS_CLASS = env(TP_INGRESS_CLASS_NAME))' "$_recipe_file_name"
+        fi
+
         break
         ;;
       2)
-        echo "Adjusting ingress for treafik..."
+        echo "Adjusting ingress for traefik..."
         _recipe_file_name="01-tp-on-prem.yaml"
         export TP_INGRESS_CLASS_NAME="traefik"
         if [[ -f "${_recipe_file_name}" ]]; then
@@ -95,6 +100,11 @@ function adjust_ingress() {
           yq eval -i '(.meta.guiEnv.GUI_TP_INGRESS_CLASS = env(TP_INGRESS_CLASS_NAME))' "$_recipe_file_name"
         fi
 
+        _recipe_file_name="07-tp-bw5-stack.yaml"
+        if [[ -f "${_recipe_file_name}" ]]; then
+          yq eval -i '(.meta.guiEnv.GUI_TP_INGRESS_CLASS = env(TP_INGRESS_CLASS_NAME))' "$_recipe_file_name"
+        fi
+
         break
         ;;
       0)

docs/recipes/automation/on-prem/connect-ins.sh

@@ -176,7 +176,7 @@ function connect_ins() {
   export INGRESS_SERVICE_NAMESPACE_LOCAL=${INGRESS_SERVICE_NAMESPACE_LOCAL:-"ingress-system"}
   export INGRESS_SERVICE_NAME_INSTANCE=${INGRESS_SERVICE_NAME_INSTANCE:-"ingress-nginx-controller"} # for nginx ingress use ingress-nginx-controller, for traefik ingress use traefik
   export INGRESS_SERVICE_NAMESPACE_INSTANCE=${INGRESS_SERVICE_NAMESPACE_INSTANCE:-"ingress-system"}
-  export INGRESS_SERVICE_PORT_INSTANCE=${INGRESS_SERVICE_PORT_INSTANCE:-"443:https"} # for nginx ingress use 443:https, for traefik ingress use 443:websecure
+  export INGRESS_SERVICE_PORT_INSTANCE=${INGRESS_SERVICE_PORT_INSTANCE:-"443:websecure"} # for nginx ingress use 443:https, for traefik ingress use 443:websecure
 
   if [ -z "$1" ]; then
     show_help