[PDP-3267] update Cloud recipe for TP 1.3 (#12)

TIBCOSoftware · Sep 20, 2024 · 4ed0999 · 4ed0999
1 parent 217f92f
commit 4ed0999
Show file tree

Hide file tree

Showing 17 changed files with 88 additions and 60 deletions.
diff --git a/charts/provisioner-config-local/Chart.yaml b/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.0.38"
+version: "1.0.40"
 appVersion: "2.0.0"
 home: https://github.com/TIBCOSoftware/tp-helm-charts
 maintainers:

diff --git a/charts/provisioner-config-local/config/pp-deploy-cp-core-on-prem.yaml b/charts/provisioner-config-local/config/pp-deploy-cp-core-on-prem.yaml
@@ -90,7 +90,7 @@ options:
   type: string
   guiType: input
   reference: "meta.guiEnv.GUI_CP_PLATFORM_BASE_VERSION"
-  description: "The version of CP platform base. TP 1.3 GA release version is: 1.3.337. Use ^1.0.0 for latest"
+  description: "The version of CP platform base. TP 1.3 GA release version is: 1.3.338. Use ^1.0.0 for latest"
 - name: "GUI_CP_STORAGE_CLASS"
   type: string
   guiType: input

diff --git a/charts/provisioner-config-local/config/pp-maintain-tp-reset-postgres-db.yaml b/charts/provisioner-config-local/config/pp-maintain-tp-reset-postgres-db.yaml
@@ -45,7 +45,7 @@ recipe: |
             username: postgres
             password: postgres
             database: "postgres"
-          persistence:
+          global:
             storageClass: ${TP_CLUSTER_STORAGE_CLASS_NAME}
       flags:
         createNamespace: true

diff --git a/charts/provisioner-config-local/recipes/pp-deploy-cp-core-on-prem.yaml b/charts/provisioner-config-local/recipes/pp-deploy-cp-core-on-prem.yaml
@@ -29,7 +29,7 @@ meta:
     GUI_TP_TLS_KEY: ""
     # version
     GUI_CP_PLATFORM_BOOTSTRAP_VERSION: 1.3.36
-    GUI_CP_PLATFORM_BASE_VERSION: 1.3.337
+    GUI_CP_PLATFORM_BASE_VERSION: 1.3.338
     # storage
     GUI_CP_STORAGE_CLASS: standard
     GUI_CP_STORAGE_CREATE_PV: false
@@ -97,7 +97,7 @@ meta:
     TP_CERTIFICATE_CLUSTER_ISSUER: ${GUI_TP_CERTIFICATE_CLUSTER_ISSUER:-"tp-prod"} # the cluster issuer for tp-certificate
     # CP version
     CP_PLATFORM_BOOTSTRAP_VERSION: ${GUI_CP_PLATFORM_BOOTSTRAP_VERSION:-1.3.36} # 1.3 GA release. use ^1.0.0 for latest
-    CP_PLATFORM_BASE_VERSION: ${GUI_CP_PLATFORM_BASE_VERSION:-1.3.337} # 1.3 GA release. use ^1.0.0 for latest
+    CP_PLATFORM_BASE_VERSION: ${GUI_CP_PLATFORM_BASE_VERSION:-1.3.338} # 1.3 GA release. use ^1.0.0 for latest
     # flow control
     CP_CREATE_NAMESPACE: true
     CP_INSTALL_MAILDEV: true

diff --git a/charts/provisioner-config-local/recipes/tp-base-on-prem-https.yaml b/charts/provisioner-config-local/recipes/tp-base-on-prem-https.yaml
@@ -227,7 +227,7 @@ helmCharts:
         username: ${TP_DB_USER_NAME}
         password: ${TP_DB_PASSWORD}
         database: "${TP_DB_NAME}"
-      persistence:
+      global:
         storageClass: ${TP_STORAGE_CLASS}
   flags:
     createNamespace: true

diff --git a/charts/provisioner-config-local/recipes/tp-base-on-prem.yaml b/charts/provisioner-config-local/recipes/tp-base-on-prem.yaml
@@ -142,7 +142,7 @@ helmCharts:
         username: ${TP_DB_USER_NAME}
         password: ${TP_DB_PASSWORD}
         database: "${TP_DB_NAME}"
-      persistence:
+      global:
         storageClass: ${TP_STORAGE_CLASS}
   flags:
     createNamespace: true

diff --git a/docs/recipes/controlplane/tp-cp.yaml b/docs/recipes/controlplane/tp-cp.yaml
@@ -71,7 +71,7 @@ meta:
     TP_CERTIFICATE_CLUSTER_ISSUER: ${GUI_TP_CERTIFICATE_CLUSTER_ISSUER:-"tp-prod"} # the cluster issuer for tp-certificate
     # CP version
     CP_PLATFORM_BOOTSTRAP_VERSION: ${GUI_CP_PLATFORM_BOOTSTRAP_VERSION:-1.3.36} # 1.3 GA release. use ^1.0.0 for latest
-    CP_PLATFORM_BASE_VERSION: ${GUI_CP_PLATFORM_BASE_VERSION:-1.3.337} # 1.3 GA release. use ^1.0.0 for latest
+    CP_PLATFORM_BASE_VERSION: ${GUI_CP_PLATFORM_BASE_VERSION:-1.3.338} # 1.3 GA release. use ^1.0.0 for latest
     # flow control
     CP_CREATE_NAMESPACE: true
     CP_INSTALL_MAILDEV: true

diff --git a/docs/recipes/k8s/cloud/deploy-tp-aks.yaml b/docs/recipes/k8s/cloud/deploy-tp-aks.yaml
@@ -19,7 +19,7 @@ meta:
     PLATFORM_PROVISIONER_REPO: github.com/TIBCOSoftware/platform-provisioner
     # cluster
     TP_CLUSTER_NAME: ${GUI_TP_CLUSTER_NAME}
-    TP_CLUSTER_VERSION: ${GUI_TP_CLUSTER_VERSION:-1.29}
+    TP_CLUSTER_VERSION: ${GUI_TP_CLUSTER_VERSION:-1.30}
     TP_AZURE_REGION: ${GUI_TP_AZURE_REGION:-"westus2"} # the default region for the azure account
     # Azure env
     ACCOUNT: ${ACCOUNT:-"azure-"} # Azure account prefix to trigger authenticating with Azure
@@ -50,6 +50,10 @@ meta:
     TP_DISK_STORAGE_CLASS: "azure-disk-sc" # name of azure disk storage class
     TP_FILE_ENABLED: "true" # to enable azure files storage class
     TP_FILE_STORAGE_CLASS: "azure-files-sc" # name of azure files storage class
+    TP_STORAGE_CLASS: "${TP_DISK_STORAGE_CLASS}" # name of azure disk storage class
+    # TP versions
+    TP_CHART_VERSION_DP_CONFIG_AKS: ${GUI_TP_VERSION_DP_CONFIG_AWS:-"1.3.1"}
+    TP_CHART_VERSION_DP_CONFIG_ES: ${GUI_TP_VERSION_DP_CONFIG_ES:-"1.2.1"}
     # o11y
     TP_ES_RELEASE_NAME: "dp-config-es" # name of dp-config-es release name
     # flow control
@@ -58,7 +62,9 @@ meta:
     TP_INSTALL_CHART_VALUES_FILE: "/workspace/resources/global-values.yaml"
     TP_INSTALL_STORAGE: ${GUI_TP_INSTALL_STORAGE:-true}
     TP_INSTALL_STORAGE_EMS: ${GUI_TP_INSTALL_STORAGE_EMS:-false} # set to true to install storage for TIBCO Enterprise Message Service™ (EMS) recommended production
-    TP_SCRIPT_BRANCH: main
+    TP_SCRIPT_BRANCH: ${GUI_TP_SCRIPT_BRANCH:-main}
+    TP_INSTALL_CERT_MANAGER: ${GUI_TP_INSTALL_CERT_MANAGER:-true}
+    TP_INSTALL_EXTERNAL_DNS: ${GUI_TP_INSTALL_EXTERNAL_DNS:-true}
     TP_INSTALL_POSTGRES: ${GUI_TP_INSTALL_POSTGRES:-true}
     TP_INSTALL_O11Y: ${GUI_TP_INSTALL_O11Y:-false}
     # Do not change, variables to configure nginx/kong related resources based on ingressclass passed
@@ -112,7 +118,8 @@ preTasks:
     fileName: post-aks-cluster-script.sh
 helmCharts:
 - name: cert-manager
-  version: v1.13.2
+  condition: ${TP_INSTALL_CERT_MANAGER}
+  version: v1.15.3
   repo:
     helm:
       url: https://charts.jetstack.io
@@ -135,7 +142,8 @@ helmCharts:
     timeout: 1h
     createNamespace: true
 - name: external-dns
-  version: 1.13.1
+  condition: ${TP_INSTALL_EXTERNAL_DNS}
+  version: 1.15.0
   repo:
     helm:
       url: https://kubernetes-sigs.github.io/external-dns/
@@ -170,7 +178,7 @@ helmCharts:
     createNamespace: true
 - name: dp-config-aks # this is used to deploy cluster issuer
   condition: ${TP_GENERATE_CLUSTER_ISSUER}
-  version: "1.2.4"
+  version: "${TP_CHART_VERSION_DP_CONFIG_AKS}"
   repo:
     helm:
       url: ${TP_CHART_REPO}
@@ -214,7 +222,7 @@ helmCharts:
         cat "${TP_INSTALL_CHART_VALUES_FILE}"
 - name: dp-config-aks
   condition: ${TP_ENABLE_NGINX}
-  version: "1.2.4"
+  version: "${TP_CHART_VERSION_DP_CONFIG_AKS}"
   repo:
     helm:
       url: ${TP_CHART_REPO}
@@ -283,7 +291,7 @@ helmCharts:
         EOF
 - name: dp-config-aks
   condition: ${TP_DEPLOY_SECONDARY_INGRESS}
-  version: "1.2.4"
+  version: "${TP_CHART_VERSION_DP_CONFIG_AKS}"
   repo:
     helm:
       url: ${TP_CHART_REPO}
@@ -354,7 +362,7 @@ helmCharts:
         EOF
 - name: dp-config-aks
   condition: ${TP_INSTALL_STORAGE}
-  version: "1.2.4"
+  version: "${TP_CHART_VERSION_DP_CONFIG_AKS}"
   repo:
     helm:
       url: ${TP_CHART_REPO}
@@ -395,7 +403,7 @@ helmCharts:
     timeout: 1h
     createNamespace: true
 - name: dp-config-aks
-  version: "1.2.4"
+  version: "${TP_CHART_VERSION_DP_CONFIG_AKS}"
   condition: ${TP_INSTALL_STORAGE_EMS}
   repo:
     helm:
@@ -460,13 +468,14 @@ helmCharts:
         username: postgres
         password: postgres
         database: "postgres"
-      persistence:
+      global:
         storageClass: ${TP_STORAGE_CLASS}
   flags:
     createNamespace: true
     timeout: 1h
 - name: eck-operator
-  version: 2.10.0
+  version: 2.14.0
+  condition: ${TP_INSTALL_O11Y}
   repo:
     helm:
       url: https://helm.elastic.co
@@ -480,8 +489,8 @@ helmCharts:
     timeout: 1h
     createNamespace: true
 - name: dp-config-es
+  version: "${TP_CHART_VERSION_DP_CONFIG_ES}"
   condition: ${TP_INSTALL_O11Y}
-  version: "1.2.1"
   repo:
     helm:
       url: ${TP_CHART_REPO}
@@ -517,7 +526,7 @@ helmCharts:
     timeout: 1h
     createNamespace: true
 - name: kube-prometheus-stack
-  version: "54.2.1"
+  version: "62.7.0"
   condition: ${TP_INSTALL_O11Y}
   repo:
     helm:

diff --git a/docs/recipes/k8s/cloud/deploy-tp-eks.yaml b/docs/recipes/k8s/cloud/deploy-tp-eks.yaml
@@ -19,11 +19,12 @@ meta:
     PLATFORM_PROVISIONER_REPO: github.com/TIBCOSoftware/platform-provisioner
     # cluster
     TP_CLUSTER_NAME: ${GUI_TP_CLUSTER_NAME}
-    TP_CLUSTER_VERSION: ${GUI_TP_CLUSTER_VERSION:-1.29}
+    TP_CLUSTER_VERSION: ${GUI_TP_CLUSTER_VERSION:-1.30}
     TP_CLUSTER_REGION: ${AWS_REGION:-us-west-2}
+    TP_CLUSTER_INSTANCE_TYPE: ${GUI_TP_CLUSTER_INSTANCE_TYPE:-"m5a.xlarge"}
     # domain
     TP_DOMAIN: ${GUI_TP_DOMAIN} # the star domain for the main ingress <cp/dp-env>.${SANDBOX}.dataplanes.pro
-    TP_CLUSTER_VPC_CIDR: "10.180.0.0/16"
+    TP_CLUSTER_VPC_CIDR: ${GUI_TP_CLUSTER_CIDR:-"10.180.0.0/16"}
     # ingress
     TP_INGRESS_CLASS: ${GUI_TP_INGRESS_CLASS:-"nginx"}
     TP_SECONDARY_INGRESS_CLASS: ${GUI_TP_SECONDARY_INGRESS_CLASS}
@@ -42,11 +43,14 @@ meta:
     TP_STORAGE_CLASS_EFS: efs-sc
     TP_INSTALL_RESOURCE_FOLDER: "/workspace/resources"
     TP_INSTALL_EFS_VALUES_FILE: "${TP_INSTALL_RESOURCE_FOLDER}/efs_values.yaml"
+    # TP versions
+    TP_CHART_VERSION_DP_CONFIG_AWS: ${GUI_TP_VERSION_DP_CONFIG_AWS:-"1.3.6"}
+    TP_CHART_VERSION_DP_CONFIG_ES: ${GUI_TP_VERSION_DP_CONFIG_ES:-"1.2.1"}
     # flow control
     TP_INSTALL_K8S: ${GUI_TP_INSTALL_K8S:-true} # change to true to install k8s
     TP_INSTALL_EFS: ${GUI_TP_INSTALL_EFS:-true} # change to true to install efs
     TP_INSTALL_STORAGE: ${GUI_TP_INSTALL_STORAGE:-true} # change to false to skip storage installation
-    TP_SCRIPT_BRANCH: main
+    TP_SCRIPT_BRANCH: ${GUI_TP_SCRIPT_BRANCH:-main}
     TP_SCRIPT_NAME_SH_EKS: create-eks.sh # the script that DP will run
     TP_SCRIPT_NAME_SH_EFS: create-efs.sh # the script that DP will run
     TP_INSTALL_POSTGRES: ${GUI_TP_INSTALL_POSTGRES:-true}
@@ -55,6 +59,9 @@ meta:
     TP_ENABLE_SECONDARY_KONG: $([[ "$TP_SECONDARY_INGRESS_CLASS" == "kong" ]] && echo "true" || echo "false")
     TP_DEPLOY_SECONDARY_INGRESS: $([[ "$TP_ENABLE_SECONDARY_KONG" == "true" ]] && echo "true" || echo "false")
     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:-true}
     TP_INSTALL_O11Y: ${GUI_TP_INSTALL_O11Y:-false}
     TP_SKIP_GENERATE_CLUSTER_ISSUER: false
   tools:
