2025 week 28 update (#81)

this update is for 1.8.0 release

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.7.15"
+version: "1.8.0"
 appVersion: "2.0.1"
 home: https://github.com/TIBCOSoftware/tp-helm-charts
 maintainers:

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

@@ -31,8 +31,8 @@ meta:
     GUI_CP_PROXY_NO_PROXY: ""
 
     # CP version see: https://docs.tibco.com/pub/platform-cp/1.5.1/doc/html/Default.htm#Installation/helm-chart-version-matrix.htm
-    GUI_CP_PLATFORM_BOOTSTRAP_VERSION: 1.7.0
-    GUI_CP_PLATFORM_BASE_VERSION: 1.7.0
+    GUI_CP_PLATFORM_BOOTSTRAP_VERSION: 1.8.0
+    GUI_CP_PLATFORM_BASE_VERSION: 1.8.0
 
     # CP env
     GUI_CP_INSTANCE_ID: "cp1"
@@ -238,8 +238,8 @@ meta:
     TP_TLS_KEY_HYBRID_PROXY: ${GUI_TP_TLS_KEY_HYBRID_PROXY:-""} # the tls.key for hybrid-proxy ingress
 
     # CP version see: https://docs.tibco.com/pub/platform-cp/1.5.1/doc/html/Default.htm#Installation/helm-chart-version-matrix.htm
-    CP_PLATFORM_BOOTSTRAP_VERSION: ${GUI_CP_PLATFORM_BOOTSTRAP_VERSION:-1.7.0} # use ^1.0.0 for latest
-    CP_PLATFORM_BASE_VERSION: ${GUI_CP_PLATFORM_BASE_VERSION:-1.7.0} # use ^1.0.0 for latest
+    CP_PLATFORM_BOOTSTRAP_VERSION: ${GUI_CP_PLATFORM_BOOTSTRAP_VERSION:-1.8.0} # use ^1.0.0 for latest
+    CP_PLATFORM_BASE_VERSION: ${GUI_CP_PLATFORM_BASE_VERSION:-1.8.0} # use ^1.0.0 for latest
 
     # flow control
     CP_VALIDATE_CLUSTER_RESOURCE: ${GUI_CP_VALIDATE_CLUSTER_RESOURCE:-true}

docs/recipes/controlplane/tp-cp.yaml

@@ -123,8 +123,8 @@ meta:
     TP_TLS_KEY_HYBRID_PROXY: ${GUI_TP_TLS_KEY_HYBRID_PROXY:-""} # the tls.key for hybrid-proxy ingress
 
     # CP version see: https://docs.tibco.com/pub/platform-cp/1.5.1/doc/html/Default.htm#Installation/helm-chart-version-matrix.htm
-    CP_PLATFORM_BOOTSTRAP_VERSION: ${GUI_CP_PLATFORM_BOOTSTRAP_VERSION:-1.7.0} # use ^1.0.0 for latest
-    CP_PLATFORM_BASE_VERSION: ${GUI_CP_PLATFORM_BASE_VERSION:-1.7.0} # use ^1.0.0 for latest
+    CP_PLATFORM_BOOTSTRAP_VERSION: ${GUI_CP_PLATFORM_BOOTSTRAP_VERSION:-1.8.0} # use ^1.0.0 for latest
+    CP_PLATFORM_BASE_VERSION: ${GUI_CP_PLATFORM_BASE_VERSION:-1.8.0} # use ^1.0.0 for latest
 
     # flow control
     CP_VALIDATE_CLUSTER_RESOURCE: ${GUI_CP_VALIDATE_CLUSTER_RESOURCE:-true}

docs/recipes/k8s/cloud/deploy-tp-eks.yaml

@@ -18,7 +18,7 @@ meta:
     TP_CHART_REPO: ${GUI_TP_CHART_REPO:-"https://tibcosoftware.github.io/tp-helm-charts"}
     TP_CHART_REPO_USER_NAME: ${GUI_TP_CHART_REPO_USER_NAME}
     TP_CHART_REPO_TOKEN: ${GUI_TP_CHART_REPO_TOKEN}
-    PLATFORM_PROVISIONER_REPO: github.com/TIBCOSoftware/platform-provisioner
+    PLATFORM_PROVISIONER_REPO: ${GUI_PLATFORM_PROVISIONER_REPO:-"github.com/TIBCOSoftware/platform-provisioner"}
     # cluster
     TP_CLUSTER_NAME: ${GUI_TP_CLUSTER_NAME}
     TP_CLUSTER_VERSION: ${GUI_TP_CLUSTER_VERSION:-1.31}
@@ -75,7 +75,8 @@ meta:
     TP_HTTP_INGRESS_BACKEND_SERVICE: ${TP_INGRESS_RELEASE_NAME}-$( ( [[  "$TP_INGRESS_CLASS" == "nginx" ]] && echo "ingress-nginx-controller" ) || ( [[ "$TP_INGRESS_CLASS" == "kong" ]] && echo "kong-proxy" ) )
     TP_INSTALL_CERT_MANAGER: ${GUI_TP_INSTALL_CERT_MANAGER:-true}
     TP_INSTALL_EXTERNAL_DNS: ${GUI_TP_INSTALL_EXTERNAL_DNS:-true}
-    TP_INSTALL_METRICS_SERVER: ${GUI_TP_INSTALL_METRICS_SERVER:-false} # eksctl start install metrics-server on 0.201.0
+    TP_INSTALL_METRICS_SERVER: ${GUI_TP_INSTALL_METRICS_SERVER:-true} # instLL metrics-server using helm chart, set to true
+    TP_ADDON_METRICS_SERVER_ENABLE: $([[ "$TP_INSTALL_METRICS_SERVER" == "true" ]] && echo "false" || echo "true") # to install metrics-server using add-on, set to true
     TP_INSTALL_O11Y: ${GUI_TP_INSTALL_O11Y:-false}
     TP_SKIP_GENERATE_CLUSTER_ISSUER: false
   tools:

docs/recipes/k8s/cloud/scripts/eks/create-eks.sh

@@ -14,6 +14,7 @@
 #   TP_CLUSTER_VPC_CIDR: The VPC CIDR
 #   TP_CLUSTER_INSTANCE_TYPE: The instance type
 #   TP_CLUSTER_DESIRED_CAPACITY: The desired capacity
+#   TP_ADDON_METRICS_SERVER_ENABLE: Enable metrics server
 #   TP_CLUSTER_ENABLE_NETWORK_POLICY: Use AWS CNI for network policy
 # Arguments:
 #   None
@@ -29,6 +30,7 @@ export TP_CLUSTER_NAME=${TP_CLUSTER_NAME:-"tp-cluster"}
 export TP_CLUSTER_VERSION=${TP_CLUSTER_VERSION:-"1.31"}
 export TP_CLUSTER_REGION=${TP_CLUSTER_REGION:-"us-west-2"}
 export TP_CLUSTER_VPC_CIDR=${TP_CLUSTER_VPC_CIDR:-"10.180.0.0/16"}
+export TP_ADDON_METRICS_SERVER_ENABLE=${TP_ADDON_METRICS_SERVER_ENABLE:-"false"}
 export TP_CLUSTER_INSTANCE_TYPE=${TP_CLUSTER_INSTANCE_TYPE:-"m5a.xlarge"}
 export TP_CLUSTER_DESIRED_CAPACITY=${TP_CLUSTER_DESIRED_CAPACITY:-"2"}
 export TP_CLUSTER_ENABLE_NETWORK_POLICY=${TP_CLUSTER_ENABLE_NETWORK_POLICY:-"true"}
@@ -88,6 +90,8 @@ vpc:
     publicAccess: true
   publicAccessCIDRs:
     - 0.0.0.0/0
+addonsConfig:
+  disableDefaultAddons: true
 addons:
   - name: vpc-cni # no version is specified so it deploys the default version
     attachPolicyARNs:
@@ -118,6 +122,16 @@ addons:
       efsCSIController: true
 EOF
 
+if [ "${TP_ADDON_METRICS_SERVER_ENABLE}" == "true" ]; then
+  yq e '.addons += {"name": "metrics-server", "version": "latest", "resolveConflicts": "preserve"}' -i eksctl-config.yaml
+  [ "${_no_echo_messages}" == "1" ] || { echo "Addon for Metrics Server is enabled in the recipe"; }
+else
+  [ "${_no_echo_messages}" == "1" ] || { echo "Addon for Metrics Server is not enabled in the recipe. Please install metrics server separately using k8s / helm"; }
+fi
+
+[ "${_no_echo_messages}" == "1" ] || { echo "Generating eksctl-config.yaml"; }
+cat eksctl-config.yaml
+
 echo "create cluster ${TP_CLUSTER_NAME} with eksctl-config.yaml"
 cat eksctl-config.yaml
 aws eks describe-cluster --name "${TP_CLUSTER_NAME}" &> /dev/null