Skip to content

Commit 610e849

Browse files
ilia-medvedev-codefreshilia-medvedev-codefresh
committed
update chart
1 parent 63f43f1 commit 610e849

File tree

11 files changed

+142
-52
lines changed

11 files changed

+142
-52
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@ output
55
**/__snapshot__
66
**/*.tgz
77
**/charts/**/charts
8+
**/charts/**/Chart.lock
89
#local-scripts/
10+
values.yaml

‎charts/gitops-runtime/.helmignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
tests/
1+
tests/
2+
ci/
3+
test-values/

‎charts/gitops-runtime/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
appVersion: v0.0.1
33
description: A Helm chart for Codefresh gitops runtime
44
name: gitops-runtime-sandbox
5-
version: 0.0.2
5+
version: 0.0.1
66
home: https://github.com/codefresh-sandbox/gitops-runtime-charts
77
keywords:
88
- codefresh
@@ -30,5 +30,5 @@ dependencies:
3030
version: 2.1.6
3131
- name: codefresh-tunnel-client
3232
repository: https://chartmuseum.codefresh.io/codefresh-tunnel-client
33-
version: "0.1.11"
33+
version: "0.1.12"
3434
alias: tunnel-client

‎charts/gitops-runtime/README.md

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# gitops-runtime-sandbox
22

