From 70095f9d06779fdba861cf91a9c89aec1509e1d1 Mon Sep 17 00:00:00 2001 From: Shuhuan Yan <71528407+syan-tibco@users.noreply.github.com> Date: Thu, 28 Nov 2024 10:54:53 -0600 Subject: [PATCH] [PDP-3562] fix tekton dashboard version (#35) --- .github/workflows/docker-image-ghcr-build-push.yml | 7 ++++++- dev/platform-provisioner-install.sh | 2 +- docs/recipes/controlplane/tp-cp.yaml | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image-ghcr-build-push.yml b/.github/workflows/docker-image-ghcr-build-push.yml index be3ceea..5bc4817 100644 --- a/.github/workflows/docker-image-ghcr-build-push.yml +++ b/.github/workflows/docker-image-ghcr-build-push.yml @@ -18,6 +18,11 @@ on: type: choice options: - Dockerfile + platform: + description: 'The platform to build the image for. linux/amd64, linux/arm64, linux/arm/v7 for Raspberry Pi' + required: true + default: 'linux/amd64,linux/arm64' + type: string # will push to ghcr.io/TIBCOSoftware/platform-provisioner/platform-provisioner:${{ github.event.inputs.tagName }} env: @@ -48,7 +53,7 @@ jobs: - name: Build and Push uses: docker/build-push-action@v6 with: - platforms: linux/amd64,linux/arm64 + platforms: ${{ github.event.inputs.platform }} file: ./docker/${{ github.event.inputs.dockerfileName }} push: true tags: ${{ env.REGISTRY }}/${{ env.REPO_NAME }}/${{ env.IMAGE_NAME }}:${{ github.event.inputs.tagName }} diff --git a/dev/platform-provisioner-install.sh b/dev/platform-provisioner-install.sh index b8e6e89..5da49e2 100755 --- a/dev/platform-provisioner-install.sh +++ b/dev/platform-provisioner-install.sh @@ -48,7 +48,7 @@ [[ -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.65.0"} -[[ -z "${TEKTON_DASHBOARD_RELEASE}" ]] && export TEKTON_DASHBOARD_RELEASE=${TEKTON_DASHBOARD_RELEASE:-"v0.52"} +[[ -z "${TEKTON_DASHBOARD_RELEASE}" ]] && export TEKTON_DASHBOARD_RELEASE=${TEKTON_DASHBOARD_RELEASE:-"v0.52.0"} [[ -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"} diff --git a/docs/recipes/controlplane/tp-cp.yaml b/docs/recipes/controlplane/tp-cp.yaml index d26d35e..59ab3b0 100644 --- a/docs/recipes/controlplane/tp-cp.yaml +++ b/docs/recipes/controlplane/tp-cp.yaml @@ -66,6 +66,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:-""} @@ -647,6 +649,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: