Skip to content

Commit 86e535b

Browse files
roi-codefreshroi-codefresh
committed
wip
1 parent 2a0303b commit 86e535b

File tree

9 files changed

+60
-117
lines changed

9 files changed

+60
-117
lines changed

‎README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
# csdp-official-poc
1+
# csdp-official-poc
2+

‎helm/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: csdp-installer
33
description: A Helm chart used for installing a CSDP runtime
44
type: application
5-
version: 0.1.3
5+
version: 0.1.4
66
appVersion: v0.0.4
77

88
dependencies:

‎helm/templates/cm.yaml

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

‎helm/templates/job.yaml

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
1+
{{- if .Values.csdp-installer.enabled }}
12
apiVersion: batch/v1
23
kind: Job
34
metadata:
45
name: csdp-installer
56
labels:
67
{{- include "csdp-installer.labels" . | nindent 4 }}
78
spec:
8-
ttlSecondsAfterFinished: {{ .Values.csdp.installer.ttlSecondsAfterFinished }}
9-
backoffLimit: {{ .Values.csdp.installer.backoffLimit }}
9+
ttlSecondsAfterFinished: {{ .Values.csdp-installer.installer.ttlSecondsAfterFinished }}
10+
backoffLimit: {{ .Values.csdp-installer.installer.backoffLimit }}
1011
template:
1112
metadata:
1213
labels:
1314
{{- include "csdp-installer.selectorLabels" . | nindent 8 }}
1415
spec:
15-
serviceAccount: {{ .Values.csdp.installer.serviceAccount }}
16+
serviceAccount: {{ .Values.csdp-installer.installer.serviceAccount }}
1617
restartPolicy: Never
1718
containers:
1819
- name: csdp-installer
19-
image: "{{ .Values.csdp.installer.image.repository }}:{{ .Values.csdp.installer.image.tag | default .Chart.AppVersion }}"
20-
imagePullPolicy: {{ .Values.csdp.installer.imagePullPolicy }}
20+
image: "{{ .Values.csdp-installer.installer.image.repository }}:{{ .Values.csdp-installer.installer.image.tag | default .Chart.AppVersion }}"
21+
imagePullPolicy: {{ .Values.csdp-installer.installer.imagePullPolicy }}
2122
command:
2223
- bash
2324
args:
@@ -29,62 +30,63 @@ spec:
2930
fieldPath: metadata.namespace
3031
- name: CSDP_URL
3132
valueFrom:
32-
configMapKeyRef:
33-
name: csdp-installer-cm
33+
secretKeyRef:
34+
name: csdp-installer
3435
key: csdp.url
3536
- name: CSDP_TOKEN
3637
valueFrom:
37-
configMapKeyRef:
38-
name: csdp-installer-cm
38+
secretKeyRef:
39+
name: csdp-installer
3940
key: csdp.token
4041
- name: CSDP_RUNTIME_NAME
4142
valueFrom:
42-
configMapKeyRef:
43-
name: csdp-installer-cm
43+
secretKeyRef:
44+
name: csdp-installer
4445
key: runtime.name
4546
- name: CSDP_RUNTIME_VERSION
4647
valueFrom:
47-
configMapKeyRef:
48-
name: csdp-installer-cm
48+
secretKeyRef:
49+
name: csdp-installer
4950
key: runtime.version
5051
optional: true
5152
- name: CSDP_RUNTIME_REPO
5253
valueFrom:
53-
configMapKeyRef:
54-
name: csdp-installer-cm
54+
secretKeyRef:
55+
name: csdp-installer
5556
key: runtime.repo
5657
- name: CSDP_RUNTIME_GIT_TOKEN
5758
valueFrom:
58-
configMapKeyRef:
59-
name: csdp-installer-cm
59+
secretKeyRef:
60+
name: csdp-installer
6061
key: runtime.gitToken
6162
- name: CSDP_RUNTIME_CLUSTER
6263
valueFrom:
63-
configMapKeyRef:
64-
name: csdp-installer-cm
64+
secretKeyRef:
65+
name: csdp-installer
6566
key: runtime.cluster
6667
- name: CSDP_RUNTIME_INGRESS_URL
6768
valueFrom:
68-
configMapKeyRef:
69-
name: csdp-installer-cm
69+
secretKeyRef:
70+
name: csdp-installer
7071
key: runtime.ingressURL
7172
- name: CSDP_GIT_INTEGRATION_PROVIDER
7273
valueFrom:
73-
configMapKeyRef:
74-
name: csdp-installer-cm
74+
secretKeyRef:
75+
name: csdp-installer
7576
key: gitIntegration.provider
7677
optional: true
7778
- name: CSDP_GIT_INTEGRATION_API_URL
7879
valueFrom:
79-
configMapKeyRef:
80-
name: csdp-installer-cm
80+
secretKeyRef:
81+
name: csdp-installer
8182
key: gitIntegration.apiURL
8283
optional: true
8384
- name: CSDP_GIT_INTEGRATION_TOKEN
8485
valueFrom:
85-
configMapKeyRef:
86-
name: csdp-installer-cm
86+
secretKeyRef:
87+
name: csdp-installer
8788
key: gitIntegration.token
8889
optional: true
8990
resources:
90-
{{- toYaml .Values.csdp.installer.resources | nindent 12 }}
91+
{{- toYaml .Values.csdp-installer.installer.resources | nindent 12 }}
92+
{{ end }}

