Skip to content

Commit 62f2718

Browse files
ilia-medvedev-codefreshilia-medvedev-codefresh
committed
fix lint
1 parent a1c7728 commit 62f2718

File tree

8 files changed

+354
-35
lines changed

8 files changed

+354
-35
lines changed

‎.config/ct-lint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ chart-dirs:
77
- charts
88
chart-repos:
99
- dandydeveloper=https://dandydeveloper.github.io/charts/
10-
helm-extra-args: "--timeout 600s"
10+
helm-extra-args: "--values charts/gitops-runtime/ci/default-values.yaml--timeout 600s"
1111
validate-chart-schema: false
1212
validate-maintainers: true
1313
validate-yaml: true

‎.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@ output
66
**/*.tgz
77
**/charts/**/charts
88
#local-scripts/
9-
values.yaml

‎charts/gitops-runtime/README.md

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

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)
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)
44

55
A Helm chart for Codefresh gitops runtime
66

@@ -20,6 +20,7 @@ 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 |
2324
| https://codefresh-io.github.io/argo-helm | argo-workflows | 0.22.8-1-cf-init |
2425

2526
## Values
@@ -81,7 +82,9 @@ A Helm chart for Codefresh gitops runtime
8182
| argo-cd.fullnameOverride | string | `"argo-cd"` | |
8283
| argo-events.crds.install | bool | `false` | |
8384
| argo-events.fullnameOverride | string | `"argo-events"` | |
85+
| argo-rollouts.controller.replicas | int | `1` | |
8486
| argo-rollouts.enabled | bool | `false` | |
87+
| argo-rollouts.fullnameOverride | string | `"argo-rollouts"` | |
8588
| argo-workflows.enabled | bool | `true` | |
8689
| argo-workflows.fullnameOverride | string | `"argo"` | |
8790
| 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 |
@@ -101,16 +104,22 @@ A Helm chart for Codefresh gitops runtime
101104
| event-reporters.workflow.sensor.replicas | int | `1` | |
102105
| event-reporters.workflow.sensor.resources | object | `{}` | |
103106
| 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 |
104108
| global.codefresh.accountId | string | `""` | Codefresh Account id |
105109
| global.codefresh.apiEventsPath | string | `"/2.0/api/events"` | Events API endpoint URL suffix |
106110
| global.codefresh.iscRepo | string | `""` | Internal shared config repository URL for this Codefresh account |
107111
| global.codefresh.url | string | `"https://g.codefresh.io"` | URL of Codefresh platform |
108112
| 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. |
109113
| global.codefresh.userToken.secretKeyRef | object | `{}` | secretKeyRef to an existing secret containing the token |
110114
| global.codefresh.userToken.token | string | `""` | Token in plain text (A secret for this token will be created and managed by the chart) |
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. |
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 |
114123
| internal-router.affinity | object | `{}` | |
115124
| internal-router.env | object | `{}` | Environment variables - see values.yaml inside the chart for usage |
116125
| internal-router.fullnameOverride | string | `"internal-router"` | |
@@ -136,23 +145,6 @@ A Helm chart for Codefresh gitops runtime
136145
| internal-router.serviceAccount.create | bool | `true` | |
137146
| internal-router.serviceAccount.name | string | `""` | |
138147
| 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` | |
156148
| sealed-secrets.fullnameOverride | string | `"sealed-secrets"` | |
157149
| sealed-secrets.image.registry | string | `"quay.io"` | |
158150
| sealed-secrets.image.repository | string | `"codefresh/sealed-secrets-controller"` | |

‎charts/gitops-runtime/templates/_components/cap-app-proxy/_all_resources.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{{- define "cap-app-proxy.resources" }}
2-
{{- include "cap-app-proxy.resources.configmap" . }}
2+
{{ include "cap-app-proxy.resources.configmap" . }}
33
---
4-
{{- include "cap-app-proxy.resources.deployment" . }}
4+
{{ include "cap-app-proxy.resources.deployment" . }}
55
---
6-
{{- include "cap-app-proxy.resources.rbac" . }}
6+
{{ include "cap-app-proxy.resources.rbac" . }}
77
---
8-
{{- include "cap-app-proxy.resources.service" . }}
8+
{{ include "cap-app-proxy.resources.service" . }}
99
---
10-
{{- include "cap-app-proxy.resources.sa" .}}
10+
{{ include "cap-app-proxy.resources.sa" .}}
1111
{{- end }}

‎charts/gitops-runtime/templates/_components/cap-app-proxy/_serviceaccount.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{- define "cap-app-proxy.resources.sa" }}
2-
{{- if .Values.serviceAccount.create -}}
2+
{{- if .Values.serviceAccount.create }}
33
apiVersion: v1
44
kind: ServiceAccount
55
metadata:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{{- define "internal-router.resources" }}
2-
{{- include "internal-router.resources.configmap" . }}
2+
{{ include "internal-router.resources.configmap" . }}
33
---
4-
{{- include "internal-router.resources.deployment" . }}
4+
{{ include "internal-router.resources.deployment" . }}
55
---
6-
{{- include "internal-router.resources.service" . }}
6+
{{ include "internal-router.resources.service" . }}
77
---
8-
{{- include "internal-router.resources.sa" .}}
8+
{{ include "internal-router.resources.sa" .}}
99
{{- end }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{{- define "internal-router.resources.sa" }}
2-
{{- if .Values.serviceAccount.create -}}
2+
{{- if .Values.serviceAccount.create }}
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 }}

0 commit comments

Comments
 (0)