3-
![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![AppVersion: v0.0.1](https://img.shields.io/badge/AppVersion-v0.0.1-informational?style=flat-square)
3+
![Version: 0.0.1-test30-cleanup-1](https://img.shields.io/badge/Version-0.0.1--test30--cleanup--1-informational?style=flat-square) ![AppVersion: v0.0.1](https://img.shields.io/badge/AppVersion-v0.0.1-informational?style=flat-square)
44

55
A Helm chart for Codefresh gitops runtime
66

@@ -20,7 +20,6 @@ A Helm chart for Codefresh gitops runtime
2020
| https://chartmuseum.codefresh.io/codefresh-tunnel-client | tunnel-client(codefresh-tunnel-client) | 0.1.11 |
2121
| https://codefresh-io.github.io/argo-helm | argo-cd | 5.7.0-2-CR-16709-init-app-proxy |
2222
| https://codefresh-io.github.io/argo-helm | argo-events | 2.0.5-1-cf-init |
23-
| https://codefresh-io.github.io/argo-helm | argo-rollouts | 2.22.1-1-cap-sw |
2423
| https://codefresh-io.github.io/argo-helm | argo-workflows | 0.22.8-1-cf-init |
2524

2625
## Values
@@ -82,9 +81,7 @@ A Helm chart for Codefresh gitops runtime
8281
| argo-cd.fullnameOverride | string | `"argo-cd"` | |
8382
| argo-events.crds.install | bool | `false` | |
8483
| argo-events.fullnameOverride | string | `"argo-events"` | |
85-
| argo-rollouts.controller.replicas | int | `1` | |
8684
| argo-rollouts.enabled | bool | `false` | |
87-
| argo-rollouts.fullnameOverride | string | `"argo-rollouts"` | |
8885
| argo-workflows.enabled | bool | `true` | |
8986
| argo-workflows.fullnameOverride | string | `"argo"` | |
9087
| event-reporters.events.argoCDServerServiceName | string | `nil` | Do not set this value unless you are totally sure you need to override ArgoCD service name. Otherwise, it is determinted by chart logic |
@@ -104,22 +101,16 @@ A Helm chart for Codefresh gitops runtime
104101
| event-reporters.workflow.sensor.replicas | int | `1` | |
105102
| event-reporters.workflow.sensor.resources | object | `{}` | |
106103
| event-reporters.workflow.serviceAccount.create | bool | `true` | |
107-
| global.codefresh | object | `{"accountId":"","apiEventsPath":"/2.0/api/events","iscRepo":"","url":"https://g.codefresh.io","userToken":{"secretKeyRef":{},"token":""}}` | Codefresh platform and account related settings |
108104
| global.codefresh.accountId | string | `""` | Codefresh Account id |
109105
| global.codefresh.apiEventsPath | string | `"/2.0/api/events"` | Events API endpoint URL suffix |
110106
| global.codefresh.iscRepo | string | `""` | Internal shared config repository URL for this Codefresh account |
111107
| global.codefresh.url | string | `"https://g.codefresh.io"` | URL of Codefresh platform |
112108
| global.codefresh.userToken | object | `{"secretKeyRef":{},"token":""}` | User token. Used for runtime registration against the patform. One of token (for plain text value) or secretKeyRef must be provided. |
113109
| global.codefresh.userToken.secretKeyRef | object | `{}` | secretKeyRef to an existing secret containing the token |
114110
| global.codefresh.userToken.token | string | `""` | Token in plain text (A secret for this token will be created and managed by the chart) |
115-
| global.runtime | object | `{"argoCDApplication":{"chartRepo":"https://chartmuseum-dev.codefresh.io/gitops-runtime-sandbox","chartVersion":"","enabled":false,"name":"codefresh-gitops-runtime"},"cluster":null,"eventBus":{"nats":{"native":{"auth":"token","containerTemplate":{"resources":{"limits":{"cpu":"500m","ephemeral-storage":"2Gi","memory":"4Gi"},"requests":{"cpu":"200m","ephemeral-storage":"2Gi","memory":"1Gi"}}},"maxPayload":"4MB","replicas":3}}},"eventBusName":"codefresh-eventbus","ingress":{"annotations":{},"className":"nginx","enabled":true,"hosts":[],"tls":{}},"name":null}` | Runtime level settings |
116-
| global.runtime.argoCDApplication | object | `{"chartRepo":"https://chartmuseum-dev.codefresh.io/gitops-runtime-sandbox","chartVersion":"","enabled":false,"name":"codefresh-gitops-runtime"}` | To be able to see the runtime in CodefreshUI, it is required to create and ArgoCD application that referneces it's components For that purpose we can create an ArgoApp that referneces the chart. |
117-
| global.runtime.eventBus | object | `{"nats":{"native":{"auth":"token","containerTemplate":{"resources":{"limits":{"cpu":"500m","ephemeral-storage":"2Gi","memory":"4Gi"},"requests":{"cpu":"200m","ephemeral-storage":"2Gi","memory":"1Gi"}}},"maxPayload":"4MB","replicas":3}}}` | EventBus spec |
118-
| global.runtime.eventBusName | string | `"codefresh-eventbus"` | Eventbus name |
119-
| global.runtime.ingress | object | `{"annotations":{},"className":"nginx","enabled":true,"hosts":[],"tls":{}}` | Ingress settings |
120-
| global.runtime.ingress.enabled | bool | `true` | Whether ingress is enabled. If disabled, tunnel-based runtime will be deployed |
121-
| global.runtime.name | string | `nil` | Runtime name. Must be equal to namepsace in which it is intalled and unique per platform account |
122-
| installer | object | `{"image":{"pullPolicy":"IfNotPresent","repository":"quay.io/codefresh/gitops-runtime-installer-sandbox","tag":"alpha2"}}` | Runtime installer - Used for running hooks and checks on the release |
111+
| global.eventBusName | string | `"codefresh-eventbus"` | Eventbus name |
112+
| installer | object | `{"codefreshToken":null,"image":{"pullPolicy":"IfNotPresent","repository":"quay.io/codefresh/gitops-runtime-installer-sandbox","tag":"alpha2"}}` | Runtime installer - Used for running hooks and checks. |
113+
| installer.codefreshToken | string | `nil` | Codefresh user token used for runtime installation. Important: Also accepts secretKeyRef as value - so you can provide your own secret. |
123114
| internal-router.affinity | object | `{}` | |
124115
| internal-router.env | object | `{}` | Environment variables - see values.yaml inside the chart for usage |
125116
| internal-router.fullnameOverride | string | `"internal-router"` | |
@@ -145,6 +136,23 @@ A Helm chart for Codefresh gitops runtime
145136
| internal-router.serviceAccount.create | bool | `true` | |
146137
| internal-router.serviceAccount.name | string | `""` | |
147138
| internal-router.tolerations | list | `[]` | |
139+
| runtime.argoCDApplication | object | `{"chartRepo":"https://chartmuseum-dev.codefresh.io/gitops-runtime-sandbox","chartVersion":"","enabled":true,"name":"codefresh-gitops-runtime"}` | To be able to see the runtime in CodefreshUI, it is required to create and ArgoCD application that referneces it's components For that purpose we can create an ArgoApp that referneces the chart. |
140+
| runtime.cluster | string | `nil` | |
141+
| runtime.eventBus.nats.native.auth | string | `"token"` | |
142+
| runtime.eventBus.nats.native.containerTemplate.resources.limits.cpu | string | `"500m"` | |
143+
| runtime.eventBus.nats.native.containerTemplate.resources.limits.ephemeral-storage | string | `"2Gi"` | |
144+
| runtime.eventBus.nats.native.containerTemplate.resources.limits.memory | string | `"4Gi"` | |
145+
| runtime.eventBus.nats.native.containerTemplate.resources.requests.cpu | string | `"200m"` | |
146+
| runtime.eventBus.nats.native.containerTemplate.resources.requests.ephemeral-storage | string | `"2Gi"` | |
147+
| runtime.eventBus.nats.native.containerTemplate.resources.requests.memory | string | `"1Gi"` | |
148+
| runtime.eventBus.nats.native.maxPayload | string | `"4MB"` | |
149+
| runtime.eventBus.nats.native.replicas | int | `3` | |
150+
| runtime.ingress.annotations | object | `{}` | |
151+
| runtime.ingress.className | string | `"nginx"` | |
152+
| runtime.ingress.enabled | bool | `true` | |
153+
| runtime.ingress.hosts | list | `[]` | |
154+
| runtime.ingress.tls | object | `{}` | |
155+
| runtime.name | string | `nil` | |
148156
| sealed-secrets.fullnameOverride | string | `"sealed-secrets"` | |
149157
| sealed-secrets.image.registry | string | `"quay.io"` | |
150158
| sealed-secrets.image.repository | string | `"codefresh/sealed-secrets-controller"` | |

‎charts/gitops-runtime/ci/default-values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ global:
66
name: mysecret
77
key: myvalue
88
optional: true
9-
9+
1010
runtime:
11-
name: test-runtime1
11+
name: default
1212
cluster: test-cluster
1313

1414
ingress:

‎charts/gitops-runtime/ci/ingressless-values.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
global:
22
codefresh:
33
accountId: 628a80b693a15c0f9c13ab75 # Codefresh Account id for ilia-codefresh for now, needs to be some test account
4+
userToken:
5+
secretKeyRef:
6+
name: mysecret
7+
key: myvalue
8+
optional: true
49

510
runtime:
6-
name: test-runtime1
11+
name: default
712
cluster: test-cluster
813

914
ingress:

‎charts/gitops-runtime/ci/lint-config/ct-lint.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
## Reference: https://github.com/helm/chart-testing/blob/master/doc/ct_lint-and-install.md
2+
# Don't add the 'debug' attribute, otherwise the workflow won't work anymore
3+
# Only Used for the CT Lint Stage
4+
remote: origin
5+
target-branch: main
6+
charts:
7+
- charts/gitops-runtime
8+
validate-chart-schema: false
9+
validate-maintainers: true
10+
validate-yaml: true
11+
exclude-deprecated: true
12+
excluded-charts: []

‎charts/gitops-runtime/ci/lint-config/lintconf.yaml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
2+
3+
---
4+
rules:
5+
braces:
6+
min-spaces-inside: 0
7+
max-spaces-inside: 0
8+
min-spaces-inside-empty: -1
9+
max-spaces-inside-empty: -1
10+
brackets:
11+
min-spaces-inside: 0
12+
max-spaces-inside: 0
13+
min-spaces-inside-empty: -1
14+
max-spaces-inside-empty: -1
15+
colons:
16+
max-spaces-before: 0
17+
max-spaces-after: 1
18+
commas:
19+
max-spaces-before: 0
20+
min-spaces-after: 1
21+
max-spaces-after: 1
22+
comments:
23+
require-starting-space: false
24+
min-spaces-from-content: 1
25+
document-end: disable
26+
document-start: disable # No --- to start a file
27+
empty-lines:
28+
max: 2
29+
max-start: 0
30+
max-end: 0
31+
hyphens:
32+
max-spaces-after: 1
33+
indentation:
34+
spaces: consistent
35+
indent-sequences: whatever # - list indentation will handle both indentation and without
36+
check-multi-line-strings: false
37+
key-duplicates: enable
38+
line-length: disable # Lines can be any length
39+
new-line-at-end-of-file: enable
40+
new-lines:
41+
type: unix
42+
trailing-spaces: enable
43+
truthy:
44+
level: warning

‎charts/gitops-runtime/templates/_components/internal-router/_serviceaccount.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
apiVersion: v1
44
kind: ServiceAccount
55
metadata:
6-
name: "{{ include "internal-router.serviceAccountName" . }}"
6+
name: {{ include "internal-router.serviceAccountName" . }}
77
labels:
88
{{- include "internal-router.labels" . | nindent 4 }}
99
{{- with .Values.serviceAccount.annotations }}

‎charts/gitops-runtime/test-values/ingressless-values.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
global:
2+
codefresh:
3+
accountId: 628a80b693a15c0f9c13ab75 # Codefresh Account id for ilia-codefresh for now, needs to be some test account
4+
userToken:
5+
secretKeyRef:
6+
name: mysecret
7+
key: myvalue
8+
optional: true
9+
10+
runtime:
11+
name: test-runtime1
12+
cluster: test-cluster
13+
14+
ingress:
15+
enabled: false
16+
17+
argo-rollouts:
18+
enabled: true

‎charts/gitops-runtime/values.yaml

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ global:
66
# -- Events API endpoint URL suffix
77
apiEventsPath: "/2.0/api/events"
88
# -- Codefresh Account id
9-
accountId: ""
9+
accountId: ""
1010
# -- Internal shared config repository URL for this Codefresh account
1111
iscRepo: ""
1212
# -- User token. Used for runtime registration against the patform. One of token (for plain text value) or secretKeyRef must be provided.
@@ -28,7 +28,6 @@ global:
2828
tls: {}
2929
annotations: {}
3030
hosts: []
31-
3231
# -- To be able to see the runtime in CodefreshUI, it is required to create and ArgoCD application that referneces it's components
3332
# For that purpose we can create an ArgoApp that referneces the chart.
3433
argoCDApplication:
@@ -96,30 +95,30 @@ argo-cd:
9695
accounts.admin: apiKey,login
9796
params:
9897
server.insecure: true
99-
# -----------------------------------------------------------------------------------------------------------------------
98+
#-----------------------------------------------------------------------------------------------------------------------
10099
# Argo Events
101-
# -----------------------------------------------------------------------------------------------------------------------
100+
#-----------------------------------------------------------------------------------------------------------------------
102101
argo-events:
103102
fullnameOverride: argo-events
104103
crds:
105104
install: false
106-
# -----------------------------------------------------------------------------------------------------------------------
105+
#-----------------------------------------------------------------------------------------------------------------------
107106
# Argo Workflows
108-
# -----------------------------------------------------------------------------------------------------------------------
107+
#-----------------------------------------------------------------------------------------------------------------------
109108
argo-workflows:
110109
fullnameOverride: argo
111110
enabled: true
112-
# -----------------------------------------------------------------------------------------------------------------------
111+
#-----------------------------------------------------------------------------------------------------------------------
113112
# Argo rollouts
114-
# -----------------------------------------------------------------------------------------------------------------------
113+
#-----------------------------------------------------------------------------------------------------------------------
115114
argo-rollouts:
116115
enabled: false
117116
fullnameOverride: argo-rollouts
118117
controller:
119118
replicas: 1
120-
# -----------------------------------------------------------------------------------------------------------------------
119+
#-----------------------------------------------------------------------------------------------------------------------
121120
# Event reporters
122-
# -----------------------------------------------------------------------------------------------------------------------
121+
#-----------------------------------------------------------------------------------------------------------------------
123122
event-reporters:
124123
events:
125124
# -- Do not set this value unless you are totally sure you need to override ArgoCD service name. Otherwise, it is determinted by chart logic
@@ -211,7 +210,7 @@ internal-router:
211210
# -- Internal routing settings. Do not change this unless you are absolutely certain - the values are determined by chart's logic.
212211
routing: {}
213212
# Example of values:
214-
# workflows:
213+
# workflows:
215214
# enabled: true
216215
# internalUrl: "https://argo-server1:2746/"
217216
# app-proxy:
@@ -285,28 +284,28 @@ app-proxy:
285284
allowPrivilegeEscalation: false
286285

287286
readinessProbe:
288-
# -- Minimum consecutive failures for the [probe] to be considered failed after having succeeded
289-
failureThreshold: 3
290-
# -- Number of seconds after the container has started before [probe] is initiated
291-
initialDelaySeconds: 10
292-
# -- How often (in seconds) to perform the [probe]
293-
periodSeconds: 10
294-
# -- Minimum consecutive successes for the [probe] to be considered successful after having failed
295-
successThreshold: 1
296-
# -- Number of seconds after which the [probe] times out
297-
timeoutSeconds: 10
287+
# -- Minimum consecutive failures for the [probe] to be considered failed after having succeeded
288+
failureThreshold: 3
289+
# -- Number of seconds after the container has started before [probe] is initiated
290+
initialDelaySeconds: 10
291+
# -- How often (in seconds) to perform the [probe]
292+
periodSeconds: 10
293+
# -- Minimum consecutive successes for the [probe] to be considered successful after having failed
294+
successThreshold: 1
295+
# -- Number of seconds after which the [probe] times out
296+
timeoutSeconds: 10
298297

299298
livenessProbe:
300-
# -- Minimum consecutive failures for the [probe] to be considered failed after having succeeded
301-
failureThreshold: 10
302-
# -- Number of seconds after the container has started before [probe] is initiated
303-
initialDelaySeconds: 10
304-
# -- How often (in seconds) to perform the [probe]
305-
periodSeconds: 10
306-
# -- Minimum consecutive successes for the [probe] to be considered successful after having failed
307-
successThreshold: 1
308-
# -- Number of seconds after which the [probe] times out
309-
timeoutSeconds: 10
299+
# -- Minimum consecutive failures for the [probe] to be considered failed after having succeeded
300+
failureThreshold: 10
301+
# -- Number of seconds after the container has started before [probe] is initiated
302+
initialDelaySeconds: 10
303+
# -- How often (in seconds) to perform the [probe]
304+
periodSeconds: 10
305+
# -- Minimum consecutive successes for the [probe] to be considered successful after having failed
306+
successThreshold: 1
307+
# -- Number of seconds after which the [probe] times out
308+
timeoutSeconds: 10
310309

311310
service:
312311
type: ClusterIP
@@ -325,4 +324,4 @@ app-proxy:
325324
nodeSelector: {}
326325
tolerations: []
327326
affinity: {}
328-
########################################################################################################################
327+
########################################################################################################################

0 commit comments

Comments
 (0)