@@ -84,7 +91,8 @@ preTasks:
     fileName: ${TP_SCRIPT_NAME_SH_EFS}
 helmCharts:
 - name: cert-manager
-  version: v1.15.0
+  condition: ${TP_INSTALL_CERT_MANAGER}
+  version: v1.15.3
   repo:
     helm:
       url: https://charts.jetstack.io
@@ -127,7 +135,8 @@ helmCharts:
                     region: ${TP_CLUSTER_REGION}
         EOF
 - name: external-dns
-  version: 1.14.2
+  condition: ${TP_INSTALL_EXTERNAL_DNS}
+  version: 1.15.0
   repo:
     helm:
       url: https://kubernetes-sigs.github.io/external-dns/
@@ -150,7 +159,7 @@ helmCharts:
     timeout: 1h
     createNamespace: true
 - name: aws-load-balancer-controller
-  version: 1.8.1
+  version: 1.8.3
   repo:
     helm:
       url: https://aws.github.io/eks-charts
@@ -171,6 +180,7 @@ helmCharts:
     timeout: 1h
     createNamespace: true
 - name: metrics-server
+  condition: ${TP_INSTALL_METRICS_SERVER}
   version: "3.12.1"
   repo:
     helm:
@@ -192,7 +202,7 @@ helmCharts:
     timeout: 1h
     createNamespace: true
 - name: dp-config-aws
