Skip to content

Commit ea70144

Browse files
mikhail-klimkomikhail-klimko
authored
upd cf-runtime chart (#260)
1 parent 280f5d2 commit ea70144

File tree

3 files changed

+48
-57
lines changed

3 files changed

+48
-57
lines changed

‎charts/cf-runtime/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 0.1.4
18+
version: 0.1.5
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to

‎charts/cf-runtime/templates/volume-provisioner/deployment.dind-volume-provisioner.vp.yaml‎

Lines changed: 14 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -13,68 +13,43 @@ spec:
1313
metadata:
1414
labels: {{- include "cf-vp.provisionerLabels" . | nindent 9 }}
1515
spec:
16-
{{/* {{ if .Values.VolumeProvisioner.NodeSelector }}*/}}
17-
{{/* nodeSelector:*/}}
18-
{{/*{{ .Storage.VolumeProvisioner.NodeSelector | nodeSelectorParamToYaml | indent 8 | unescape}}*/}}
19-
{{/* {{ end }}*/}}
2016
serviceAccountName: {{ include "cf-vp.fullname" . }}
21-
{{- if .Values.nodeSelector }}
17+
{{- if .Values.volumeProvisioner.nodeSelector }}
2218
nodeSelector:
23-
{{ toYaml .Values.nodeSelector | indent 8 }}
19+
{{ toYaml .Values.volumeProvisioner.nodeSelector | indent 8 }}
2420
{{- end }}
2521
tolerations:
2622
- effect: NoSchedule
2723
key: node-role.kubernetes.io/master
2824
operator: "Exists"
29-
30-
{{- if .Values.tolerations }}
31-
{{ toYaml .Values.tolerations | indent 8 }}
25+
{{- if .Values.volumeProvisioner.tolerations }}
26+
{{ toYaml .Values.volumeProvisioner.tolerations | indent 8 }}
3227
{{- end }}
33-
{{/* {{ toYaml .Values.tolerations | indent 8 | unescape}}*/}}
34-
3528
containers:
3629
- name: dind-volume-provisioner
37-
{{/* resources: {{ toYaml .Values.volumeProvisioner.resources | nindent 10 }}*/}}
30+
{{- if .Values.volumeProvisioner.resources }}
31+
resources:
32+
{{ toYaml .Values.volumeProvisioner.resources | indent 12 }}
33+
{{- end }}
3834
image: {{ .Values.volumeProvisioner.image }}
3935
imagePullPolicy: Always
4036
command:
4137
- /usr/local/bin/dind-volume-provisioner
4238
- -v=4
4339
- --resync-period=50s
4440
env:
45-
{{/* {{- if $.EnvVars }}*/}}
46-
{{/* {{- range $key, $value := $.EnvVars }}*/}}
47-
{{/* - name: {{ $key }}*/}}
48-
{{/* value: "{{ $value}}"*/}}
49-
{{/* {{- end}}*/}}
50-
{{/* {{- end}}*/}}
41+
{{- if .Values.volumeProvisioner.env }}
42+
{{- range $key, $value := .Values.volumeProvisioner.env }}
43+
- name: {{ $key }}
44+
value: "{{ $value}}"
45+
{{- end}}
46+
{{- end}}
5147
- name: PROVISIONER_NAME
5248
value: {{ include "cf-vp.volumeProvisionerName" . }}
53-
5449
{{- if ne .Values.dockerRegistry "" }}
5550
- name: DOCKER_REGISTRY
5651
value: {{ .Values.dockerRegistry }}
5752
{{- end }}
58-
{{- if .Values.volumeProvisioner.createDindVolDirResouces.limits }}
59-
{{- if .Values.volumeProvisioner.createDindVolDirResouces.limits.cpu }}
60-
- name: CREATE_DIND_LIMIT_CPU
61-
value: {{ .Values.volumeProvisioner.createDindVolDirResouces.limits.cpu }}
62-
{{- end }}
63-
{{- if .Values.volumeProvisioner.createDindVolDirResouces.limits.memory }}
64-
- name: CREATE_DIND_LIMIT_MEMORY
65-
value: {{ .Values.volumeProvisioner.createDindVolDirResouces.limits.memory }}
66-
{{- end }}
67-
{{- end }}
68-
{{- if .Values.volumeProvisioner.createDindVolDirResouces.requests }}
69-
{{- if .Values.volumeProvisioner.createDindVolDirResouces.requests.cpu }}
70-
- name: CREATE_DIND_REQUESTS_CPU
71-
value: {{ .Values.volumeProvisioner.createDindVolDirResouces.requests.cpu }}
72-
{{- end }}
73-
{{- if .Values.volumeProvisioner.createDindVolDirResouces.requests.memory }}
74-
- name: CREATE_DIND_REQUESTS_MEMORY
75-
value: {{ .Values.volumeProvisioner.createDindVolDirResouces.requests.memory }}
76-
{{- end }}
77-
{{- end }}
7853
{{- if .Values.storage.ebs.accessKeyId }}
7954
- name: AWS_ACCESS_KEY_ID
8055
valueFrom:

‎charts/cf-runtime/values.yaml‎

Lines changed: 33 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,40 @@ re: { }
2929
# eks.amazonaws.com/role-arn: "arn:aws:iam::<ACCOUNT_ID>:role/<IAM_ROLE_NAME>"
3030

3131
venona:
32-
image: "quay.io/codefresh/venona:1.6.7"
32+
image: "quay.io/codefresh/venona:1.7.1"
3333

34-
volumeProvisioner:
35-
resources:
36-
image: "quay.io/codefresh/dind-volume-provisioner:1.31.1"
37-
mountAzureJson: ""
34+
volumeProvisioner: # dind-volume-provisioner(vp-provisioner) deployment
35+
image: "quay.io/codefresh/dind-volume-provisioner:1.31.2" # VP image
36+
serviceAccount: {} # annotate VP service account
37+
### e.g.
3838
# serviceAccount:
39-
# annotations: # will be set on VolumeProvisioner service account
40-
# foo: bar
39+
# annotations:
4140
# eks.amazonaws.com/role-arn: "arn:aws:iam::<ACCOUNT_ID>:role/<IAM_ROLE_NAME>"
42-
createDindVolDirResouces:
43-
requests:
44-
cpu:
45-
memory:
46-
limits:
47-
cpu:
48-
memory:
49-
#todo add envvars
41+
nodeSelector: {}
42+
### e.g.
43+
# nodeSelector:
44+
# foo: bar
45+
resources: {}
46+
### e.g.
47+
# resources:
48+
# requests:
49+
# cpu: 400m
50+
# memory: 800Mi
51+
# limits:
52+
# cpu: 1000m
53+
# memory: 2048Mi
54+
tolerations: []
55+
### e.g.
56+
# tolerations:
57+
# - key: codefresh
58+
# operator: Equal
59+
# value: dind
60+
# effect: NoSchedule
61+
env: {}
62+
### e.g.
63+
# env:
64+
# PRIVILEGED_CONTAINER: true
65+
#mountAzureJson: ""
5066

5167
storage:
5268
backend: local # local/ebs/gce/azure
@@ -83,10 +99,10 @@ storage:
8399
# cpu: 200m
84100
# memory: 500Mi
85101

86-
###NodeSelector --kube-node-selector: controls runner(vp-venona), dind-volume-provisioner(vp-provisioner), vp-monitor pods
102+
###NodeSelector --kube-node-selector: controls runner(vp-venona), vp-monitor pods
87103
#nodeSelector: {"kubernetes.io/arch": "amd64", "failure-domain.beta.kubernetes.io/zone": "us-east-1c"}
88104

89-
### Tolerations --tolerations: controls runner(vp-venona), dind-volume-provisioner(vp-provisioner), vp-monitor pods
105+
### Tolerations --tolerations: controls runner(vp-venona), vp-monitor pods
90106
# tolerations:
91107
# - key: <key>
92108
# operator: Equal

0 commit comments

Comments
 (0)