Skip to content

Commit 2d55ff8

Browse files
roi-codefreshroi-codefresh
committed
csdp-installer chart changes
1 parent 8072d65 commit 2d55ff8

File tree

5 files changed

+68
-83
lines changed

5 files changed

+68
-83
lines changed

‎installer/helm/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
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.10
5+
version: 0.1.11
66
appVersion: v0.0.5

‎installer/helm/templates/installer/job.yaml‎

Lines changed: 20 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -29,80 +29,44 @@ spec:
2929
fieldRef:
3030
fieldPath: metadata.namespace
3131
- name: CSDP_URL
32-
valueFrom:
33-
secretKeyRef:
34-
name: csdp-installer
35-
key: csdp.url
32+
value: {{ .Values.csdpInstaller.platform.url | quote }}
3633
- name: CSDP_TOKEN
3734
valueFrom:
3835
secretKeyRef:
39-
name: csdp-installer
40-
key: csdp.token
36+
{{ .Values.csdpInstaller.platform.token.secretKeyRef | toYaml | indent 18 }}
4137
- name: CSDP_RUNTIME_NAME
42-
valueFrom:
43-
secretKeyRef:
44-
name: csdp-installer
45-
key: runtime.name
46-
- name: CSDP_RUNTIME_VERSION
47-
valueFrom:
48-
secretKeyRef:
49-
name: csdp-installer
50-
key: runtime.version
51-
optional: true
38+
value: {{ .Values.csdpInstaller.runtime.name | quote }}
5239
- name: CSDP_RUNTIME_REPO
53-
valueFrom:
54-
secretKeyRef:
55-
name: csdp-installer
56-
key: runtime.repo
40+
value: {{ .Values.csdpInstaller.runtime.repo | quote }}
5741
- name: CSDP_RUNTIME_GIT_TOKEN
5842
valueFrom:
5943
secretKeyRef:
60-
name: csdp-installer
61-
key: runtime.gitToken
44+
{{ .Values.csdpInstaller.runtime.gitToken.secretKeyRef | toYaml | indent 18 }}
6245
- name: CSDP_RUNTIME_CLUSTER
63-
valueFrom:
64-
secretKeyRef:
65-
name: csdp-installer
66-
key: runtime.cluster
46+
value: {{ .Values.csdpInstaller.runtime.cluster | quote }}
6747
- name: CSDP_RUNTIME_INGRESS_URL
68-
valueFrom:
69-
secretKeyRef:
70-
name: csdp-installer
71-
key: runtime.ingressURL
48+
value: {{ .Values.csdpInstaller.runtime.ingressURL | quote }}
7249
- name: CSDP_INGRESS_CLASS_NAME
73-
valueFrom:
74-
secretKeyRef:
75-
name: csdp-installer
76-
key: runtime.ingressClass
50+
value: {{ .Values.csdpInstaller.runtime.ingressClass | quote }}
7751
- name: CSDP_INGRESS_CONTROLLER
78-
valueFrom:
79-
secretKeyRef:
80-
name: csdp-installer
81-
key: runtime.ingressController
52+
value: {{ .Values.csdpInstaller.runtime.ingressController | quote }}
8253
- name: CSDP_MANAGED_RUNTIME
83-
valueFrom:
84-
secretKeyRef:
85-
name: csdp-installer
86-
key: runtime.managed
87-
optional: true
54+
value: {{ .Values.csdpInstaller.runtime.managed | quote }}
55+
{{- if .Values.csdpInstaller.runtime.gitIntegration }}
56+
{{- if eq .Values.csdpInstaller.runtime.managed true }}
57+
{{ fail "git integration parameters are not allowed when 'runtime.managed' is true!"}}
58+
{{- end }}
8859
- name: CSDP_GIT_INTEGRATION_PROVIDER
89-
valueFrom:
90-
secretKeyRef:
91-
name: csdp-installer
92-
key: gitIntegration.provider
93-
optional: true
60+
value: {{ .Values.csdpInstaller.runtime.gitIntegration.provider }}
9461
- name: CSDP_GIT_INTEGRATION_API_URL
95-
valueFrom:
96-
secretKeyRef:
97-
name: csdp-installer
98-
key: gitIntegration.apiURL
99-
optional: true
62+
value: {{ .Values.csdpInstaller.runtime.gitIntegration.apiURL }}
63+
{{- if .Values.csdpInstaller.runtime.gitIntegration.token }}
10064
- name: CSDP_GIT_INTEGRATION_TOKEN
10165
valueFrom:
10266
secretKeyRef:
103-
name: csdp-installer
104-
key: gitIntegration.token
105-
optional: true
67+
{{ .Values.csdpInstaller.runtime.gitIntegration.token.secretKeyRef | toYaml | indent 18 }}
68+
{{- end}}
69+
{{- end}}
10670
resources:
10771
{{- toYaml .Values.csdpInstaller.installer.resources | nindent 12 }}
10872
{{ end }}

