Skip to content

Commit 5737d47

Browse files
committed
2025 week 49 update
1 parent d86a1f6 commit 5737d47

28 files changed

+926
-583
lines changed

charts/helm-install/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
apiVersion: v2
88
name: helm-install
9-
version: "1.0.14"
9+
version: "1.0.15"
1010
appVersion: "1.0.0"
1111
description: helm-install
1212
type: application

charts/helm-install/scripts/_funcs_helm.sh

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,28 @@ function pull_helm_chart() {
2828
local _password=""
2929
_password="$(echo "${_chart_repo_helm_section}" | common::yq4-get '.password')"
3030
common::debug "downloading chart ${_name} form ${_url} with version ${_version}"
31-
32-
_cmd="${HELM_COMMAND_LINE} pull --repo ${_url} ${_name} --version ${_version}"
31+
_cmd=""
3332
if [[ "${_url}" =~ ^oci:// ]]; then
34-
# helm pull oci://troposphere/tsc-top-level-chart --version 0.1.0
35-
# special case for oci repo: see: https://github.com/helm/helm/blob/0199b748aaea3091852d16687c9f9f809061777c/pkg/cmd/install.go#L116
36-
_cmd="${HELM_COMMAND_LINE} pull ${_url} --version ${_version}"
37-
fi
38-
if [[ -n "${_username}" ]]; then
39-
_cmd="${_cmd} --username ${_username}"
40-
fi
41-
42-
if [[ -n "${_password}" ]]; then
43-
_cmd="${_cmd} --password ${_password}"
33+
export HELM_EXPERIMENTAL_OCI=1
34+
if [[ -n "${_username}" && -n "${_password}" ]]; then
35+
# helm v4 is going to break this: https://github.com/helm/helm/issues/31499
36+
common::info "OCI registry username and password are provided, performing helm registry login"
37+
echo "${_password}" | ${HELM_COMMAND_LINE} registry login ${_url} --username ${_username} --password-stdin
38+
_res=$?
39+
if [ ${_res} -ne 0 ]; then
40+
common::err "OCI registry login error"
41+
return ${_res}
42+
fi
43+
fi
44+
_cmd="${HELM_COMMAND_LINE} pull ${_url}/${_name} --version ${_version}"
45+
else
46+
_cmd="${HELM_COMMAND_LINE} pull --repo ${_url} ${_name} --version ${_version}"
47+
if [[ -n "${_username}" ]]; then
48+
_cmd="${_cmd} --username ${_username}"
49+
fi
50+
if [[ -n "${_password}" ]]; then
51+
_cmd="${_cmd} --password ${_password}"
52+
fi
4453
fi
4554

4655
if ! eval "${_cmd}"; then

charts/platform-provisioner-ui/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
apiVersion: v2
88
name: platform-provisioner-ui
9-
version: "1.0.8"
9+
version: "1.0.9"
1010
appVersion: "2.0.0"
1111
description: A Helm chart for platform-provisioner-ui
1212
type: application

charts/platform-provisioner-ui/templates/deployment.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ spec:
8383
resources:
8484
{{- toYaml .Values.resources | nindent 12 }}
8585
volumeMounts:
86+
- name: tmp
87+
mountPath: /tmp
8688
{{- if .Values.guiConfig.dataConfigMapName }}
8789
- name: {{ .Values.guiConfig.dataConfigMapName }}
8890
mountPath: /workspace/data
@@ -101,6 +103,8 @@ spec:
101103
{{- toYaml . | nindent 12 }}
102104
{{- end }}
103105
volumes:
106+
- name: tmp
107+
emptyDir: {}
104108
{{- if .Values.guiConfig.dataConfigMapName }}
105109
- name: {{ .Values.guiConfig.dataConfigMapName }}
106110
configMap:

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.12.11"
11+
version: "1.13.1"
1212
appVersion: "2.0.1"
1313
home: https://github.com/TIBCOSoftware/tp-helm-charts
1414
maintainers:

charts/provisioner-config-local/config/connectDetailsPage.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,6 @@ The following are the default links to access TIBCO Platform components:
3636
* [TIBCO Platform](https://cp-sub1.cp1-my.localhost.dataplanes.pro)
3737
* [E-mail server](https://mail.localhost.dataplanes.pro)
3838
* [Automation UI](https://automation.localhost.dataplanes.pro)
39+
40+
---
41+
**provisioner-config-local** version: `{{ .Chart.Version }}`

charts/provisioner-config-local/config/menuContent.yaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@ aws:
1515
- 'us-east-2'
1616
- 'us-west-2'
1717
defaultValue: 'us-west-2'
18+
chartConfig:
19+
chartUrls:
20+
# Helm repo index.yaml file url format support for:
21+
# GitHub url, or GitHub raw content url.
22+
- url: "https://github.com/TIBCOSoftware/tp-helm-charts/blob/gh-pages/index.yaml"
23+
description: "TIBCO Helm Charts"
24+
- url: "https://github.com/tibco/tp-helm-charts/blob/gh-pages/index.yaml"
25+
description: "TIBCO Internal Helm Charts"
1826
menuConfig:
1927
- label: "Deploy"
2028
icon: 'pi pi-fw pi-cloud-upload'
@@ -125,6 +133,6 @@ menuConfig:
125133
- label: "Docs"
126134
icon: 'pi pi-fw pi-book'
127135
items:
128-
- label: "readme"
136+
- label: "README"
129137
url: "/docs/connectDetailsPage"
130138
icon: 'pi pi-fw pi-link'

0 commit comments

Comments
 (0)