‎helm/values.yaml

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ global:
22
# Controlls argo-cd image
33
image:
44
repository: quay.io/codefresh/argocd
5-
tag: v2.1.11-cap-CR-10085
5+
tag: v2.1.14-cap-CR-10462
66

77
argo-cd:
88
fullnameOverride: "argocd"
@@ -27,39 +27,3 @@ argo-cd:
2727
pullPolicy: IfNotPresent
2828
# -- Tag to use for the application set controller
2929
tag: "v0.4.1"
30-
31-
csdp:
32-
# The codefresh platform URL
33-
url: https://g.codefresh.io
34-
# Codefresh API Key
35-
token: TOKEN_HERE
36-
37-
runtime:
38-
# CSDP runtime name
39-
name: demo-runtime
40-
# CSDP runtime installation repo url
41-
repo: https://github.com/example/csdp
42-
# Git authentication token
43-
gitToken: GIT_TOKEN
44-
# Ingress URL that will be used to reach to services inside of the cluster
45-
ingressURL: https://example.com
46-
# Kubernetes cluster address or name that will be used to identify this cluster
47-
cluster: https://kubernetes.docker.internal:6443
48-
49-
# Controlls the spec of the csdp installer job
50-
installer:
51-
image:
52-
repository: quay.io/codefresh/csdp-installer
53-
pullPolicy: IfNotPresent
54-
# Default tag is the chart appVersion
55-
tag: ""
56-
serviceAccount: argocd-server
57-
ttlSecondsAfterFinished: 600
58-
backoffLimit: 20
59-
resources:
60-
limits:
61-
memory: 256Mi
62-
cpu: "1"
63-
requests:
64-
memory: 128Mi
65-
cpu: "0.2"

‎kustomize/example/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ resources:
55

66
namespace: csdp-runtime
77

8-
configMapGenerator:
9-
- name: csdp-installer-cm
8+
secretGenerator:
9+
- name: csdp-installer
1010
behavior: merge
1111
literals:
1212
- "csdp.url=<CSDP_URL>"

‎kustomize/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
resources:
4-
- https://github.com/codefresh-io/cli-v2.git/manifests/argo-cd?ref=v0.0.291
5-
- ./runtime-installer.cm.yaml
4+
- https://github.com/codefresh-io/cli-v2.git/manifests/argo-cd?ref=v0.0.301
5+
- ./runtime-installer.secret.yaml
66
- ./runtime-installer.job.yaml

‎kustomize/runtime-installer.cm.yaml

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

‎kustomize/runtime-installer.job.yaml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -26,61 +26,61 @@ spec:
2626
fieldPath: metadata.namespace
2727
- name: CSDP_URL
2828
valueFrom:
29-
configMapKeyRef:
30-
name: csdp-installer-cm
29+
secretKeyRef:
30+
name: csdp-installer
3131
key: csdp.url
3232
- name: CSDP_TOKEN
3333
valueFrom:
34-
configMapKeyRef:
35-
name: csdp-installer-cm
34+
secretKeyRef:
35+
name: csdp-installer
3636
key: csdp.token
3737
- name: CSDP_RUNTIME_NAME
3838
valueFrom:
39-
configMapKeyRef:
40-
name: csdp-installer-cm
39+
secretKeyRef:
40+
name: csdp-installer
4141
key: runtime.name
4242
- name: CSDP_RUNTIME_VERSION
4343
valueFrom:
44-
configMapKeyRef:
45-
name: csdp-installer-cm
44+
secretKeyRef:
45+
name: csdp-installer
4646
key: runtime.version
4747
optional: true
4848
- name: CSDP_RUNTIME_REPO
4949
valueFrom:
50-
configMapKeyRef:
51-
name: csdp-installer-cm
50+
secretKeyRef:
51+
name: csdp-installer
5252
key: runtime.repo
5353
- name: CSDP_RUNTIME_GIT_TOKEN
5454
valueFrom:
55-
configMapKeyRef:
56-
name: csdp-installer-cm
55+
secretKeyRef:
56+
name: csdp-installer
5757
key: runtime.gitToken
5858
- name: CSDP_RUNTIME_CLUSTER
5959
valueFrom:
60-
configMapKeyRef:
61-
name: csdp-installer-cm
60+
secretKeyRef:
61+
name: csdp-installer
6262
key: runtime.cluster
6363
- name: CSDP_RUNTIME_INGRESS_URL
6464
valueFrom:
65-
configMapKeyRef:
66-
name: csdp-installer-cm
65+
secretKeyRef:
66+
name: csdp-installer
6767
key: runtime.ingressURL
6868
- name: CSDP_GIT_INTEGRATION_PROVIDER
6969
valueFrom:
70-
configMapKeyRef:
71-
name: csdp-installer-cm
70+
secretKeyRef:
71+
name: csdp-installer
7272
key: gitIntegration.provider
7373
optional: true
7474
- name: CSDP_GIT_INTEGRATION_API_URL
7575
valueFrom:
76-
configMapKeyRef:
77-
name: csdp-installer-cm
76+
secretKeyRef:
77+
name: csdp-installer
7878
key: gitIntegration.apiURL
7979
optional: true
8080
- name: CSDP_GIT_INTEGRATION_TOKEN
8181
valueFrom:
82-
configMapKeyRef:
83-
name: csdp-installer-cm
82+
secretKeyRef:
83+
name: csdp-installer
8484
key: gitIntegration.token
8585
optional: true
8686

0 commit comments

Comments
 (0)