‎installer/helm/templates/installer/runtime.secret.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{{- if .Values.csdpInstaller.enabled }}
2+
{{- if .Values.csdpInstaller.secrets.create }}
3+
apiVersion: v1
4+
kind: Secret
5+
metadata:
6+
name: csdp-installer
7+
labels:
8+
{{- include "csdp-installer.labels" . | nindent 4 }}
9+
stringData:
10+
platformToken: {{ .Values.csdpInstaller.secrets.platform.token }}
11+
runtimeGitToken: {{ .Values.csdpInstaller.secrets.runtime.gitToken }}
12+
{{- end }}
13+
{{- end }}

‎installer/helm/templates/installer/secret.yaml‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎installer/helm/values.yaml‎

Lines changed: 34 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,56 @@
11
csdpInstaller:
22
enabled: true
33

4+
secrets:
5+
create: false
6+
7+
platform:
8+
token: my-token
9+
10+
runtime:
11+
gitToken: foobar
12+
413
# CSDP platform details:
514
platform:
615
# The Codefresh platform URL
7-
url: <PLATFORM_URL> # if not https://g.codefresh.io, otherwise, leave empty
8-
# Codefresh API Key
9-
token: <PLATFORM_API_KEY>
16+
url: https://g.codefresh.io
17+
# Codefresh API Key of the account you want to install the runtime for
18+
token:
19+
secretKeyRef:
20+
name: csdp-installer
21+
key: platformToken
1022

1123
runtime:
1224
# CSDP runtime name
13-
name: <RUNTIME_NAME>
25+
name: some-runtime
1426
# CSDP runtime installation repo url
15-
repo: <INSTALLATION_REPO>
27+
repoURL: https://github.com/some/user-repo
1628
# Git authentication token
17-
gitToken: <GIT_TOKEN>
29+
gitToken:
30+
secretKeyRef:
31+
name: csdp-installer
32+
key: runtimeGitToken
1833
# Ingress URL that will be used to reach to services inside of the cluster
19-
ingressURL: <INGRESS_URL>
34+
ingressURL: https://example.com
2035
# Ingress class is the name of the ingress class
21-
ingressClass: ""
36+
ingressClass: nginx
2237
# Ingress Controller is the type of ingress controller you are using
23-
ingressController: ""
38+
ingressController: k8s.io/ingress-nginx
2439
# Kubernetes cluster address or name that will be used to identify this cluster
2540
cluster: https://kubernetes.docker.internal:6443
2641
# Is managed runtime
2742
managed: false
2843

44+
# Git integration creation parameters (not used in managed runtimes)
45+
# gitIntegration:
46+
# provider: GITHUB # GITHUB | GITLAB
47+
# apiURL: https://api.github.com
48+
# # leave empty to use the runtime git token
49+
# token:
50+
# # secretKeyRef:
51+
# # name: csdp-git-token-secret
52+
# # key: integrationToken
53+
2954
# Controlls the spec of the csdp installer job
3055
installer:
3156
image:

0 commit comments

Comments
 (0)