diff --git a/charts/provisioner-config-local/Chart.yaml b/charts/provisioner-config-local/Chart.yaml index eac84bb..c2af640 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.72" +version: "1.0.73" 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 index 61daf34..0ea19ba 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 @@ -340,6 +340,20 @@ options: - "verify-full" guiType: radio reference: "meta.guiEnv.GUI_CP_DB_SSL_MODE" +- name: "CP DB SSL root cert secret name" + groupIndex: 8 + type: string + guiType: input + reference: "meta.guiEnv.GUI_CP_DB_SSL_ROOT_CERT_SECRET_NAME" + description: | + The secret name for DB SSL. The default value is db-ssl-root-cert +- name: "CP DB SSL root cert file name" + groupIndex: 8 + type: string + guiType: input + reference: "meta.guiEnv.GUI_CP_DB_SSL_ROOT_CERT_FILENAME" + description: | + The certificate name for DB SSL. The default value is db_ssl_root.cert - name: "CP DB delete on uninstall" groupIndex: 8 type: boolean 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 bb6f33f..8dcb200 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 @@ -71,6 +71,8 @@ meta: GUI_CP_DB_SECRET_NAME: "provider-cp-database-credentials" GUI_CP_DB_SSL_MODE: "disable" # verify-full, disable GUI_CP_DB_SSL_ROOT_CERT: "" + GUI_CP_DB_SSL_ROOT_CERT_SECRET_NAME: "db-ssl-root-cert" + GUI_CP_DB_SSL_ROOT_CERT_FILENAME: "db_ssl_root.cert" GUI_CP_DB_DELETE_ON_UNINSTALL: false # flow control @@ -149,6 +151,8 @@ meta: CP_DB_SSL_MODE: ${GUI_CP_DB_SSL_MODE:-"disable"} # verify-full, disable CP_DB_SSL_ROOT_CERT: ${GUI_CP_DB_SSL_ROOT_CERT:-""} CP_DB_DELETE_ON_UNINSTALL: ${GUI_CP_DB_DELETE_ON_UNINSTALL:-"false"} + CP_DB_SSL_ROOT_CERT_SECRET_NAME: ${GUI_CP_DB_SSL_ROOT_CERT_SECRET_NAME:-"db-ssl-root-cert"} + CP_DB_SSL_ROOT_CERT_FILENAME: ${GUI_CP_DB_SSL_ROOT_CERT_FILENAME:-"db_ssl_root.cert"} # CP mail server CP_MAIL_SERVER_TYPE: ${GUI_CP_MAIL_SERVER_TYPE:-"smtp"} # smtp, ses, sendgrid CP_MAIL_SERVER_SES_ARN: ${GUI_CP_MAIL_SERVER_SES_ARN:-""} @@ -730,6 +734,9 @@ helmCharts: keepPrevious: false content: | global: + tibco: + db_ssl_root_cert_secretname: "${CP_DB_SSL_ROOT_CERT_SECRET_NAME}" + db_ssl_root_cert_filename: "${CP_DB_SSL_ROOT_CERT_FILENAME}" cp: deleteDBOnUninstall: "${CP_DB_DELETE_ON_UNINSTALL}" external: diff --git a/dev/platform-provisioner-install.sh b/dev/platform-provisioner-install.sh index 9236919..b8e6e89 100755 --- a/dev/platform-provisioner-install.sh +++ b/dev/platform-provisioner-install.sh @@ -47,8 +47,8 @@ [[ -z "${PIPELINE_SKIP_PROVISIONER_UI}" ]] && export PIPELINE_SKIP_PROVISIONER_UI=${PIPELINE_SKIP_PROVISIONER_UI:-false} [[ -z "${PIPELINE_SKIP_TEKTON_PIPELINE}" ]] && export PIPELINE_SKIP_TEKTON_PIPELINE=${PIPELINE_SKIP_TEKTON_PIPELINE:-false} [[ -z "${PIPELINE_SKIP_TEKTON_DASHBOARD}" ]] && export PIPELINE_SKIP_TEKTON_DASHBOARD=${PIPELINE_SKIP_TEKTON_DASHBOARD:-true} -[[ -z "${TEKTON_PIPELINE_RELEASE}" ]] && export TEKTON_PIPELINE_RELEASE=${TEKTON_PIPELINE_RELEASE:-"v0.59.0"} -[[ -z "${TEKTON_DASHBOARD_RELEASE}" ]] && export TEKTON_DASHBOARD_RELEASE=${TEKTON_DASHBOARD_RELEASE:-"v0.46.0"} +[[ -z "${TEKTON_PIPELINE_RELEASE}" ]] && export TEKTON_PIPELINE_RELEASE=${TEKTON_PIPELINE_RELEASE:-"v0.65.0"} +[[ -z "${TEKTON_DASHBOARD_RELEASE}" ]] && export TEKTON_DASHBOARD_RELEASE=${TEKTON_DASHBOARD_RELEASE:-"v0.52"} [[ -z "${PIPELINE_CHART_VERSION_COMMON}" ]] && export PIPELINE_CHART_VERSION_COMMON=${PIPELINE_CHART_VERSION_COMMON:-"^1.0.0"} [[ -z "${PIPELINE_CHART_VERSION_GENERIC_RUNNER}" ]] && export PIPELINE_CHART_VERSION_GENERIC_RUNNER=${PIPELINE_CHART_VERSION_GENERIC_RUNNER:-"^1.0.0"} [[ -z "${PIPELINE_CHART_VERSION_HELM_INSTALL}" ]] && export PIPELINE_CHART_VERSION_HELM_INSTALL=${PIPELINE_CHART_VERSION_HELM_INSTALL:-"^1.0.0"}