-  version: "1.2.11"
+  version: "${TP_CHART_VERSION_DP_CONFIG_AWS}"
   repo:
     helm:
       url: ${TP_CHART_REPO}
@@ -269,7 +279,7 @@ helmCharts:
             - '*.${TP_DOMAIN}'
         EOF
 - name: dp-config-aws
-  version: "1.2.11"
+  version: "${TP_CHART_VERSION_DP_CONFIG_AWS}"
   condition: ${TP_DEPLOY_SECONDARY_INGRESS}
   repo:
     helm:
@@ -342,7 +352,7 @@ helmCharts:
             - '*.${TP_SECONDARY_DOMAIN}'
         EOF
 - name: dp-config-aws
-  version: "1.2.11"
+  version: "${TP_CHART_VERSION_DP_CONFIG_AWS}"
   condition: ${TP_INSTALL_STORAGE}
   repo:
     helm:
@@ -390,13 +400,13 @@ helmCharts:
         username: postgres
         password: postgres
         database: "postgres"
-      persistence:
+      global:
         storageClass: ${TP_STORAGE_CLASS}
   flags:
     createNamespace: true
     timeout: 1h
 - name: eck-operator
-  version: 2.10.0
+  version: 2.14.0
   condition: ${TP_INSTALL_O11Y}
   repo:
     helm:
@@ -411,7 +421,7 @@ helmCharts:
     timeout: 1h
     createNamespace: true
 - name: dp-config-es
-  version: "1.2.1"
+  version: "${TP_CHART_VERSION_DP_CONFIG_ES}"
   condition: ${TP_INSTALL_O11Y}
   repo:
     helm:
@@ -448,7 +458,7 @@ helmCharts:
     timeout: 1h
     createNamespace: true
 - name: kube-prometheus-stack
-  version: "54.2.1"
+  version: "62.7.0"
   condition: ${TP_INSTALL_O11Y}
   repo:
     helm: