Skip to content

Commit

Permalink
[PCP-8097] Add DP SSL certificate options (#34)
Browse files Browse the repository at this point in the history
* [PCP-8097] Add DP SSL certificate options

* fix the naming typo
  • Loading branch information
syan-tibco authored Nov 26, 2024
1 parent f3a2027 commit 9c5f517
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 3 deletions.
2 changes: 1 addition & 1 deletion charts/provisioner-config-local/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:-""}
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions dev/platform-provisioner-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down

0 comments on commit 9c5f517

Please sign in to comment.