diff --git a/charts/provisioner-config-local/Chart.yaml b/charts/provisioner-config-local/Chart.yaml
index 2c0ad04..93c6288 100644
--- 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.25
+version: 1.0.29
appVersion: "2.0.0"
home: https://github.com/TIBCOSoftware/tp-helm-charts
maintainers:
diff --git a/charts/provisioner-config-local/config/menuContent.yaml b/charts/provisioner-config-local/config/menuContent.yaml
index 8771a16..a838c70 100644
--- a/charts/provisioner-config-local/config/menuContent.yaml
+++ b/charts/provisioner-config-local/config/menuContent.yaml
@@ -19,16 +19,17 @@ menuConfig:
- label: "Deploy"
icon: 'pi pi-fw pi-cloud-upload'
items:
+ - label: "TP Cluster"
+ items:
+ - label: "TP base on-prem"
+ to: "/pipelines/helm-install?title=tp-base-on-prem"
+ config: pp-deploy-tp-base-on-prem.yaml
+ - label: "TP base on-perm with certificate"
+ to: "/pipelines/helm-install?title=tp-base-on-prem-cert"
+ config: pp-deploy-tp-base-on-prem-cert.yaml
+ - separator: true
- label: "Data Plane"
items:
- - label: "Prepare Data Plane"
- items:
- - label: "Standard on-prem"
- to: "/pipelines/helm-install?title=dp-standard-on-prem"
- config: pp-deploy-dp-on-prem.yaml
- - label: "Standard on-prem with certificate"
- to: "/pipelines/helm-install?title=dp-standard-on-prem-cert"
- config: pp-deploy-dp-on-prem-cert.yaml
- label: "Register Data Plane"
items:
- label: "Register Dev DP"
@@ -39,14 +40,6 @@ menuConfig:
config: pp-register-dp-prod.yaml
- label: "Control Plane"
items:
- - label: "Prepare Control Plane"
- items:
- - label: "Standard on-prem"
- to: "/pipelines/helm-install?title=cp-standard-on-prem"
- config: pp-deploy-cp-tools-on-prem.yaml
- - label: "Standard on-prem with certificate"
- to: "/pipelines/helm-install?title=cp-standard-on-prem-cert"
- config: pp-deploy-cp-tools-on-prem-cert.yaml
- label: "Deploy Control Plane"
items:
- label: "Standard Control Plane"
@@ -81,21 +74,28 @@ menuConfig:
- label: "Data Plane"
items:
- label: "Data Plane"
- to: "/pipelines/generic-runner?title=Undeploy-dp"
+ to: "/pipelines/generic-runner?title=undeploy-dp"
config: pp-undeploy-dp.yaml
+ - label: "Control Plane"
+ items:
+ - label: "Control Plane"
+ to: "/pipelines/generic-runner?title=undeploy-cp"
+ config: pp-undeploy-cp.yaml
- label: "Maintenance"
icon: 'pi pi-fw pi-wrench'
items:
- - label: "Data Plane"
- items:
- - label: "Info"
- to: "/pipelines/generic-runner?title=data-plane-info"
- config: pp-maintain-dp-info.yaml
- - label: "AWS"
+ - label: "TP Cluster"
+ icon: 'pi pi-th-large'
items:
- - label: "Refresh ECR token"
- to: "/pipelines/generic-runner?title=Refresh ECR token"
- config: pp-maintain-aws-refresh-ecr-token.yaml
+ - label: "TP Cluster Info"
+ to: "/pipelines/generic-runner?title=tp-info"
+ config: pp-maintain-tp-info.yaml
+ - label: "Reset Postgres DB"
+ to: "/pipelines/helm-install?title=reset-postgres-db"
+ config: pp-maintain-tp-reset-postgres-db.yaml
+ - label: "Refresh Docker Registry token"
+ to: "/pipelines/generic-runner?title=refresh-docker-registry-token"
+ config: pp-maintain-tp-refresh-docker-token.yaml
- label: "Pipelines"
to: "/pipelines"
icon: 'pi pi-fw pi-list'
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
index 8797949..dddc2b4 100644
--- 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
@@ -18,9 +18,15 @@ options:
- name: "GUI_GITHUB_TOKEN"
type: string
guiType: input
- required: false
reference: "meta.guiEnv.GUI_GITHUB_TOKEN"
- description: "The github token"
+ description: |
+ The GitHub token to access the dev helm charts. For public helm chart you don't need to set this.
+- name: "GUI_CP_CHART_REPO"
+ type: string
+ guiType: input
+ reference: "meta.guiEnv.GUI_CP_CHART_REPO"
+ description: |
+ The helm chart repository to deploy CP. The default value is public repo. To use private repo set: https://${GITHUB_TOKEN}@raw.githubusercontent.com/tibco/tp-helm-charts/gh-pages
- name: "GUI_CP_ADMIN_EMAIL"
type: string
guiType: input
@@ -75,7 +81,7 @@ options:
type: boolean
guiType: checkbox
reference: "meta.guiEnv.GUI_CP_INGRESS_USE_HOSTPORT"
- description: "When deploy on kid we need to use hostport for ingress controller"
+ description: "When deploy on kind we need to use hostport for ingress controller"
- name: "GUI_CP_STORAGE_CREATE_PV"
type: string
guiType: input
diff --git a/charts/provisioner-config-local/config/pp-deploy-cp-tools-on-prem-cert.yaml b/charts/provisioner-config-local/config/pp-deploy-cp-tools-on-prem-cert.yaml
deleted file mode 100644
index b4da713..0000000
--- a/charts/provisioner-config-local/config/pp-deploy-cp-tools-on-prem-cert.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright © 2024. Cloud Software Group, Inc.
-# This file is subject to the license terms contained
-# in the license file that is distributed with this file.
-#
-
-pipelineName: "Deploy Control Plane On-Prem Stack with certificate"
-description: |
- This pipeline will deploy supporting tools for on-prem use case with a validate certificate for main ingress
- We will use `localhost.dataplanes.pro` as domain for on-prem use case. This domain will point to `0.0.0.0`.
- You can get validate public certificate from [Platform Provisioner](https://provisioner.cic2.tibcocloud.com/pipelines/generic-runner?title=certificate-localhost-dp)
- The certificate use Subject Alternative Name (SAN) with star domains for CP and DP services.
- We will have CP service as
- * `https://*.cp1-my.localhost.dataplanes.pro/`
- * `https://*.cp1-tunnel.localhost.dataplanes.pro/`
-options:
-- name: "GUI_TP_DNS_DOMAIN"
- type: string
- guiType: input
- reference: "meta.guiEnv.GUI_TP_DNS_DOMAIN"
- description: "We have a special domain for on-prem use case. localhost.dataplanes.pro"
-- name: "GUI_TP_TLS_CERT"
- type: string
- guiType: input
- required: true
- reference: "meta.guiEnv.GUI_TP_TLS_CERT"
- description: "base64 encoding of validate certificate for the domain. You can get it from Platform Provisioner"
-- name: "GUI_TP_TLS_KEY"
- type: string
- guiType: input
- required: true
- reference: "meta.guiEnv.GUI_TP_TLS_KEY"
- description: "base64 encoding of validate certificate for the domain You can get it from Platform Provisioner"
-- name: "Install Nginx Ingress"
- type: boolean
- guiType: checkbox
- reference: "meta.guiEnv.GUI_TP_INSTALL_NGINX_INGRESS"
-- name: "Install Traefik Ingress"
- type: boolean
- guiType: checkbox
- reference: "meta.guiEnv.GUI_TP_INSTALL_TRAEFIK_INGRESS"
- description: "Traefik dashboard will be available at: https://dashboard.localhost.dataplanes.pro/dashboard/#/"
-- name: "GUI_PIPELINE_LOG_DEBUG"
- type: boolean
- guiType: checkbox
- reference: "meta.guiEnv.GUI_PIPELINE_LOG_DEBUG"
-recipe: |
-{{ .Files.Get "recipes/pp-deploy-cp-tools-on-prem-cert.yaml" | indent 2 }}
diff --git a/charts/provisioner-config-local/config/pp-deploy-cp-tools-on-prem.yaml b/charts/provisioner-config-local/config/pp-deploy-cp-tools-on-prem.yaml
deleted file mode 100644
index dc9ce10..0000000
--- a/charts/provisioner-config-local/config/pp-deploy-cp-tools-on-prem.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright © 2024. Cloud Software Group, Inc.
-# This file is subject to the license terms contained
-# in the license file that is distributed with this file.
-#
-
-pipelineName: "Deploy Control Plane On-Prem Stack"
-description: |
- This pipeline will deploy supporting tools for CP on-prem use case.
- Currently it is tested for kind environment. We have to use github token to access the dev helm charts.
- After the deployment, you will get an email in MailDev to reset the password.
- You need to use port-forward to access MailDev.
- ```bash
- kubectl port-forward svc/development-mailserver -n tibco-ext 1080:1080
- ```
- Then you can access MailDev at `http://localhost:1080`
-options:
-- name: "GUI_TP_DNS_DOMAIN"
- type: string
- guiType: input
- reference: "meta.guiEnv.GUI_TP_DNS_DOMAIN"
- description: "The CP DNS domain"
-- name: "GUI_TP_STORAGE_CLASS"
- type: string
- guiType: input
- reference: "meta.guiEnv.GUI_TP_STORAGE_CLASS"
- description: "hostpath for docker for mac, standard for minikube and kind, microk8s-hostpath for microk8s"
-- name: "GUI_TP_INGRESS_SERVICE_TYPE"
- labels:
- - "ClusterIP"
- - "LoadBalancer"
- - "NodePort"
- - "hostPort"
- values:
- - "ClusterIP"
- - "LoadBalancer"
- - "NodePort"
- - "hostPort"
- type: string
- guiType: radio
- reference: "meta.guiEnv.GUI_TP_INGRESS_SERVICE_TYPE"
-- name: "GUI_TP_INGRESS_USE_HOSTPORT"
- type: boolean
- guiType: checkbox
- reference: "meta.guiEnv.GUI_TP_INGRESS_USE_HOSTPORT"
- description: "When deploy on kid we need to use hostport for ingress controller"
-recipe: |
-{{ .Files.Get "recipes/pp-deploy-cp-tools-on-prem.yaml" | indent 2 }}
diff --git a/charts/provisioner-config-local/config/pp-deploy-dp-on-prem-cert.yaml b/charts/provisioner-config-local/config/pp-deploy-dp-on-prem-cert.yaml
deleted file mode 100644
index c846386..0000000
--- a/charts/provisioner-config-local/config/pp-deploy-dp-on-prem-cert.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Copyright © 2024. Cloud Software Group, Inc.
-# This file is subject to the license terms contained
-# in the license file that is distributed with this file.
-#
-
-pipelineName: "Deploy Data Plane On-Prem Stack with certificate"
-description: |
- This pipeline will deploy supporting tools for on-prem use case with a validate certificate for main ingress
- We will use `localhost.dataplanes.pro` as domain for on-prem use case. This domain will point to `0.0.0.0`.
- You can get validate public certificate from [Platform Provisioner](https://provisioner.cic2.tibcocloud.com/pipelines/generic-runner?title=certificate-localhost-dp)
- We will have DP service as
- * `https://kibana.localhost.dataplanes.pro/`
- * `https://flogo.localhost.dataplanes.pro/`
-options:
-- name: "GUI_TP_DNS_DOMAIN"
- type: string
- guiType: input
- reference: "meta.guiEnv.GUI_TP_DNS_DOMAIN"
- description: "We have a special domain for on-prem use case. localhost.dataplanes.pro"
-- name: "GUI_TP_TLS_CERT"
- type: string
- guiType: input
- required: true
- reference: "meta.guiEnv.GUI_TP_TLS_CERT"
- description: "base64 encoding of validate certificate for the domain. You can get it from Platform Provisioner"
-- name: "GUI_TP_TLS_KEY"
- type: string
- guiType: input
- required: true
- reference: "meta.guiEnv.GUI_TP_TLS_KEY"
- description: "base64 encoding of validate certificate for the domain You can get it from Platform Provisioner"
-- name: "Install Nginx Ingress"
- type: boolean
- guiType: checkbox
- reference: "meta.guiEnv.GUI_TP_INSTALL_NGINX_INGRESS"
-- name: "Install Traefik Ingress"
- type: boolean
- guiType: checkbox
- reference: "meta.guiEnv.GUI_TP_INSTALL_TRAEFIK_INGRESS"
- description: "Traefik dashboard will be available at: https://dashboard.localhost.dataplanes.pro/dashboard/#/"
-- name: "GUI_PIPELINE_LOG_DEBUG"
- type: boolean
- guiType: checkbox
- reference: "meta.guiEnv.GUI_PIPELINE_LOG_DEBUG"
-recipe: |
-{{ .Files.Get "recipes/pp-deploy-dp-on-prem-cert.yaml" | indent 2 }}
diff --git a/charts/provisioner-config-local/config/pp-deploy-dp-on-prem.yaml b/charts/provisioner-config-local/config/pp-deploy-dp-on-prem.yaml
deleted file mode 100644
index ccb4f74..0000000
--- a/charts/provisioner-config-local/config/pp-deploy-dp-on-prem.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright © 2024. Cloud Software Group, Inc.
-# This file is subject to the license terms contained
-# in the license file that is distributed with this file.
-#
-
-pipelineName: "Deploy Data Plane On-Prem Stack"
-description: |
- This pipeline will deploy third party supporting tools for on-prem use case
-options:
- - name: "GUI_TP_DNS_DOMAIN"
- type: string
- guiType: input
- reference: "meta.guiEnv.GUI_TP_DNS_DOMAIN"
- description: "normally we use localhost as on-perm domain. The service will be like: https://kibana.localhost/"
- - name: "Install Nginx Ingress"
- type: boolean
- guiType: checkbox
- reference: "meta.guiEnv.GUI_TP_INSTALL_NGINX_INGRESS"
- - name: "Install Traefik Ingress"
- type: boolean
- guiType: checkbox
- reference: "meta.guiEnv.GUI_TP_INSTALL_TRAEFIK_INGRESS"
- description: "Traefik dashboard will be available at: https://dashboard.localhost/dashboard/#/"
- - name: "GUI_PIPELINE_LOG_DEBUG"
- type: boolean
- guiType: checkbox
- reference: "meta.guiEnv.GUI_PIPELINE_LOG_DEBUG"
-recipe: |
-{{ .Files.Get "recipes/pp-deploy-dp-on-prem.yaml" | indent 2 }}
diff --git a/charts/provisioner-config-local/config/pp-deploy-tp-base-on-prem-cert.yaml b/charts/provisioner-config-local/config/pp-deploy-tp-base-on-prem-cert.yaml
new file mode 100644
index 0000000..ae94b29
--- /dev/null
+++ b/charts/provisioner-config-local/config/pp-deploy-tp-base-on-prem-cert.yaml
@@ -0,0 +1,73 @@
+#
+# Copyright © 2024. Cloud Software Group, Inc.
+# This file is subject to the license terms contained
+# in the license file that is distributed with this file.
+#
+
+pipelineName: "Deploy TIBCO Platform On-Prem Stack with certificate"
+description: |
+ This pipeline will deploy supporting tools for TP Cluster on-prem with certificate.
+options:
+- name: "GUI_TP_DNS_DOMAIN"
+ type: string
+ guiType: input
+ reference: "meta.guiEnv.GUI_TP_DNS_DOMAIN"
+ description: "We have a special domain for on-prem use case. localhost.dataplanes.pro"
+- name: "GUI_TP_TLS_CERT"
+ type: string
+ guiType: input
+ required: true
+ reference: "meta.guiEnv.GUI_TP_TLS_CERT"
+ description: |
+ base64 encoding of validate certificate for the domain. You can get it from Platform Provisioner
+- name: "GUI_TP_TLS_KEY"
+ type: string
+ guiType: input
+ required: true
+ reference: "meta.guiEnv.GUI_TP_TLS_KEY"
+ description: |
+ base64 encoding of validate certificate for the domain You can get it from Platform Provisioner
+- name: "GUI_TP_STORAGE_CLASS"
+ type: string
+ guiType: input
+ reference: "meta.guiEnv.GUI_TP_STORAGE_CLASS"
+ description: |
+ docker for mac: "hostpath", minikube and kind: "standard", microk8s: "microk8s-hostpath"
+- name: "GUI_TP_INGRESS_SERVICE_TYPE"
+ labels:
+ - "ClusterIP"
+ - "LoadBalancer"
+ - "NodePort"
+ - "hostPort"
+ values:
+ - "ClusterIP"
+ - "LoadBalancer"
+ - "NodePort"
+ - "hostPort"
+ type: string
+ guiType: radio
+ reference: "meta.guiEnv.GUI_TP_INGRESS_SERVICE_TYPE"
+ description: |
+ We suggest to use "ClusterIP" and use kubectl port-forward for local cluster.
+- name: "Install Nginx Ingress"
+ type: boolean
+ guiType: checkbox
+ reference: "meta.guiEnv.GUI_TP_INSTALL_NGINX_INGRESS"
+- name: "Install Traefik Ingress"
+ type: boolean
+ guiType: checkbox
+ reference: "meta.guiEnv.GUI_TP_INSTALL_TRAEFIK_INGRESS"
+ description: |
+ Traefik dashboard will be available at: https://dashboard.localhost.dataplanes.pro/dashboard/#/
+- name: "Install Postgres"
+ type: boolean
+ guiType: checkbox
+ reference: "meta.guiEnv.GUI_TP_INSTALL_POSTGRES"
+ description: |
+ Install Postgres database for TP Cluster
+- name: "GUI_PIPELINE_LOG_DEBUG"
+ type: boolean
+ guiType: checkbox
+ reference: "meta.guiEnv.GUI_PIPELINE_LOG_DEBUG"
+recipe: |
+{{ .Files.Get "recipes/tp-base-on-prem-https.yaml" | indent 2 }}
diff --git a/charts/provisioner-config-local/config/pp-deploy-tp-base-on-prem.yaml b/charts/provisioner-config-local/config/pp-deploy-tp-base-on-prem.yaml
new file mode 100644
index 0000000..b70d6a9
--- /dev/null
+++ b/charts/provisioner-config-local/config/pp-deploy-tp-base-on-prem.yaml
@@ -0,0 +1,45 @@
+#
+# Copyright © 2024. Cloud Software Group, Inc.
+# This file is subject to the license terms contained
+# in the license file that is distributed with this file.
+#
+
+pipelineName: "Deploy TIBCO Platform On-Prem Stack"
+description: |
+ This pipeline will deploy supporting tools for TP Cluster on-prem with out certificate.
+options:
+- name: "GUI_TP_DNS_DOMAIN"
+ type: string
+ guiType: input
+ reference: "meta.guiEnv.GUI_TP_DNS_DOMAIN"
+ description: "The TP Cluster DNS domain. localhost.dataplanes.pro is designed for local use"
+- name: "GUI_TP_STORAGE_CLASS"
+ type: string
+ guiType: input
+ reference: "meta.guiEnv.GUI_TP_STORAGE_CLASS"
+ description: |
+ docker for mac: "hostpath", minikube and kind: "standard", microk8s: "microk8s-hostpath"
+- name: "GUI_TP_INGRESS_SERVICE_TYPE"
+ labels:
+ - "ClusterIP"
+ - "LoadBalancer"
+ - "NodePort"
+ - "hostPort"
+ values:
+ - "ClusterIP"
+ - "LoadBalancer"
+ - "NodePort"
+ - "hostPort"
+ type: string
+ guiType: radio
+ reference: "meta.guiEnv.GUI_TP_INGRESS_SERVICE_TYPE"
+ description: |
+ We suggest to use "ClusterIP" and use kubectl port-forward for local cluster.
+- name: "Install Postgres"
+ type: boolean
+ guiType: checkbox
+ reference: "meta.guiEnv.GUI_TP_INSTALL_POSTGRES"
+ description: |
+ Install Postgres database for TP Cluster
+recipe: |
+{{ .Files.Get "recipes/tp-base-on-prem.yaml" | indent 2 }}
diff --git a/charts/provisioner-config-local/config/pp-maintain-aws-refresh-ecr-token.yaml b/charts/provisioner-config-local/config/pp-maintain-aws-refresh-ecr-token.yaml
deleted file mode 100644
index 16ffaef..0000000
--- a/charts/provisioner-config-local/config/pp-maintain-aws-refresh-ecr-token.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# Copyright © 2024. Cloud Software Group, Inc.
-# This file is subject to the license terms contained
-# in the license file that is distributed with this file.
-#
-
-pipelineName: "Refresh ECR token for Data Plane"
-description: |
- This pipeline is a helper to refresh the ECR token for the Data Plane.
-options:
-- name: "DATAPLANE_ID"
- type: string
- guiType: input
- reference: "meta.guiEnv.GUI_DP_DATAPLANE_ID"
- required: true
- description: "Data Plane ID used for ECR secret"
-- name: "DP_NAMESPACE"
- type: string
- guiType: input
- reference: "meta.guiEnv.GUI_DP_NAMESPACE"
- required: true
- description: "Namespace to install the ECR secret"
-- name: "GUI_DP_CONTAINER_REGISTRY"
- type: string
- guiType: input
- reference: "meta.guiEnv.GUI_DP_CONTAINER_REGISTRY"
- description: "The container registry URL"
-- name: "GUI_DP_CONTAINER_REGISTRY_USERNAME"
- type: string
- guiType: input
- reference: "meta.guiEnv.GUI_DP_CONTAINER_REGISTRY_USERNAME"
- description: "The container registry user name"
-- name: "GUI_DP_CONTAINER_REGISTRY_PASSWORD"
- type: string
- guiType: input
- reference: "meta.guiEnv.GUI_DP_CONTAINER_REGISTRY_PASSWORD"
- required: true
- description: "The container registry password"
-- name: "GUI_PIPELINE_LOG_DEBUG"
- type: boolean
- guiType: checkbox
- reference: "meta.guiEnv.GUI_PIPELINE_LOG_DEBUG"
-recipe: |
- apiVersion: v1
- kind: generic-runner
- meta:
- guiEnv:
- note: "aws-refresh-ecr-token"
- GUI_DP_DATAPLANE_ID: ""
- GUI_DP_NAMESPACE: ""
- GUI_DP_ECR_TOKEN: ""
- GUI_PIPELINE_LOG_DEBUG: false
- globalEnvVariable:
- REPLACE_RECIPE: true
- PIPELINE_LOG_DEBUG: ${GUI_PIPELINE_LOG_DEBUG}
- PIPELINE_CHECK_DOCKER_STATUS: false
- # DP settings
- DP_DATAPLANE_ID: ${GUI_DP_DATAPLANE_ID}
- DP_NAMESPACE: ${GUI_DP_NAMESPACE}
- DP_ECR_TOKEN: ${GUI_DP_ECR_TOKEN}
- tasks:
- - condition: true
- script:
- ignoreErrors: false
- fileName: script.sh
- content: |
- # install ECR secret
- AWS_REGION=${AWS_REGION:-us-west-2}
-
- kubectl delete secret --namespace ${DP_NAMESPACE} ${DP_DATAPLANE_ID} 2>/dev/null
- kubectl create secret docker-registry ${DP_DATAPLANE_ID} \
- --docker-server=${DP_CONTAINER_REGISTRY} \
- --docker-username=${DP_CONTAINER_REGISTRY_USERNAME} \
- --docker-password=${DP_CONTAINER_REGISTRY_PASSWORD} \
- --namespace=${DP_NAMESPACE}
-
diff --git a/charts/provisioner-config-local/config/pp-maintain-dp-info.yaml b/charts/provisioner-config-local/config/pp-maintain-tp-info.yaml
similarity index 82%
rename from charts/provisioner-config-local/config/pp-maintain-dp-info.yaml
rename to charts/provisioner-config-local/config/pp-maintain-tp-info.yaml
index f38d161..080a91c 100644
--- a/charts/provisioner-config-local/config/pp-maintain-dp-info.yaml
+++ b/charts/provisioner-config-local/config/pp-maintain-tp-info.yaml
@@ -1,23 +1,25 @@
pipelineName: "Data Plane information"
description: |
- This pipeline will output TIBCO Data Plane information.
+ This pipeline will print basic information about TIBCO Platform Cluster.
recipe: |
apiVersion: v1
kind: generic-runner
meta:
guiEnv:
- note: "get-dp-info"
- GUI_DP_CLUSTER_NAME: ''
+ note: "get-tp-info"
+ GUI_TP_CLUSTER_NAME: ''
+ GUI_AZURE_RESOURCE_GROUP: ""
GUI_PIPELINE_LOG_DEBUG: false
globalEnvVariable:
REPLACE_RECIPE: true
PIPELINE_LOG_DEBUG: ${GUI_PIPELINE_LOG_DEBUG}
PIPELINE_CHECK_DOCKER_STATUS: false
- DP_CLUSTER_NAME: ${GUI_DP_CLUSTER_NAME}
+ AZURE_RESOURCE_GROUP: ${GUI_AZURE_RESOURCE_GROUP}
+ TP_CLUSTER_NAME: ${GUI_TP_CLUSTER_NAME}
tasks:
- condition: true
clusters:
- - name: ${DP_CLUSTER_NAME}
+ - name: ${TP_CLUSTER_NAME}
script:
ignoreErrors: false
fileName: script.sh
diff --git a/charts/provisioner-config-local/config/pp-maintain-tp-refresh-docker-token.yaml b/charts/provisioner-config-local/config/pp-maintain-tp-refresh-docker-token.yaml
new file mode 100644
index 0000000..7e75325
--- /dev/null
+++ b/charts/provisioner-config-local/config/pp-maintain-tp-refresh-docker-token.yaml
@@ -0,0 +1,95 @@
+#
+# Copyright © 2024. Cloud Software Group, Inc.
+# This file is subject to the license terms contained
+# in the license file that is distributed with this file.
+#
+
+pipelineName: "Refresh Container Registry token"
+description: |
+ This pipeline is a helper to refresh the Container Registry token for TIBCO Platform clusters.
+options:
+- name: "SECRET_KEY"
+ type: string
+ guiType: input
+ reference: "meta.guiEnv.GUI_SECRET_KEY"
+ required: true
+ description: |
+ For Data Plane: Use Data Plane ID for ECR secret key
+ For Control Plane: Use `tibco-container-registry-credentials` for ECR secret key
+- name: "SECRET_NAMESPACE"
+ type: string
+ guiType: input
+ reference: "meta.guiEnv.GUI_SECRET_NAMESPACE"
+ required: true
+ description: |
+ Namespace to install the ECR secret
+ For Control Plane: default is `cp1-ns`, but it could be different
+- name: "GUI_CONTAINER_REGISTRY_SERVER"
+ type: string
+ guiType: input
+ reference: "meta.guiEnv.GUI_CONTAINER_REGISTRY_SERVER"
+ required: true
+ description: |
+ The server of the container registry.
+- name: "GUI_CONTAINER_REGISTRY_USERNAME"
+ type: string
+ guiType: input
+ reference: "meta.guiEnv.GUI_CONTAINER_REGISTRY_USERNAME"
+ required: true
+ description: |
+ The user name of the container registry. For aws, it is `AWS`
+- name: "GUI_CONTAINER_REGISTRY_PASSWORD"
+ type: string
+ guiType: input
+ reference: "meta.guiEnv.GUI_CONTAINER_REGISTRY_PASSWORD"
+ required: true
+ description: |
+ The container registry password.
+ For AWS we can get the token from aws cli command `aws ecr get-login-password --region ` or run it in Platform Provisioner and paste the token here
+- name: "GUI_PIPELINE_LOG_DEBUG"
+ type: boolean
+ guiType: checkbox
+ reference: "meta.guiEnv.GUI_PIPELINE_LOG_DEBUG"
+recipe: |
+ apiVersion: v1
+ kind: generic-runner
+ meta:
+ guiEnv:
+ note: "tp-refresh-container-token"
+ GUI_TP_RESOURCE_GROUP: ""
+ GUI_TP_CLUSTER_NAME: "tp-cluster"
+ GUI_SECRET_KEY: ""
+ GUI_SECRET_NAMESPACE: ""
+ GUI_CONTAINER_REGISTRY_SERVER: "664529841144.dkr.ecr.us-west-2.amazonaws.com"
+ GUI_CONTAINER_REGISTRY_USERNAME: "AWS"
+ GUI_CONTAINER_REGISTRY_PASSWORD: ""
+ GUI_PIPELINE_LOG_DEBUG: false
+ globalEnvVariable:
+ REPLACE_RECIPE: true
+ PIPELINE_LOG_DEBUG: ${GUI_PIPELINE_LOG_DEBUG}
+ PIPELINE_CHECK_DOCKER_STATUS: false
+ # settings
+ TP_RESOURCE_GROUP: ${GUI_TP_RESOURCE_GROUP} # Azure resource group name
+ AZURE_RESOURCE_GROUP: ${TP_RESOURCE_GROUP} # provisioner pipeline assume role needed
+ TP_CLUSTER_NAME: ${GUI_TP_CLUSTER_NAME}
+ SECRET_KEY: ${GUI_SECRET_KEY}
+ SECRET_NAMESPACE: ${GUI_SECRET_NAMESPACE}
+ CONTAINER_REGISTRY_SERVER: ${GUI_CONTAINER_REGISTRY_SERVER}
+ CONTAINER_REGISTRY_PASSWORD: ${GUI_CONTAINER_REGISTRY_PASSWORD}
+ CONTAINER_REGISTRY_USERNAME: ${GUI_CONTAINER_REGISTRY_USERNAME}
+ tasks:
+ - condition: true
+ clusters:
+ - name: '${TP_CLUSTER_NAME}'
+ script:
+ ignoreErrors: false
+ fileName: script.sh
+ content: |
+ # install ECR secret
+ kubectl delete secret --namespace ${SECRET_NAMESPACE} ${SECRET_KEY} 2>/dev/null
+ kubectl create secret docker-registry ${SECRET_KEY} \
+ --docker-server=${CONTAINER_REGISTRY_SERVER} \
+ --docker-username=${CONTAINER_REGISTRY_USERNAME} \
+ --docker-password=${CONTAINER_REGISTRY_PASSWORD} \
+ --namespace=${SECRET_NAMESPACE}
+
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
new file mode 100644
index 0000000..cd25d7d
--- /dev/null
+++ b/charts/provisioner-config-local/config/pp-maintain-tp-reset-postgres-db.yaml
@@ -0,0 +1,62 @@
+pipelineName: "Reset Postgres DB"
+description: |
+ This pipeline will delete the old Postgres DB and create a new one. So that we can reset CP without delete the TP cluster.
+options:
+- name: "GUI_TP_CLUSTER_STORAGE_CLASS_NAME"
+ type: string
+ guiType: input
+ reference: "meta.guiEnv.GUI_TP_CLUSTER_STORAGE_CLASS_NAME"
+ required: true
+ description: "This TP cluster storage class name for Postgres DB, EKS: ebs-gp3, AKS: default"
+recipe: |
+ apiVersion: v1
+ kind: helm-install
+ meta:
+ guiEnv:
+ note: "reset-postgres-db"
+ GUI_TP_CLUSTER_NAME: ''
+ GUI_AZURE_RESOURCE_GROUP: ""
+ GUI_PIPELINE_LOG_DEBUG: false
+ GUI_TP_CLUSTER_STORAGE_CLASS_NAME: "ebs-gp3"
+ globalEnvVariable:
+ REPLACE_RECIPE: true
+ PIPELINE_LOG_DEBUG: false
+ PIPELINE_CHECK_DOCKER_STATUS: false
+ AZURE_RESOURCE_GROUP: ${GUI_AZURE_RESOURCE_GROUP}
+ TP_CLUSTER_NAME: ${GUI_TP_CLUSTER_NAME}
+ TP_CLUSTER_STORAGE_CLASS_NAME: ${GUI_TP_CLUSTER_STORAGE_CLASS_NAME:-ebs-gp3}
+ helmCharts:
+ - name: postgresql # chart name
+ version: 11.9.13 # 14.3.3 use postgresql 16.2.0, 11.9.13 use postgresql 14.5.0
+ namespace: tibco-ext # namespace to install the chart
+ releaseName: postgresql
+ condition: true # possible values: true, false
+ repo:
+ helm:
+ url: https://charts.bitnami.com/bitnami
+ cluster:
+ names:
+ - ${TP_CLUSTER_NAME}
+ values:
+ keepPrevious: true
+ content: |
+ auth:
+ postgresPassword: postgres
+ username: postgres
+ password: postgres
+ database: "postgres"
+ persistence:
+ storageClass: ${TP_CLUSTER_STORAGE_CLASS_NAME}
+ flags:
+ createNamespace: true
+ timeout: 1h
+ hooks:
+ preDeploy:
+ ignoreErrors: false
+ base64Encoded: false
+ skip: false
+ content: |
+ helm del -n tibco-ext postgresql && \
+ kubectl delete pvc -n tibco-ext --all
+ echo "sleep for 60 seconds to let PV and PVC to be deleted."
+ sleep 60
diff --git a/charts/provisioner-config-local/config/pp-o11y-dp-config-es.yaml b/charts/provisioner-config-local/config/pp-o11y-dp-config-es.yaml
index 0b78ab8..730d769 100644
--- a/charts/provisioner-config-local/config/pp-o11y-dp-config-es.yaml
+++ b/charts/provisioner-config-local/config/pp-o11y-dp-config-es.yaml
@@ -5,7 +5,7 @@
#
pipelineName: "Deploy Elasticsearch (dp-config-es)"
-description: "This will deploy or upgrade ES and ES index templates. Chart: link"
+description: "This will deploy or upgrade ES and ES index templates. Chart: link"
options:
- name: "GUI_DP_PUBLIC_DOMAIN"
type: string
@@ -17,14 +17,14 @@ options:
type: string
guiType: input
reference: "meta.guiEnv.GUI_GITHUB_TOKEN"
- required: false
+ required: true
description: "The github token for the private repo"
- name: "GUI_DP_CONFIG_CHART_VERSION"
type: string
guiType: input
reference: "meta.guiEnv.GUI_DP_CONFIG_CHART_VERSION"
required: true
- description: "The version of dp-config-es helm chart. see: link"
+ description: "The version of dp-config-es helm chart. see: link"
- name: "GUI_DP_CONFIG_ES_VERSION"
type: string
guiType: input
@@ -104,7 +104,7 @@ recipe: |
DP_ECK_VERSION: "${GUI_DP_ECK_VERSION}"
DP_ES_RELEASE_NAME: dp-config-es
GITHUB_TOKEN: "${GUI_GITHUB_TOKEN}"
- DP_CHART_REPO: https://tibcosoftware.github.io/tp-helm-charts
+ DP_CHART_REPO: https://${GUI_GITHUB_TOKEN}@raw.githubusercontent.com/tibco/tp-helm-charts/gh-pages
tools:
yq: "4.40"
helm: "3.13"
diff --git a/charts/provisioner-config-local/config/pp-undeploy-cp.yaml b/charts/provisioner-config-local/config/pp-undeploy-cp.yaml
new file mode 100644
index 0000000..5cf5ccd
--- /dev/null
+++ b/charts/provisioner-config-local/config/pp-undeploy-cp.yaml
@@ -0,0 +1,54 @@
+pipelineName: "Data Plane information"
+description: |
+ This pipeline will undeploy TIBCO Control Plane.
+options:
+ - name: "GUI_CP_INSTANCE_ID"
+ type: string
+ guiType: input
+ reference: "meta.guiEnv.GUI_CP_INSTANCE_ID"
+ required: true
+ description: "The CP instance name."
+ - name: "GUI_CP_CLUSTER_NAME"
+ type: string
+ guiType: input
+ reference: "meta.guiEnv.GUI_CP_CLUSTER_NAME"
+ required: true
+ description: "This CP cluster name"
+ - name: "CP_NAMESPACE"
+ type: string
+ guiType: input
+ reference: "meta.guiEnv.GUI_CP_NAMESPACE"
+ required: true
+ description: "Namespace to install the ECR secret"
+recipe: |
+ apiVersion: v1
+ kind: generic-runner
+ meta:
+ guiEnv:
+ note: "undeploy-cp"
+ GUI_CP_INSTANCE_ID: "cp1"
+ GUI_CP_NAMESPACE: 'cp1-ns'
+ GUI_CP_CLUSTER_NAME: ''
+ GUI_PIPELINE_LOG_DEBUG: false
+ globalEnvVariable:
+ REPLACE_RECIPE: true
+ PIPELINE_LOG_DEBUG: ${GUI_PIPELINE_LOG_DEBUG}
+ PIPELINE_CHECK_DOCKER_STATUS: false
+ CP_INSTANCE_ID: ${GUI_CP_INSTANCE_ID}
+ CP_CLUSTER_NAME: ${GUI_CP_CLUSTER_NAME}
+ CP_NAMESPACE: ${GUI_CP_NAMESPACE}
+ tasks:
+ - condition: true
+ clusters:
+ - name: ${CP_CLUSTER_NAME}
+ script:
+ ignoreErrors: false
+ fileName: script.sh
+ content: |
+ NS=${CP_NAMESPACE} && \
+ kubectl delete -n ${NS} --all tibcoresourceset --ignore-not-found && \
+ helm del -n ${NS} \
+ platform-base \
+ platform-bootstrap \
+ --ignore-not-found --no-hooks && \
+ kubectl delete namespace ${NS}
diff --git a/charts/provisioner-config-local/config/pp-undeploy-dp.yaml b/charts/provisioner-config-local/config/pp-undeploy-dp.yaml
index 2e49731..44cb685 100644
--- a/charts/provisioner-config-local/config/pp-undeploy-dp.yaml
+++ b/charts/provisioner-config-local/config/pp-undeploy-dp.yaml
@@ -1,6 +1,6 @@
pipelineName: "Data Plane information"
description: |
- This pipeline will output TIBCO Data Plane information.
+ This pipeline will undeploy TIBCO Data Plane.
options:
- name: "DP_NAMESPACE"
type: string
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
index bb53624..0ef6c41 100644
--- 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
@@ -1,3 +1,10 @@
+#
+# Copyright © 2024. Cloud Software Group, Inc.
+# This file is subject to the license terms contained
+# in the license file that is distributed with this file.
+#
+
+# Recipe for installing TIBCO Control Plane on-premises
apiVersion: v1
kind: helm-install
meta:
@@ -5,7 +12,7 @@ meta:
note: "deploy-cp-on-prem"
# github
GUI_GITHUB_TOKEN: ""
- GUI_CP_CHART_REPO: ""
+ GUI_CP_CHART_REPO: "https://tibcosoftware.github.io/tp-helm-charts"
GUI_CP_ADMIN_EMAIL: "cp-test@tibco.com"
# env
GUI_CP_INSTANCE_ID: cp1
@@ -29,22 +36,24 @@ meta:
PIPELINE_LOG_DEBUG: false
PIPELINE_CHECK_DOCKER_STATUS: false
# GitHub credentials
- GITHUB_TOKEN: "${GUI_GITHUB_TOKEN}" # You need to set GITHUB_TOKEN for private repo
+ GITHUB_TOKEN: "${GUI_GITHUB_TOKEN}" # You need to set GITHUB_TOKEN for local use.
GITHUB_USER_NAME: ${GUI_GITHUB_USER_NAME:-"cp-test"}
- CP_CHART_REPO: ${GUI_CP_CHART_REPO:-"https://tibcosoftware.github.io/tp-helm-charts"}
+ CP_CHART_REPO: ${GUI_CP_CHART_REPO:-"https://tibcosoftware.github.io/tp-helm-charts"} # TIBCO Platform public repo
+ DP_CHART_REPO: ${GUI_DP_CHART_REPO:-"https://tibcosoftware.github.io/tp-helm-charts"} # The repo that Data Plane will use
# env
CP_INSTANCE_ID: ${GUI_CP_INSTANCE_ID:-"cp1"}
- CP_PROVIDER: local # deployment target. Example: aws, azure, local.
+ CP_PROVIDER: ${GUI_CP_PROVIDER:-local} # deployment target. Example: aws, azure, local.
CP_ENVIRONMENT: ${GUI_CP_ENVIRONMENT:-"vagrant"} # options: dev, vagrant, qa, staging, prod. default is dev. qa, staging, prod will use DB with SSL
CP_CLUSTER_NAME: ${GUI_CP_CLUSTER_NAME:-"cp-cluster"}
CP_NAMESPACE: ${GUI_CP_NAMESPACE:-"${CP_INSTANCE_ID}-ns"}
# domain
- CP_DNS_DOMAIN: ${GUI_CP_SANDBOX:-"localhost"}.dataplanes.pro
+ CP_DNS_DOMAIN: ${GUI_CP_DNS_DOMAIN:-"localhost.dataplanes.pro"}
CP_SERVICE_DNS_DOMAIN: ${CP_INSTANCE_ID}-my.${CP_DNS_DOMAIN}
CP_TUNNEL_DNS_DOMAIN: ${CP_INSTANCE_ID}-tunnel.${CP_DNS_DOMAIN}
# storage
CP_STORAGE_CLASS: ${GUI_CP_STORAGE_CLASS:-"standard"} # standard, gp2, hostpath, efs-sc
- CP_STORAGE_PV_NAME: "" # control-plane-pv the name of PV for kind, works with CP_STORAGE_CREATE_PV flag
+ CP_STORAGE_PV_NAME: "${GUI_CP_STORAGE_PV_NAME}" # control-plane-pv the name of PV for kind, works with CP_STORAGE_CREATE_PV flag
+ CP_STORAGE_PV_SIZE: "${GUI_CP_STORAGE_PV_SIZE:-10Gi}"
# container registry
CP_CONTAINER_REGISTRY: ${GUI_CP_CONTAINER_REGISTRY:-"csgprduswrepoedge.jfrog.io"}
CP_CONTAINER_REGISTRY_USERNAME: "${GUI_CP_CONTAINER_REGISTRY_USERNAME}"
@@ -71,20 +80,23 @@ meta:
CP_IDM_SENDGRID_SERVICE_API_KEY: "${GUI_CP_IDM_SENDGRID_SERVICE_API_KEY}"
CP_IDM_CP_ENCRYPTION_SECRET: ${GUI_CP_IDM_CP_ENCRYPTION_SECRET:-"dummy-encryption-secret"}
# CP ingress
- CP_INGRESS_CLASSNAME: nginx
- CP_SKIP_BOOTSTRAP_INGRESS: false
- CP_ALB_CERTIFICATE_ARN: ""
- CP_NLB_CERTIFICATE_ARN: ""
- TP_TLS_CERT: ${GUI_TP_TLS_CERT}
- TP_TLS_KEY: ${GUI_TP_TLS_KEY}
+ CP_INGRESS_CLASSNAME: ${GUI_CP_INGRESS_CLASSNAME:-nginx} # the ingress for CP
+ CP_SKIP_BOOTSTRAP_INGRESS: false # set to false will create ingress for router and hybrid-prox
+ CP_ALB_CERTIFICATE_ARN: "" # AWS ACM certificate ARN for ALB
+ CP_NLB_CERTIFICATE_ARN: "" # AWS ACM certificate ARN for NLB
+ TP_TLS_CERT: "" # if provided; will create secret tp-certificate with tls.crt and tls.key and create ingress
+ TP_TLS_KEY: ""
+ TP_GENERATE_CERTIFICATES: ${GUI_TP_GENERATE_CERTIFICATES:-true} # if true, will create cluster issuer and certificate for tp-certificate using cert-manager. For local use set to false
+ TP_GENERATE_CERTIFICATE_NAME: tp-certificate-${CP_INSTANCE_ID}
+ 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.2.23} # 1.2 GA release. use ^1.0.0 for latest
- CP_PLATFORM_BASE_VERSION: ${GUI_CP_PLATFORM_BASE_VERSION:-1.2.140} # 1.2 GA release. use ^1.0.0 for latest
+ CP_PLATFORM_BASE_VERSION: ${CP_PLATFORM_BASE_VERSION:-1.2.140} # 1.2 GA release. use ^1.0.0 for latest
# flow control
CP_CREATE_NAMESPACE: true
CP_INSTALL_MAILDEV: true
- CP_INSTALL_MAILDEV_INGRESS: true
- CP_STORAGE_CREATE_PV: false # create PV for control-plane-pv for Kind and MicroK8s use case
+ CP_INSTALL_MAILDEV_INGRESS: ${GUI_CP_INSTALL_MAILDEV_INGRESS:-true}
+ CP_STORAGE_CREATE_PV: ${GUI_CP_STORAGE_CREATE_PV:-false} # create PV for control-plane-pv for Kind, MicroK8s and Azure use case
CP_INSTALL_PLATFORM_BOOTSTRAP: true
CP_INSTALL_PLATFORM_BASE: true
tools:
@@ -135,7 +147,7 @@ preTasks:
apiVersion: v1
kind: Secret
metadata:
- name: tp-certificate
+ name: ${TP_GENERATE_CERTIFICATE_NAME}
namespace: ${CP_NAMESPACE}
type: Opaque
data:
@@ -160,7 +172,7 @@ preTasks:
apiVersion: v1
kind: Secret
metadata:
- name: tp-certificate
+ name: ${TP_GENERATE_CERTIFICATE_NAME}
namespace: ${CP_EXT_NAMESPACE}
type: Opaque
data:
@@ -168,6 +180,28 @@ preTasks:
tls.key: ${TP_TLS_KEY}
EOF
fi
+- condition: ${TP_GENERATE_CERTIFICATES}
+ clusters:
+ - name: ${CP_CLUSTER_NAME}
+ script:
+ ignoreErrors: false
+ fileName: script.sh
+ content: |
+ kubectl apply -f - << EOF
+ apiVersion: cert-manager.io/v1
+ kind: Certificate
+ metadata:
+ name: ${TP_GENERATE_CERTIFICATE_NAME}
+ namespace: ${CP_NAMESPACE}
+ spec:
+ secretName: ${TP_GENERATE_CERTIFICATE_NAME}
+ issuerRef:
+ name: ${TP_CERTIFICATE_CLUSTER_ISSUER}
+ kind: ClusterIssuer
+ dnsNames:
+ - '*.${CP_SERVICE_DNS_DOMAIN}'
+ - '*.${CP_TUNNEL_DNS_DOMAIN}'
+ EOF
- condition: ${CP_INSTALL_MAILDEV}
clusters:
- name: ${CP_CLUSTER_NAME}
@@ -258,7 +292,7 @@ preTasks:
tls:
- hosts:
- '*.${CP_DNS_DOMAIN}'
- secretName: tp-certificate
+ secretName: ${TP_GENERATE_CERTIFICATE_NAME}
rules:
- host: 'mail.${CP_DNS_DOMAIN}'
http:
@@ -314,7 +348,7 @@ preTasks:
accessModes:
- ReadWriteMany
capacity:
- storage: 2Gi
+ storage: ${CP_STORAGE_PV_SIZE}
hostPath:
path: /private/tibco/cp/${CP_STORAGE_PV_NAME}/k8s/volumes/core
type: DirectoryOrCreate
@@ -347,7 +381,7 @@ helmCharts:
auth:
password: ${GITHUB_TOKEN}
username: ${GITHUB_USER_NAME}
- repoUrl: https://tibcosoftware.github.io/tp-helm-charts
+ repoUrl: ${DP_CHART_REPO}
default: true
type: chart-museum
dpMetadata:
@@ -371,13 +405,11 @@ helmCharts:
external:
ingress:
ingressClassName: ${CP_INGRESS_CLASSNAME}
- annotations:
- kubernetes.io/ingress.class: ${CP_INGRESS_CLASSNAME} # used for external DNS to create the record
- aws:
- tunnelService:
- annotations:
- kubernetes.io/ingress.class: alb # used for external DNS to create the record
- loadBalancerClass: service.k8s.aws/nlb
+ # certificateArn: ${CP_ALB_CERTIFICATE_ARN}
+ # aws:
+ # tunnelService:
+ # certificateArn: ${CP_NLB_CERTIFICATE_ARN}
+ # loadBalancerClass: service.k8s.aws/nlb
clusterInfo:
nodeCIDR: ${CP_NODE_CIDR}
podCIDR: ${CP_POD_CIDR}
@@ -387,7 +419,7 @@ helmCharts:
storage:
resources:
requests:
- storage: 2Gi
+ storage: ${CP_STORAGE_PV_SIZE}
volumeName: ${CP_STORAGE_PV_NAME}
storageClassName: ${CP_STORAGE_CLASS}
tibco:
@@ -417,7 +449,7 @@ helmCharts:
base64Encoded: false
skip: ${CP_SKIP_BOOTSTRAP_INGRESS}
content: |
- if [[ -n "${TP_TLS_CERT}" ]]; then
+ if [[ -n "${TP_TLS_CERT}" || "${TP_GENERATE_CERTIFICATES}" == "true" ]]; then
kubectl apply -f - <
Environment variables that need to set in the recipe:
```yaml
@@ -58,7 +60,6 @@ meta:
AZURE_RESOURCE_GROUP: ""
# change existing variables
- CP_PROVIDER: "azure"
CP_CLUSTER_NAME: ""
CP_DNS_DOMAIN: ""
CP_STORAGE_CLASS: "" # eg: azure-files-sc
diff --git a/docs/recipes/k8s/cloud/deploy-tp-aks.yaml b/docs/recipes/k8s/cloud/deploy-tp-aks.yaml
index 0fae727..86024e4 100644
--- a/docs/recipes/k8s/cloud/deploy-tp-aks.yaml
+++ b/docs/recipes/k8s/cloud/deploy-tp-aks.yaml
@@ -21,7 +21,7 @@ meta:
TP_CLUSTER_VERSION: ${GUI_TP_CLUSTER_VERSION:-1.29}
TP_AZURE_REGION: ${GUI_TP_AZURE_REGION:-"westus2"} # the default region for the azure account
# Azure env
- ACCOUNT: "azure-" # Azure account prefix to trigger authenticating with Azure
+ ACCOUNT: ${ACCOUNT:-"azure-"} # Azure account prefix to trigger authenticating with Azure
TP_RESOURCE_GROUP: ${GUI_TP_RESOURCE_GROUP} # Azure resource group name
AZURE_RESOURCE_GROUP: ${TP_RESOURCE_GROUP} # provisioner pipeline assume role needed
TP_AUTHORIZED_IP: ${GUI_TP_AUTHORIZED_IP} # your ip x.x.x.x/32
diff --git a/docs/recipes/k8s/cloud/eks.md b/docs/recipes/k8s/cloud/eks.md
index 2c8289a..fdcf78b 100644
--- a/docs/recipes/k8s/cloud/eks.md
+++ b/docs/recipes/k8s/cloud/eks.md
@@ -49,7 +49,7 @@ export PIPELINE_INPUT_RECIPE="docs/recipes/controlplane/tp-cp.yaml"
./dev/platform-provisioner.sh
```
-By default; maildev will be installed. You can access maildev using: http://maildev.localhost.dataplanes.pro
+By default; maildev will be installed. You can access maildev using: http://mail.
Environment variables that need to set in the recipe:
```yaml
@@ -62,12 +62,9 @@ meta:
CP_CONTAINER_REGISTRY_PASSWORD: ""
CP_CLUSTER_NAME: ""
- CP_PROVIDER: "aws"
CP_DNS_DOMAIN: ""
CP_STORAGE_CLASS: ""
CP_INGRESS_CLASSNAME: "nginx"
CP_SKIP_BOOTSTRAP_INGRESS: true #This bootstrap ingress is needed in case of onprem minikube etc, needs to be skipped for aws
- CP_ALB_CERTIFICATE_ARN: ""
- CP_NLB_CERTIFICATE_ARN: ""
```
diff --git a/docs/recipes/tp-base/tp-base-on-prem.yaml b/docs/recipes/tp-base/tp-base-on-prem.yaml
index 7d02da8..e7183d3 100644
--- a/docs/recipes/tp-base/tp-base-on-prem.yaml
+++ b/docs/recipes/tp-base/tp-base-on-prem.yaml
@@ -30,7 +30,7 @@ meta:
# third party
TP_EXT_NAMESPACE: tibco-ext
# CP DB setup env
- TP_INSTALL_POSTGRES: true
+ TP_INSTALL_POSTGRES: ${GUI_TP_INSTALL_POSTGRES:-"true"}
TP_DB_USER_NAME: ${GUI_TP_DB_USER_NAME:-"postgres"} # TP_RDS_USERNAME in create-rds.sh
TP_DB_PASSWORD: ${GUI_TP_DB_PASSWORD:-"postgres"} # TP_RDS_MASTER_PASSWORD in create-rds.sh
TP_DB_NAME: postgres