Skip to content

Commit b7840a9

Browse files
chore: remove v1 reporter (#271)
* removed v1 reporter resources * helm-docs generated * upd argo-cd dev version 6.11.1-6-cap-2.11-v1-reporter-removed-0 * deleted redundant test-cases for after v1 reporter removal * dev chart fix * remove event-reporters.events-reporter helpers * updated argo-cd with only new event-reporter * removed event-reporter from codefresh-gitops-runtime.component-list
1 parent 8d409aa commit b7840a9

16 files changed

+13
-469
lines changed

charts/gitops-runtime/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ annotations:
1616
dependencies:
1717
- name: argo-cd
1818
repository: https://codefresh-io.github.io/argo-helm
19-
version: 6.11.1-6-cap-2.11-2024.7.30-a31bf96bb
19+
version: 6.11.1-7-cap-2.11-2024.8.19-6be897266
2020
- name: argo-events
2121
repository: https://codefresh-io.github.io/argo-helm
2222
version: 2.4.7-1-cap-CR-24607

charts/gitops-runtime/README.md

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -100,14 +100,14 @@ sealed-secrets:
100100
| app-proxy.image-enrichment.serviceAccount.name | string | `"codefresh-image-enrichment-sa"` | Name of the service account to create or the name of the existing one to use |
101101
| app-proxy.image.pullPolicy | string | `"IfNotPresent"` | |
102102
| app-proxy.image.repository | string | `"quay.io/codefresh/cap-app-proxy"` | |
103-
| app-proxy.image.tag | string | `"1.2946.0"` | |
103+
| app-proxy.image.tag | string | `"1.2969.0"` | |
104104
| app-proxy.imagePullSecrets | list | `[]` | |
105105
| app-proxy.initContainer.command[0] | string | `"./init.sh"` | |
106106
| app-proxy.initContainer.env | object | `{}` | |
107107
| app-proxy.initContainer.extraVolumeMounts | list | `[]` | Extra volume mounts for init container |
108108
| app-proxy.initContainer.image.pullPolicy | string | `"IfNotPresent"` | |
109109
| app-proxy.initContainer.image.repository | string | `"quay.io/codefresh/cap-app-proxy-init"` | |
110-
| app-proxy.initContainer.image.tag | string | `"1.2946.0"` | |
110+
| app-proxy.initContainer.image.tag | string | `"1.2969.0"` | |
111111
| app-proxy.initContainer.resources.limits.cpu | string | `"1"` | |
112112
| app-proxy.initContainer.resources.limits.memory | string | `"512Mi"` | |
113113
| app-proxy.initContainer.resources.requests.cpu | string | `"0.2"` | |
@@ -167,26 +167,6 @@ sealed-secrets:
167167
| argo-workflows.fullnameOverride | string | `"argo"` | |
168168
| argo-workflows.server.authModes | list | `["client"]` | auth-mode needs to be set to client to be able to see workflow logs from Codefresh UI |
169169
| argo-workflows.server.baseHref | string | `"/workflows/"` | Do not change. Workflows UI is only accessed through internal router, changing this values will break routing to workflows native UI from Codefresh. |
170-
| event-reporters.events.argoCDServerServiceName | string | `nil` | LEAVE EMPTY and let the chart logic determine the name. Change only if you are totally sure you need to override ArgoCD service name. |
171-
| event-reporters.events.argoCDServerServicePort | string | `nil` | LEAVE EMPTY and let the chart logic determine the name. Change only if you are totally sure you need to override ArgoCD service port. |
172-
| event-reporters.events.eventSource.affinity | object | `{}` | |
173-
| event-reporters.events.eventSource.nodeSelector | object | `{}` | |
174-
| event-reporters.events.eventSource.replicas | int | `1` | |
175-
| event-reporters.events.eventSource.resources | object | `{}` | |
176-
| event-reporters.events.eventSource.tolerations | list | `[]` | |
177-
| event-reporters.events.sensor.affinity | object | `{}` | |
178-
| event-reporters.events.sensor.env | object | `{}` | Environment variables for sensor pods - add DEBUG_LOG: "true" to add debug level logs |
179-
| event-reporters.events.sensor.logging | object | `{"enabled":false,"intervalSeconds":0}` | Set to true to enable logging. Set intervalSeconds to add logging interval to moderate log flow. |
180-
| event-reporters.events.sensor.nodeSelector | object | `{}` | |
181-
| event-reporters.events.sensor.replicas | int | `1` | |
182-
| event-reporters.events.sensor.resources | object | `{}` | |
183-
| event-reporters.events.sensor.retryStrategy | object | `{"duration":0,"factor":1,"jitter":1,"steps":3}` | Retry strategy for events sent to Codefresh |
184-
| event-reporters.events.sensor.retryStrategy.duration | int | `0` | The initial duration, use strings like "2s", "1m" |
185-
| event-reporters.events.sensor.retryStrategy.factor | float | `1` | Duration is multiplied by factor each retry, if factor is not zero and steps limit has not been reached. Should not be negative |
186-
| event-reporters.events.sensor.retryStrategy.jitter | int | `1` | The sleep between each retry is the duration plus an additional amount chosen uniformly at random from the interval between zero and `jitter * duration`. |
187-
| event-reporters.events.sensor.retryStrategy.steps | int | `3` | Number of retries |
188-
| event-reporters.events.sensor.tolerations | list | `[]` | |
189-
| event-reporters.events.serviceAccount.create | bool | `true` | |
190170
| event-reporters.rollout.eventSource.affinity | object | `{}` | |
191171
| event-reporters.rollout.eventSource.nodeSelector | object | `{}` | |
192172
| event-reporters.rollout.eventSource.replicas | int | `1` | |

charts/gitops-runtime/templates/_components/event-reporters/_helpers.tpl

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,10 @@
1-
{{/*
2-
Expand the name of the chart.
3-
*/}}
4-
{{- define "event-reporters.events-reporter.name" -}}
5-
{{- print "events-reporter"}}
6-
{{- end }}
7-
8-
{{/*
9-
Create a default fully qualified app name.
10-
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
11-
If release name contains chart name it will be used as a full name.
12-
*/}}
13-
{{- define "event-reporters.events-reporter.fullname" -}}
14-
{{- print "events-reporter"}}
15-
{{- end }}
16-
171
{{/*
182
Create chart name and version as used by the chart label.
193
*/}}
204
{{- define "event-reporters.chart" -}}
215
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
226
{{- end }}
237

24-
{{/*
25-
Common labels
26-
*/}}
27-
{{- define "event-reporters.events-reporter.labels" -}}
28-
helm.sh/chart: {{ include "event-reporters.chart" . }}
29-
{{ include "event-reporters.events-reporter.selectorLabels" . }}
30-
{{- if .Chart.AppVersion }}
31-
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
32-
{{- end }}
33-
app.kubernetes.io/managed-by: Helm
34-
codefresh.io/internal: "true"
35-
{{- end }}
36-
37-
{{/*
38-
Selector labels
39-
*/}}
40-
{{- define "event-reporters.events-reporter.selectorLabels" -}}
41-
app.kubernetes.io/part-of: events-reporter
42-
{{- end }}
43-
44-
{{/*
45-
Create the name of the service account to use
46-
*/}}
47-
{{- define "event-reporters.events-reporter.serviceAccountName" -}}
48-
{{- if .Values.events.serviceAccount.create }}
49-
{{- default (include "event-reporters.events-reporter.fullname" .) .Values.events.serviceAccount.name }}
50-
{{- else }}
51-
{{- default "default" .Values.events.serviceAccount.name }}
52-
{{- end }}
53-
{{- end }}
54-
558
{{/*
569
Expand the name of the chart.
5710
*/}}

charts/gitops-runtime/templates/_components/event-reporters/events-reporter/_event-source.yaml

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

charts/gitops-runtime/templates/_components/event-reporters/events-reporter/_rbac.yaml

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

charts/gitops-runtime/templates/_components/event-reporters/events-reporter/_sensor.yaml

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

charts/gitops-runtime/templates/_components/event-reporters/events-reporter/_serviceaccount.yaml

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

charts/gitops-runtime/templates/_helpers.tpl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,8 @@ Output comma separated list of installed runtime components
234234
{{- $argoEvents := dict "name" "argo-events" "version" (get .Subcharts "argo-events").Chart.AppVersion }}
235235
{{- $sealedSecrets := dict "name" "sealed-secrets" "version" (get .Subcharts "sealed-secrets").Chart.AppVersion }}
236236
{{- $internalRouter := dict "name" "internal-router" "version" .Chart.AppVersion }}
237-
{{- $eventsReporter := dict "name" "events-reporter" "version" .Chart.AppVersion }}
238237
{{- $appProxy := dict "name" "app-proxy" "version" (index (get .Values "app-proxy") "image" "tag") }}
239-
{{- $comptList := list $argoCD $argoEvents $appProxy $eventsReporter $sealedSecrets $internalRouter}}
238+
{{- $comptList := list $argoCD $argoEvents $appProxy $sealedSecrets $internalRouter}}
240239
{{- if index (get .Values "argo-rollouts") "enabled" }}
241240
{{- $rolloutReporter := dict "name" "rollout-reporter" "version" .Chart.AppVersion }}
242241
{{- $argoRollouts := dict "name" "argo-rollouts" "version" (get .Subcharts "argo-rollouts").Chart.AppVersion }}

charts/gitops-runtime/templates/event-reporters/events-reporter/eventsource.yaml

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

charts/gitops-runtime/templates/event-reporters/events-reporter/rbac.yaml

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

charts/gitops-runtime/templates/event-reporters/events-reporter/sensor.yaml

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

charts/gitops-runtime/templates/event-reporters/events-reporter/serviceaccount.yaml

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

charts/gitops-runtime/tests/argo-projects-templates-integration_test.yaml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ templates:
66
- app-proxy/workflows-crb.yaml
77
- app-proxy/config.yaml
88
- internal-router/config.yaml
9-
- event-reporters/events-reporter/eventsource.yaml
109
- event-reporters/rollout-reporter/clusterrolebinding.yaml
1110
tests:
1211
# ------------------------------------------------------------------------
@@ -37,29 +36,6 @@ tests:
3736
path: data.argoCdUrl
3837
value: https://argo-cd-test-server:443
3938

40-
- it: events reporter eventsource argocd url - http
41-
template: 'event-reporters/events-reporter/eventsource.yaml'
42-
values:
43-
- ./values/mandatory-values.yaml
44-
set:
45-
argo-cd.fullnameOverride: argo-cd-test
46-
argo-cd.configs.params.server\.insecure: true
47-
asserts:
48-
- equal:
49-
path: spec.generic.events.url
50-
value: argo-cd-test-server:80
51-
52-
- it: events reporter eventsource argocd url - http
53-
template: 'event-reporters/events-reporter/eventsource.yaml'
54-
values:
55-
- ./values/mandatory-values.yaml
56-
set:
57-
argo-cd.fullnameOverride: argo-cd-test
58-
argo-cd.configs.params.server\.insecure: false
59-
asserts:
60-
- equal:
61-
path: spec.generic.events.url
62-
value: argo-cd-test-server:443
6339
# ------------------------------------------------------------------------------------------
6440
# Argo Workflows
6541
# Affected templates: app-proxy ClusterRoleBinding to argo-server role, intenal-url config

0 commit comments

Comments
 (0)