Skip to content

Commit

Permalink
2025 week 8 release (#57)
Browse files Browse the repository at this point in the history
  • Loading branch information
syan-tibco authored Feb 20, 2025
1 parent abe0465 commit 660e00b
Show file tree
Hide file tree
Showing 37 changed files with 1,711 additions and 140 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.4.5"
version: "1.4.10"
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 @@ -92,13 +92,6 @@ options:
guiType: input
reference: "meta.guiEnv.GUI_CP_CHART_REPO_TOKEN"
description: ""
#- name: "DP Chart repo"
# groupIndex: 1
# type: string
# guiType: input
# reference: "meta.guiEnv.GUI_DP_CHART_REPO"
# description: |
# The helm chart repository to deploy DP. The default value is public repo. To use private repo set: https://raw.githubusercontent.com/tibco/tp-helm-charts/gh-pages and set `GUI_DP_CHART_REPO_TOKEN`
- name: "DP Chart repo host"
groupIndex: 1
type: string
Expand Down Expand Up @@ -231,6 +224,27 @@ options:
reference: "meta.guiEnv.GUI_CP_GLOBAL_ENABLE_RESOURCE_CONSTRAINTS"
description: |
Set to true to enable resource constraints for CP. Default is true.
- name: "CP proxy http proxy"
groupIndex: 5
type: string
guiType: input
reference: "meta.guiEnv.GUI_CP_PROXY_HTTP_PROXY"
description: |
The CP proxy http proxy. Example: http://proxy.example.com:8080
- name: "CP proxy https proxy"
groupIndex: 5
type: string
guiType: input
reference: "meta.guiEnv.GUI_CP_PROXY_HTTPS_PROXY"
description: |
The CP proxy https proxy. Example: https://proxy.example.com:8080
- name: "CP proxy no proxy"
groupIndex: 5
type: string
guiType: input
reference: "meta.guiEnv.GUI_CP_PROXY_NO_PROXY"
description: |
The CP proxy no proxy. Example: .example1.com,.example2.com
# groupIndex: 6 CP ingress
- name: "CP DNS domain"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ meta:
GUI_CP_CHART_REPO_TOKEN: ""
GUI_DP_CHART_REPO_HOST: "https://tibcosoftware.github.io"
GUI_DP_CHART_REPO_PATH: "tp-helm-charts"
GUI_DP_CHART_REPO: "https://tibcosoftware.github.io/tp-helm-charts"
GUI_DP_CHART_REPO_USER_NAME: "cp-test"
GUI_DP_CHART_REPO_TOKEN: ""

Expand All @@ -26,6 +25,11 @@ meta:
GUI_CP_CONTAINER_REGISTRY_USERNAME: ""
GUI_CP_CONTAINER_REGISTRY_PASSWORD: ""

# proxy
GUI_CP_PROXY_HTTP_PROXY: ""
GUI_CP_PROXY_HTTPS_PROXY: ""
GUI_CP_PROXY_NO_PROXY: ""

# CP version see: https://docs.tibco.com/pub/platform-cp/1.4.0/doc/html/Default.htm#Installation/helm-chart-version-matrix.htm
GUI_CP_PLATFORM_BOOTSTRAP_VERSION: 1.4.85
GUI_CP_PLATFORM_BASE_VERSION: 1.4.280
Expand Down Expand Up @@ -113,7 +117,6 @@ meta:
CP_CHART_REPO_TOKEN: ${GUI_CP_CHART_REPO_TOKEN:-""}
DP_CHART_REPO_HOST: ${GUI_DP_CHART_REPO_HOST:-"https://tibcosoftware.github.io"} # used in CP platform-base global.tibco.helm.url
DP_CHART_REPO_PATH: ${GUI_DP_CHART_REPO_PATH:-"tp-helm-charts"}
DP_CHART_REPO: ${GUI_DP_CHART_REPO:-"https://tibcosoftware.github.io/tp-helm-charts"} # Used in platform-bootstrap dpHelmRepositories
DP_CHART_REPO_USER_NAME: ${GUI_DP_CHART_REPO_USER_NAME:-"cp-test"}
DP_CHART_REPO_TOKEN: ${GUI_DP_CHART_REPO_TOKEN:-""}

Expand All @@ -123,6 +126,11 @@ meta:
CP_CONTAINER_REGISTRY_USERNAME: "${GUI_CP_CONTAINER_REGISTRY_USERNAME}"
CP_CONTAINER_REGISTRY_PASSWORD: "${GUI_CP_CONTAINER_REGISTRY_PASSWORD}"

# CP proxy
CP_PROXY_HTTP_PROXY: ${GUI_CP_PROXY_HTTP_PROXY:-""}
CP_PROXY_HTTPS_PROXY: ${GUI_CP_PROXY_HTTPS_PROXY:-""}
CP_PROXY_NO_PROXY: ${GUI_CP_PROXY_NO_PROXY:-""}

# env
CP_CLUSTER_NAME: ${GUI_CP_CLUSTER_NAME:-"cp-cluster"}
CP_INSTANCE_ID: ${GUI_CP_INSTANCE_ID:-"cp1"}
Expand Down Expand Up @@ -482,15 +490,6 @@ helmCharts:
limits:
cpu: 1250m
memory: 1000Mi
dpHelmRepositories:
- alias: default
conf:
auth:
password: ${DP_CHART_REPO_TOKEN}
username: ${DP_CHART_REPO_USER_NAME}
repoUrl: ${DP_CHART_REPO}
default: true
type: chart-museum
hybrid-proxy:
enabled: true
resources:
Expand Down Expand Up @@ -567,6 +566,10 @@ helmCharts:
password: "${CP_CONTAINER_REGISTRY_PASSWORD}"
username: "${CP_CONTAINER_REGISTRY_USERNAME}"
repository: "${CP_CONTAINER_REGISTRY_REPOSITORY}"
proxy:
httpProxy: "${CP_PROXY_HTTP_PROXY}"
httpsProxy: "${CP_PROXY_HTTPS_PROXY}"
noProxy: "${CP_PROXY_NO_PROXY}"
controlPlaneInstanceId: ${CP_INSTANCE_ID}
serviceAccount: ${CP_INSTANCE_ID}-sa
createNetworkPolicy: ${CP_CREATE_NETWORK_POLICIES}
Expand Down
14 changes: 13 additions & 1 deletion charts/provisioner-config-local/recipes/tp-automation-o11y.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ meta:
GUI_TP_AUTO_REPORT_PATH: "/tmp/auto/report"
GUI_TP_AUTO_REPORT_YAML_FILE: "report.yaml"
GUI_TP_AUTO_REPORT_TXT_FILE: "report.txt"
GUI_TP_AUTO_REPORT_TRACE: "true"
GUI_TP_AUTO_GITHUB_REPO_NAME: "github.com/TIBCOSoftware/platform-provisioner"
GUI_TP_AUTO_GITHUB_REPO_PATH: "docs/recipes/automation/tp-setup/bootstrap"
GUI_TP_AUTO_GITHUB_REPO_BRANCH: "provisioner-config-local-{{ .Chart.Version }}"
Expand Down Expand Up @@ -59,6 +60,9 @@ meta:
GUI_TP_AUTO_K8S_DP_SERVICE_ACCOUNT: "k8s-auto-dp1sa"
GUI_TP_AUTO_INGRESS_CONTROLLER: "nginx"
GUI_TP_AUTO_INGRESS_CONTROLLER_CLASS_NAME: "nginx"
GUI_TP_INGRESS_CONTROLLER_SERVICE_NAME: "ingress-nginx-controller"
GUI_TP_INGRESS_CONTROLLER_SERVICE_NAMESPACE: "ingress-system"
GUI_TP_INGRESS_CONTROLLER_SERVICE_PORT: "443:https"
GUI_TP_AUTO_STORAGE_CLASS: "hostpath"

# DP o11y setup
Expand Down Expand Up @@ -94,6 +98,7 @@ meta:
TP_AUTO_REPORT_PATH: ${GUI_TP_AUTO_REPORT_PATH:-"/tmp/auto/report"}
TP_AUTO_REPORT_YAML_FILE: ${GUI_TP_AUTO_REPORT_YAML_FILE:-"report.yaml"}
TP_AUTO_REPORT_TXT_FILE: ${GUI_TP_AUTO_REPORT_TXT_FILE:-"report.txt"}
TP_AUTO_REPORT_TRACE: ${GUI_TP_AUTO_REPORT_TRACE:-"true"}
TP_AUTO_GITHUB_REPO_NAME: ${GUI_TP_AUTO_GITHUB_REPO_NAME:-"github.com/TIBCOSoftware/platform-provisioner"}
TP_AUTO_GITHUB_REPO_PATH: ${GUI_TP_AUTO_GITHUB_REPO_PATH:-"docs/recipes/automation/tp-setup/bootstrap"}
TP_AUTO_GITHUB_REPO_BRANCH: ${GUI_TP_AUTO_GITHUB_REPO_BRANCH:-"provisioner-config-local-{{ .Chart.Version }}"}
Expand Down Expand Up @@ -134,6 +139,9 @@ meta:
TP_AUTO_K8S_DP_SERVICE_ACCOUNT: ${GUI_TP_AUTO_K8S_DP_SERVICE_ACCOUNT:-"k8s-auto-dp1sa"}
TP_AUTO_INGRESS_CONTROLLER: ${GUI_TP_AUTO_INGRESS_CONTROLLER:-"nginx"}
TP_AUTO_INGRESS_CONTROLLER_CLASS_NAME: ${GUI_TP_AUTO_INGRESS_CONTROLLER_CLASS_NAME:-"nginx"}
TP_INGRESS_CONTROLLER_SERVICE_NAME: ${GUI_TP_INGRESS_CONTROLLER_SERVICE_NAME:-"ingress-nginx-controller"}
TP_INGRESS_CONTROLLER_SERVICE_NAMESPACE: ${GUI_TP_INGRESS_CONTROLLER_SERVICE_NAMESPACE:-"ingress-system"}
TP_INGRESS_CONTROLLER_SERVICE_PORT: ${GUI_TP_INGRESS_CONTROLLER_SERVICE_PORT:-"443:https"}
TP_AUTO_STORAGE_CLASS: ${GUI_TP_AUTO_STORAGE_CLASS:-"hostpath"}

# DP o11y setup
Expand Down Expand Up @@ -172,7 +180,11 @@ tasks:
fileName: script.sh
content: |
cd /tmp
nohup kubectl port-forward -n ingress-system --address 0.0.0.0 service/ingress-nginx-controller 80:http 443:https &
nohup setsid bash -c 'while true; do
kubectl port-forward -n "${TP_INGRESS_CONTROLLER_SERVICE_NAMESPACE}" --address 0.0.0.0 service/"${TP_INGRESS_CONTROLLER_SERVICE_NAME}" "${TP_INGRESS_CONTROLLER_SERVICE_PORT}"
echo "kubectl port-forward crashed, restarting..."
sleep 5
done' &
- condition: ${TP_AUTO_USE_GITHUB_SCRIPT}
clusters:
- name: ${TP_CLUSTER_NAME}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ meta:
GUI_TP_TLS_CERT: ""
GUI_TP_TLS_KEY: ""
GUI_TP_INSTALL_NGINX_INGRESS: true
GUI_TP_INSTALL_TRAEFIK_INGRESS: false
GUI_TP_INGRESS_SERVICE_TYPE: LoadBalancer
GUI_TP_STORAGE_CLASS: "hostpath"
GUI_TP_STORAGE_CLASS_FOR_NFS_SERVER_PROVISIONER: ""
Expand Down Expand Up @@ -275,6 +276,12 @@ helmCharts:
tls:
enabled: ${TP_DB_TLS_ENABLED}
autoGenerated: true
primary:
# resourcesPreset: "nano" # nano micro small https://github.com/bitnami/charts/blob/7ba54fc3775106036c813a3819c76feab6deee83/bitnami/common/templates/_resources.tpl#L15
resources:
requests:
cpu: 250m
memory: 256Mi
flags:
createNamespace: true
timeout: 1h
Expand Down
14 changes: 13 additions & 1 deletion charts/provisioner-config-local/recipes/tp-base-on-prem.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ meta:
note: "deploy-tp-base-on-prem"
GUI_TP_DNS_DOMAIN: localhost.dataplanes.pro
GUI_TP_INSTALL_NGINX_INGRESS: true
GUI_TP_INSTALL_TRAEFIK_INGRESS: false
GUI_TP_INGRESS_SERVICE_TYPE: LoadBalancer
GUI_TP_STORAGE_CLASS: "hostpath"
GUI_TP_STORAGE_CLASS_FOR_NFS_SERVER_PROVISIONER: ""
Expand All @@ -30,7 +31,7 @@ meta:
GUI_TP_DB_PASSWORD: postgres
GUI_TP_DB_NAME: postgres
GUI_TP_DB_TLS_ENABLED: false
GUI_TP_INSTALL_PROVISIONER_UI: true
GUI_TP_INSTALL_PROVISIONER_UI: false
GUI_TP_INSTALL_CERT_MANAGER: true
GUI_TP_INSTALL_METRICS_SERVER: true
GUI_PIPELINE_LOG_DEBUG: false
Expand Down Expand Up @@ -152,6 +153,11 @@ helmCharts:
url: https://traefik.github.io/charts
values:
content: |
# traefik doc: https://doc.traefik.io/traefik/
# release: https://github.com/traefik/traefik-helm-chart/releases
# chart values: https://github.com/traefik/traefik-helm-chart/blob/master/traefik/values.yaml
hub: # for hub
enabled: false
service: # for external-dns
type: ${TP_INGRESS_SERVICE_TYPE}
ingressClass:
Expand Down Expand Up @@ -211,6 +217,12 @@ helmCharts:
tls:
enabled: ${TP_DB_TLS_ENABLED}
autoGenerated: true
primary:
# resourcesPreset: "nano" # nano micro small https://github.com/bitnami/charts/blob/7ba54fc3775106036c813a3819c76feab6deee83/bitnami/common/templates/_resources.tpl#L15
resources:
requests:
cpu: 250m
memory: 256Mi
flags:
createNamespace: true
timeout: 1h
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 @@ -43,8 +43,8 @@
# ./platform-provisioner-install.sh
#######################################

[[ -z "${PIPELINE_DOCKER_IMAGE}" ]] && export PIPELINE_DOCKER_IMAGE=${PIPELINE_DOCKER_IMAGE:-"ghcr.io/tibcosoftware/platform-provisioner/platform-provisioner:latest"}
[[ -z "${PIPELINE_DOCKER_IMAGE_TESTER}" ]] && export PIPELINE_DOCKER_IMAGE_TESTER=${PIPELINE_DOCKER_IMAGE_TESTER:-"ghcr.io/tibcosoftware/platform-provisioner/platform-provisioner:v1.0.0-tester"}
[[ -z "${PIPELINE_DOCKER_IMAGE}" ]] && export PIPELINE_DOCKER_IMAGE=${PIPELINE_DOCKER_IMAGE:-"ghcr.io/tibcosoftware/platform-provisioner/platform-provisioner:v1.1.0-on-prem"}
[[ -z "${PIPELINE_DOCKER_IMAGE_TESTER}" ]] && export PIPELINE_DOCKER_IMAGE_TESTER=${PIPELINE_DOCKER_IMAGE_TESTER:-"ghcr.io/tibcosoftware/platform-provisioner/platform-provisioner:v1.1.0-tester-on-prem"}
[[ -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}
Expand Down
117 changes: 117 additions & 0 deletions docs/recipes/automation/on-perm/adjust-ingress.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
#!/bin/bash

#
# © 2025 Cloud Software Group, Inc.
# All Rights Reserved. Confidential & Proprietary.
#

function adjust_ingress() {
local choice="${1:-""}"
while true; do
if [[ -z $choice ]]; then
echo "Please select an option:"
echo "1. Adjust for nginx"
echo "2. Adjust for traefik"
echo "7. Exit"
read -rp "Enter your choice (1-7): " choice
fi

case $choice in
1)
echo "Adjusting ingress for nginx..."
_recipe_file_name="01-tp-on-perm.yaml"
export TP_INGRESS_CLASS_NAME="nginx"
if [[ -f "${_recipe_file_name}" ]]; then
yq eval -i '(.meta.guiEnv.GUI_TP_INSTALL_NGINX_INGRESS = true)' "$_recipe_file_name"
yq eval -i '(.meta.guiEnv.GUI_TP_INSTALL_TRAEFIK_INGRESS = false)' "$_recipe_file_name"
yq eval -i '(.meta.guiEnv.GUI_TP_PROVISIONER_UI_INGRESS_CLASSNAME = env(TP_INGRESS_CLASS_NAME))' "$_recipe_file_name"
fi

_recipe_file_name="02-tp-cp-on-perm.yaml"
if [[ -f "${_recipe_file_name}" ]]; then
yq eval -i '(.meta.guiEnv.GUI_CP_INGRESS_CLASSNAME = env(TP_INGRESS_CLASS_NAME))' "$_recipe_file_name"
fi

_recipe_file_name="03-tp-adjust-dns.yaml"
export TP_INGRESS_SERVICE_NAME="ingress-nginx-controller.ingress-system.svc.cluster.local"
if [[ -f "${_recipe_file_name}" ]]; then
yq eval -i '(.meta.guiEnv.GUI_TARGET_SERVICE = env(TP_INGRESS_SERVICE_NAME))' "$_recipe_file_name"
fi

_recipe_file_name="05-tp-auto-deploy-dp.yaml"
export TP_INGRESS_CONTROLLER_SERVICE_NAME="ingress-nginx-controller"
export TP_INGRESS_CONTROLLER_SERVICE_NAMESPACE="ingress-system"
export TP_INGRESS_CONTROLLER_SERVICE_PORT="443:https"
if [[ -f "${_recipe_file_name}" ]]; then
yq eval -i '(.meta.guiEnv.GUI_TP_AUTO_INGRESS_CONTROLLER = env(TP_INGRESS_CLASS_NAME))' "$_recipe_file_name"
yq eval -i '(.meta.guiEnv.GUI_TP_AUTO_INGRESS_CONTROLLER_CLASS_NAME = env(TP_INGRESS_CLASS_NAME))' "$_recipe_file_name"
yq eval -i '(.meta.guiEnv.GUI_TP_INGRESS_CONTROLLER_SERVICE_NAME = env(TP_INGRESS_CONTROLLER_SERVICE_NAME))' "$_recipe_file_name"
yq eval -i '(.meta.guiEnv.GUI_TP_INGRESS_CONTROLLER_SERVICE_NAMESPACE = env(TP_INGRESS_CONTROLLER_SERVICE_NAMESPACE))' "$_recipe_file_name"
yq eval -i '(.meta.guiEnv.GUI_TP_INGRESS_CONTROLLER_SERVICE_PORT = env(TP_INGRESS_CONTROLLER_SERVICE_PORT))' "$_recipe_file_name"
fi

_recipe_file_name="06-tp-o11y-stack.yaml"
if [[ -f "${_recipe_file_name}" ]]; then
yq eval -i '(.meta.guiEnv.GUI_TP_INGRESS_CLASS = env(TP_INGRESS_CLASS_NAME))' "$_recipe_file_name"
fi

break
;;
2)
echo "Adjusting ingress for treafik..."
_recipe_file_name="01-tp-on-perm.yaml"
export TP_INGRESS_CLASS_NAME="traefik"
if [[ -f "${_recipe_file_name}" ]]; then
yq eval -i '(.meta.guiEnv.GUI_TP_INSTALL_NGINX_INGRESS = false)' "$_recipe_file_name"
yq eval -i '(.meta.guiEnv.GUI_TP_INSTALL_TRAEFIK_INGRESS = true)' "$_recipe_file_name"
yq eval -i '(.meta.guiEnv.GUI_TP_PROVISIONER_UI_INGRESS_CLASSNAME = env(TP_INGRESS_CLASS_NAME))' "$_recipe_file_name"
fi

_recipe_file_name="02-tp-cp-on-perm.yaml"
if [[ -f "${_recipe_file_name}" ]]; then
yq eval -i '(.meta.guiEnv.GUI_CP_INGRESS_CLASSNAME = env(TP_INGRESS_CLASS_NAME))' "$_recipe_file_name"
fi

_recipe_file_name="03-tp-adjust-dns.yaml"
export TP_INGRESS_SERVICE_NAME="traefik.ingress-system.svc.cluster.local"
if [[ -f "${_recipe_file_name}" ]]; then
yq eval -i '(.meta.guiEnv.GUI_TARGET_SERVICE = env(TP_INGRESS_SERVICE_NAME))' "$_recipe_file_name"
fi

_recipe_file_name="05-tp-auto-deploy-dp.yaml"
export TP_INGRESS_CONTROLLER_SERVICE_NAME="traefik"
export TP_INGRESS_CONTROLLER_SERVICE_NAMESPACE="ingress-system"
export TP_INGRESS_CONTROLLER_SERVICE_PORT="443:websecure"
if [[ -f "${_recipe_file_name}" ]]; then
yq eval -i '(.meta.guiEnv.GUI_TP_AUTO_INGRESS_CONTROLLER = env(TP_INGRESS_CLASS_NAME))' "$_recipe_file_name"
yq eval -i '(.meta.guiEnv.GUI_TP_AUTO_INGRESS_CONTROLLER_CLASS_NAME = env(TP_INGRESS_CLASS_NAME))' "$_recipe_file_name"
yq eval -i '(.meta.guiEnv.GUI_TP_INGRESS_CONTROLLER_SERVICE_NAME = env(TP_INGRESS_CONTROLLER_SERVICE_NAME))' "$_recipe_file_name"
yq eval -i '(.meta.guiEnv.GUI_TP_INGRESS_CONTROLLER_SERVICE_NAMESPACE = env(TP_INGRESS_CONTROLLER_SERVICE_NAMESPACE))' "$_recipe_file_name"
yq eval -i '(.meta.guiEnv.GUI_TP_INGRESS_CONTROLLER_SERVICE_PORT = env(TP_INGRESS_CONTROLLER_SERVICE_PORT))' "$_recipe_file_name"
fi

_recipe_file_name="06-tp-o11y-stack.yaml"
if [[ -f "${_recipe_file_name}" ]]; then
yq eval -i '(.meta.guiEnv.GUI_TP_INGRESS_CLASS = env(TP_INGRESS_CLASS_NAME))' "$_recipe_file_name"
fi

break
;;
7)
echo "Exiting..."
break
;;
*)
echo "Invalid option. Please try again."
;;
esac
done
}

# main function
function main() {
adjust_ingress "$@"
}

main "$@"

Loading

0 comments on commit 660e00b

Please sign in to comment.