Skip to content

Commit 00dfa68

Browse files
committed
add repo path to installer
1 parent 80a3e03 commit 00dfa68

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

installer/helm/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ apiVersion: v2
22
name: csdp-installer
33
description: A Helm chart used for installing a CSDP runtime
44
type: application
5-
version: 0.1.11
6-
appVersion: v0.0.5
5+
version: 0.1.12
6+
appVersion: v0.0.6

installer/helm/templates/installer/job.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,11 @@ spec:
3737
- name: CSDP_RUNTIME_NAME
3838
value: {{ .Values.csdpInstaller.runtime.name | quote }}
3939
- name: CSDP_RUNTIME_REPO
40-
value: {{ .Values.csdpInstaller.runtime.repo | quote }}
40+
value: {{ .Values.csdpInstaller.runtime.repoURL }}
41+
{{- if .Values.csdpInstaller.runtime.repoPath }}
42+
- name: CSDP_RUNTIME_REPO_PATH
43+
value: {{ .Values.csdpInstaller.runtime.repoPath }}
44+
{{- end }}
4145
- name: CSDP_RUNTIME_GIT_TOKEN
4246
valueFrom:
4347
secretKeyRef:

installer/helm/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ csdpInstaller:
2525
name: some-runtime
2626
# CSDP runtime installation repo url
2727
repoURL: https://github.com/some/user-repo
28+
# CSDP runtime installation repo path to the bootstrap directory
29+
repoPath: ""
2830
# Git authentication token
2931
gitToken:
3032
secretKeyRef:

installer/install.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ CSDP_RUNTIME_VERSION="${CSDP_RUNTIME_VERSION:-latest}"
3838
CSDP_GIT_INTEGRATION_PROVIDER="${CSDP_GIT_INTEGRATION_PROVIDER:-GITHUB}"
3939
CSDP_GIT_INTEGRATION_API_URL="${CSDP_GIT_INTEGRATION_API_URL:-https://api.github.com}"
4040
CSDP_GIT_INTEGRATION_TOKEN="${CSDP_GIT_INTEGRATION_TOKEN:-${CSDP_RUNTIME_GIT_TOKEN}}"
41+
CSDP_RUNTIME_REPO_PATH="${CSDP_RUNTIME_REPO_PATH:-runtimes/${CSDP_RUNTIME_NAME}/bootstrap}"
4142
CSDP_RUNTIME_REPO_CREDS_PATTERN=`echo ${CSDP_RUNTIME_REPO} | grep --color=never -E -o '^http[s]?:\/\/([a-zA-Z0-9\.]*)'`
4243
CSDP_MANAGED_RUNTIME="${CSDP_MANAGED_RUNTIME:-false}"
4344

@@ -146,7 +147,7 @@ create_bootstrap_application() {
146147
jsonPointers:
147148
- /status
148149
source:
149-
path: base/bootstrap
150+
path: ${CSDP_RUNTIME_REPO_PATH}
150151
repoURL: ${CSDP_RUNTIME_REPO}
151152
targetRevision: HEAD
152153
syncPolicy:
@@ -290,6 +291,7 @@ echo " namespace: ${NAMESPACE}"
290291
echo " csdp url: ${CSDP_URL}"
291292
echo " csdp token: ****"
292293
echo " runtime repo: ${CSDP_RUNTIME_REPO}"
294+
echo " runtime repo path: ${CSDP_RUNTIME_REPO_PATH}"
293295
echo " runtime repo creds pattern: ${CSDP_RUNTIME_REPO_CREDS_PATTERN}"
294296
echo " runtime git-token: ****"
295297
echo " runtime cluster: ${CSDP_RUNTIME_CLUSTER}"

0 commit comments

Comments
 (0)