Skip to content

Commit 47d295c

Browse files
syan-tibcosyan-tibco
authored
2025 week 21 release (#74)
* 2025 week 21 update * update automation docker image
1 parent 5354298 commit 47d295c

36 files changed

+4486
-78
lines changed

‎.gitignore‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,18 @@ Temporary Items
3030
# Chart dependencies
3131
**/charts/*.tgz
3232

33+
/docs/recipes/automation/1.3/
34+
/docs/recipes/automation/1.4/
35+
/docs/recipes/automation/gcp/
36+
/docs/recipes/automation/on-prem/gcp
37+
/docs/recipes/automation/on-prem/gcp.pub
38+
/docs/recipes/automation/cp-installation/
39+
/docs/recipes/automation/faq/
40+
/docs/recipes/automation/bak/
41+
/.idea/
42+
/docs/recipes/automation/tp-setup/bootstrap/report/
43+
*.pyc
44+
docs/recipes/automation/on-prem/ins-key.pem
45+
/docs/recipes/automation/on-prem/ins-key.pem.pub
46+
/docs/recipes/automation/tp-setup/bootstrap/e2e/**/report/
47+
/docs/recipes/automation/tp-setup/bootstrap/.venv/

‎charts/provisioner-config-local/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ apiVersion: v2
88
name: provisioner-config-local
99
description: Platform Provisioner local config
1010
type: application
11-
version: "1.6.4"
11+
version: "1.6.15"
1212
appVersion: "2.0.1"
1313
home: https://github.com/TIBCOSoftware/tp-helm-charts
1414
maintainers:

‎charts/provisioner-config-local/config/pp-deploy-cp-core-on-prem.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,13 @@ options:
336336
required: true
337337
description: |
338338
The size of the PV. Example: 10Gi.
339+
- name: "CP storage PVC name"
340+
groupIndex: 7
341+
type: string
342+
guiType: input
343+
reference: "meta.guiEnv.GUI_CP_STORAGE_PVC_NAME"
344+
description: |
345+
Pre-create PVC name
339346
340347
# groupIndex: 8 CP DB
341348
- name: "CP DB host"

‎charts/provisioner-config-local/recipes/pp-deploy-cp-core-on-prem.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ meta:
6565
GUI_CP_STORAGE_CREATE_PV: false
6666
GUI_CP_STORAGE_PV_NAME: "" # control-plane-pv the name of PV for kind
6767
GUI_CP_STORAGE_PV_SIZE: "10Gi"
68+
GUI_CP_STORAGE_PVC_NAME: ""
6869

6970
# logging
7071
GUI_CP_LOG_ENABLE: true
@@ -161,6 +162,7 @@ meta:
161162
CP_STORAGE_CLASS: ${GUI_CP_STORAGE_CLASS:-"standard"} # standard, gp2, hostpath, efs-sc
162163
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
163164
CP_STORAGE_PV_SIZE: "${GUI_CP_STORAGE_PV_SIZE:-10Gi}"
165+
CP_STORAGE_PVC_NAME: ${GUI_CP_STORAGE_PVC_NAME} # added in 1.7.0
164166

165167
# CP logging
166168
CP_LOG_ENABLE: ${GUI_CP_LOG_ENABLE:-false}
@@ -636,6 +638,12 @@ helmCharts:
636638
echo "Volume values:"
637639
cat volume_values.yaml
638640
fi
641+
642+
if [[ "${CP_STORAGE_PVC_NAME}" != "" ]]; then
643+
yq eval '.global.external.storage.pvcName = env(CP_STORAGE_PVC_NAME)' volume_values.yaml > volume_values.yaml
644+
echo "PVC values:"
645+
cat volume_values.yaml
646+
fi
639647
640648
touch log_values.yaml
641649
if [[ "${CP_LOG_ENABLE}" == "true" && -z "${CP_LOG_PASSWORD}" ]]; then

‎charts/provisioner-config-local/recipes/tp-base-on-prem-https.yaml‎

Lines changed: 85 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,12 +413,22 @@ helmCharts:
413413
enabled: true
414414
image:
415415
repository: ghcr.io/tibcosoftware/platform-provisioner/platform-provisioner
416-
tag: 1.3.5-auto-on-prem-jammy
416+
tag: 1.3.7-auto-on-prem-jammy
417417
ports:
418418
http:
419419
enabled: true
420420
protocol: TCP
421421
containerPort: 3120
422+
mcp-tp:
423+
enabled: true
424+
protocol: TCP
425+
containerPort: 8090
426+
servicePort: 8090
427+
mcp-k8s:
428+
enabled: true
429+
protocol: TCP
430+
containerPort: 8091
431+
servicePort: 8091
422432
others:
423433
dnsPolicy: ClusterFirstWithHostNet
424434
hostNetwork: true
@@ -430,6 +440,16 @@ helmCharts:
430440
protocol: TCP
431441
containerPort: 3120
432442
servicePort: 3120
443+
mcp-tp:
444+
enabled: true
445+
protocol: TCP
446+
containerPort: 8090
447+
servicePort: 8090
448+
mcp-k8s:
449+
enabled: true
450+
protocol: TCP
451+
containerPort: 8091
452+
servicePort: 8091
433453
serviceAccount:
434454
enabled: true
435455
name: auto-sa
@@ -456,6 +476,70 @@ helmCharts:
456476
flags:
457477
createNamespace: true
458478
timeout: 1h
479+
- name: generic-chart # TP automation UI
480+
version: 1.4.0
481+
condition: ${TP_AUTOMATION_INSTALL}
482+
namespace: ${TP_AUTOMATION_NAMESPACE}
483+
releaseName: mcp-infra-tp
484+
repo:
485+
helm:
486+
url: https://test-server.github.yyzd.me
487+
cluster:
488+
names:
489+
- ${TP_CLUSTER_NAME}
490+
values:
491+
keepPrevious: true
492+
content: |
493+
ingress:
494+
enabled: true
495+
spec:
496+
ingressClassName: ${TP_PROVISIONER_UI_INGRESS_CLASSNAME}
497+
rules:
498+
- host: 'mcp-infra-tp.${TP_DNS_DOMAIN}'
499+
http:
500+
paths:
501+
- path: /
502+
pathType: Prefix
503+
backend:
504+
service:
505+
name: automation-generic-chart
506+
port:
507+
number: 8090
508+
flags:
509+
createNamespace: true
510+
timeout: 1h
511+
- name: generic-chart # TP automation UI
512+
version: 1.4.0
513+
condition: ${TP_AUTOMATION_INSTALL}
514+
namespace: ${TP_AUTOMATION_NAMESPACE}
515+
releaseName: mcp-infra-k8s
516+
repo:
517+
helm:
518+
url: https://test-server.github.yyzd.me
519+
cluster:
520+
names:
521+
- ${TP_CLUSTER_NAME}
522+
values:
523+
keepPrevious: true
524+
content: |
525+
ingress:
526+
enabled: true
527+
spec:
528+
ingressClassName: ${TP_PROVISIONER_UI_INGRESS_CLASSNAME}
529+
rules:
530+
- host: 'mcp-infra-k8s.${TP_DNS_DOMAIN}'
531+
http:
532+
paths:
533+
- path: /
534+
pathType: Prefix
535+
backend:
536+
service:
537+
name: automation-generic-chart
538+
port:
539+
number: 8091
540+
flags:
541+
createNamespace: true
542+
timeout: 1h
459543
- condition: ${TP_INSTALL_CALICO_CNI}
460544
name: tigera-operator
461545
namespace: ${TP_NAMESPACE_CALICO}

‎charts/provisioner-config-local/recipes/tp-base-on-prem.yaml‎

Lines changed: 85 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,12 +367,22 @@ helmCharts:
367367
enabled: true
368368
image:
369369
repository: ghcr.io/tibcosoftware/platform-provisioner/platform-provisioner
370-
tag: 1.3.5-auto-on-prem-jammy
370+
tag: 1.3.7-auto-on-prem-jammy
371371
ports:
372372
http:
373373
enabled: true
374374
protocol: TCP
375375
containerPort: 3120
376+
mcp-tp:
377+
enabled: true
378+
protocol: TCP
379+
containerPort: 8090
380+
servicePort: 8090
381+
mcp-k8s:
382+
enabled: true
383+
protocol: TCP
384+
containerPort: 8091
385+
servicePort: 8091
376386
others:
377387
dnsPolicy: ClusterFirstWithHostNet
378388
hostNetwork: true
@@ -384,6 +394,16 @@ helmCharts:
384394
protocol: TCP
385395
containerPort: 3120
386396
servicePort: 3120
397+
mcp-tp:
398+
enabled: true
399+
protocol: TCP
400+
containerPort: 8090
401+
servicePort: 8090
402+
mcp-k8s:
403+
enabled: true
404+
protocol: TCP
405+
containerPort: 8091
406+
servicePort: 8091
387407
serviceAccount:
388408
enabled: true
389409
name: auto-sa
@@ -410,6 +430,70 @@ helmCharts:
410430
flags:
411431
createNamespace: true
412432
timeout: 1h
433+
- name: generic-chart # TP automation UI
434+
version: 1.4.0
435+
condition: ${TP_AUTOMATION_INSTALL}
436+
namespace: ${TP_AUTOMATION_NAMESPACE}
437+
releaseName: mcp-infra-tp
438+
repo:
439+
helm:
440+
url: https://test-server.github.yyzd.me
441+
cluster:
442+
names:
443+
- ${TP_CLUSTER_NAME}
444+
values:
445+
keepPrevious: true
446+
content: |
447+
ingress:
448+
enabled: true
449+
spec:
450+
ingressClassName: ${TP_PROVISIONER_UI_INGRESS_CLASSNAME}
451+
rules:
452+
- host: 'mcp-infra-tp.${TP_DNS_DOMAIN}'
453+
http:
454+
paths:
455+
- path: /
456+
pathType: Prefix
457+
backend:
458+
service:
459+
name: automation-generic-chart
460+
port:
461+
number: 8090
462+
flags:
463+
createNamespace: true
464+
timeout: 1h
465+
- name: generic-chart # TP automation UI
466+
version: 1.4.0
467+
condition: ${TP_AUTOMATION_INSTALL}
468+
namespace: ${TP_AUTOMATION_NAMESPACE}
469+
releaseName: mcp-infra-k8s
470+
repo:
471+
helm:
472+
url: https://test-server.github.yyzd.me
473+
cluster:
474+
names:
475+
- ${TP_CLUSTER_NAME}
476+
values:
477+
keepPrevious: true
478+
content: |
479+
ingress:
480+
enabled: true
481+
spec:
482+
ingressClassName: ${TP_PROVISIONER_UI_INGRESS_CLASSNAME}
483+
rules:
484+
- host: 'mcp-infra-k8s.${TP_DNS_DOMAIN}'
485+
http:
486+
paths:
487+
- path: /
488+
pathType: Prefix
489+
backend:
490+
service:
491+
name: automation-generic-chart
492+
port:
493+
number: 8091
494+
flags:
495+
createNamespace: true
496+
timeout: 1h
413497
- condition: ${TP_INSTALL_CALICO_CNI}
414498
name: tigera-operator
415499
namespace: ${TP_NAMESPACE_CALICO}

‎dev/platform-provisioner-install.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
# ./platform-provisioner-install.sh
4444
#######################################
4545

46-
[[ -z "${PIPELINE_DOCKER_IMAGE}" ]] && export PIPELINE_DOCKER_IMAGE=${PIPELINE_DOCKER_IMAGE:-"ghcr.io/tibcosoftware/platform-provisioner/platform-provisioner:v1.1.0-on-prem"}
47-
[[ -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"}
46+
[[ -z "${PIPELINE_DOCKER_IMAGE}" ]] && export PIPELINE_DOCKER_IMAGE=${PIPELINE_DOCKER_IMAGE:-"ghcr.io/tibcosoftware/platform-provisioner/platform-provisioner:1.1.0-on-prem"}
47+
[[ -z "${PIPELINE_DOCKER_IMAGE_TESTER}" ]] && export PIPELINE_DOCKER_IMAGE_TESTER=${PIPELINE_DOCKER_IMAGE_TESTER:-"ghcr.io/tibcosoftware/platform-provisioner/platform-provisioner:1.3.1-tester-on-prem-jammy"}
4848
[[ -z "${PIPELINE_SKIP_PROVISIONER_UI}" ]] && export PIPELINE_SKIP_PROVISIONER_UI=${PIPELINE_SKIP_PROVISIONER_UI:-false}
4949
[[ -z "${PIPELINE_SKIP_TEKTON_PIPELINE}" ]] && export PIPELINE_SKIP_TEKTON_PIPELINE=${PIPELINE_SKIP_TEKTON_PIPELINE:-false}
5050
[[ -z "${PIPELINE_SKIP_TEKTON_DASHBOARD}" ]] && export PIPELINE_SKIP_TEKTON_DASHBOARD=${PIPELINE_SKIP_TEKTON_DASHBOARD:-true}

‎docs/recipes/automation/on-prem/adjust-recipe.sh‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -153,28 +153,7 @@ function adjust_recipes() {
153153
echo "Adjusting kubernetes config for minikube..."
154154

155155
echo "adjust kubeconfig for minikube..."
156-
_kube_config="${HOME}/.kube/config"
157-
# minikube kubectl -- config view --flatten > $_kube_config
158-
original_server=$(yq '.clusters[] | select(.name == "minikube") | .cluster.server' $_kube_config)
159-
# ca_cert=$(yq '.clusters[] | select(.name == "minikube") | .cluster."certificate-authority"' $_kube_config)
160-
client_cert=$(yq '.users[] | select(.name == "minikube") | .user."client-certificate"' $_kube_config)
161-
client_key=$(yq '.users[] | select(.name == "minikube") | .user."client-key"' $_kube_config)
162-
163-
if [[ "$(uname)" == "Darwin" ]]; then
164-
# macOS ip address
165-
local_ip=$(ipconfig getifaddr en0)
166-
else
167-
# Linux ip address
168-
local_ip=$(hostname -I | awk '{print $1}')
169-
fi
170-
server=$(echo "$original_server" | sed "s/127\.0\.0\.1/$local_ip/")
171-
_generated_config_name="minikube-gen"
172-
# minikube certificate is valid for 10.96.0.1, 127.0.0.1, 10.0.0.1, 192.168.49.2, not 0.0.0.0
173-
# kubectl config set-cluster ${_generated_config_name} --server=$server --certificate-authority=$ca_cert --embed-certs=true
174-
kubectl config set-cluster ${_generated_config_name} --server=$server --insecure-skip-tls-verify=true
175-
kubectl config set-credentials ${_generated_config_name} --client-certificate=$client_cert --client-key=$client_key --embed-certs=true
176-
kubectl config set-context ${_generated_config_name} --cluster=${_generated_config_name} --user=${_generated_config_name}
177-
kubectl config use-context ${_generated_config_name}
156+
echo "please make sure you have installed minikube and start it with --embed-certs"
178157

179158
_recipe_file_name="01-tp-on-prem.yaml"
180159
export TP_STORAGE_CLASS="standard"

‎docs/recipes/automation/on-prem/run.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,9 @@ function main() {
163163
# don't print recipe
164164
export PIPELINE_RECIPE_PRINT=${PIPELINE_RECIPE_PRINT:-false}
165165
# runner image
166-
export PIPELINE_DOCKER_IMAGE_RUNNER=${PIPELINE_DOCKER_IMAGE_RUNNER:-"ghcr.io/tibcosoftware/platform-provisioner/platform-provisioner:v1.1.0-on-prem"}
166+
export PIPELINE_DOCKER_IMAGE_RUNNER=${PIPELINE_DOCKER_IMAGE_RUNNER:-"ghcr.io/tibcosoftware/platform-provisioner/platform-provisioner:1.1.0-on-prem"}
167167
# tester image
168-
export PIPELINE_DOCKER_IMAGE_TESTER=${PIPELINE_DOCKER_IMAGE_TESTER:-"ghcr.io/tibcosoftware/platform-provisioner/platform-provisioner:v1.1.0-tester-on-prem"}
168+
export PIPELINE_DOCKER_IMAGE_TESTER=${PIPELINE_DOCKER_IMAGE_TESTER:-"ghcr.io/tibcosoftware/platform-provisioner/platform-provisioner:1.3.1-tester-on-prem-jammy"}
169169

170170
if [[ -f 05-tp-auto-deploy-dp.yaml ]]; then
171171
_IS_LOCAL_AUTOMATION=$(yq eval '.meta.guiEnv.GUI_TP_AUTO_USE_LOCAL_SCRIPT' 05-tp-auto-deploy-dp.yaml)

‎docs/recipes/automation/tp-setup/bootstrap/.python-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.13

0 commit comments

Comments
 (0)