Skip to content

chore: remove v1 reporter #271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Aug 29, 2024
2 changes: 1 addition & 1 deletion charts/gitops-runtime/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ annotations:
dependencies:
- name: argo-cd
repository: https://codefresh-io.github.io/argo-helm
version: 6.11.1-6-cap-2.11-2024.7.30-a31bf96bb
version: 6.11.1-7-cap-2.11-2024.8.19-6be897266
- name: argo-events
repository: https://codefresh-io.github.io/argo-helm
version: 2.4.7-1-cap-CR-24607
Expand Down
24 changes: 2 additions & 22 deletions charts/gitops-runtime/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,14 @@ sealed-secrets:
| 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 |
| app-proxy.image.pullPolicy | string | `"IfNotPresent"` | |
| app-proxy.image.repository | string | `"quay.io/codefresh/cap-app-proxy"` | |
| app-proxy.image.tag | string | `"1.2946.0"` | |
| app-proxy.image.tag | string | `"1.2969.0"` | |
| app-proxy.imagePullSecrets | list | `[]` | |
| app-proxy.initContainer.command[0] | string | `"./init.sh"` | |
| app-proxy.initContainer.env | object | `{}` | |
| app-proxy.initContainer.extraVolumeMounts | list | `[]` | Extra volume mounts for init container |
| app-proxy.initContainer.image.pullPolicy | string | `"IfNotPresent"` | |
| app-proxy.initContainer.image.repository | string | `"quay.io/codefresh/cap-app-proxy-init"` | |
| app-proxy.initContainer.image.tag | string | `"1.2946.0"` | |
| app-proxy.initContainer.image.tag | string | `"1.2969.0"` | |
| app-proxy.initContainer.resources.limits.cpu | string | `"1"` | |
| app-proxy.initContainer.resources.limits.memory | string | `"512Mi"` | |
| app-proxy.initContainer.resources.requests.cpu | string | `"0.2"` | |
Expand Down Expand Up @@ -167,26 +167,6 @@ sealed-secrets:
| argo-workflows.fullnameOverride | string | `"argo"` | |
| argo-workflows.server.authModes | list | `["client"]` | auth-mode needs to be set to client to be able to see workflow logs from Codefresh UI |
| 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. |
| 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. |
| 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. |
| event-reporters.events.eventSource.affinity | object | `{}` | |
| event-reporters.events.eventSource.nodeSelector | object | `{}` | |
| event-reporters.events.eventSource.replicas | int | `1` | |
| event-reporters.events.eventSource.resources | object | `{}` | |
| event-reporters.events.eventSource.tolerations | list | `[]` | |
| event-reporters.events.sensor.affinity | object | `{}` | |
| event-reporters.events.sensor.env | object | `{}` | Environment variables for sensor pods - add DEBUG_LOG: "true" to add debug level logs |
| 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. |
| event-reporters.events.sensor.nodeSelector | object | `{}` | |
| event-reporters.events.sensor.replicas | int | `1` | |
| event-reporters.events.sensor.resources | object | `{}` | |
| event-reporters.events.sensor.retryStrategy | object | `{"duration":0,"factor":1,"jitter":1,"steps":3}` | Retry strategy for events sent to Codefresh |
| event-reporters.events.sensor.retryStrategy.duration | int | `0` | The initial duration, use strings like "2s", "1m" |
| 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 |
| 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`. |
| event-reporters.events.sensor.retryStrategy.steps | int | `3` | Number of retries |
| event-reporters.events.sensor.tolerations | list | `[]` | |
| event-reporters.events.serviceAccount.create | bool | `true` | |
| event-reporters.rollout.eventSource.affinity | object | `{}` | |
| event-reporters.rollout.eventSource.nodeSelector | object | `{}` | |
| event-reporters.rollout.eventSource.replicas | int | `1` | |
Expand Down
Original file line number Diff line number Diff line change
@@ -1,57 +1,10 @@
{{/*
Expand the name of the chart.
*/}}
{{- define "event-reporters.events-reporter.name" -}}
{{- print "events-reporter"}}
{{- end }}

{{/*
Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
If release name contains chart name it will be used as a full name.
*/}}
{{- define "event-reporters.events-reporter.fullname" -}}
{{- print "events-reporter"}}
{{- end }}

{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "event-reporters.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
{{- end }}

{{/*
Common labels
*/}}
{{- define "event-reporters.events-reporter.labels" -}}
helm.sh/chart: {{ include "event-reporters.chart" . }}
{{ include "event-reporters.events-reporter.selectorLabels" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: Helm
codefresh.io/internal: "true"
{{- end }}

{{/*
Selector labels
*/}}
{{- define "event-reporters.events-reporter.selectorLabels" -}}
app.kubernetes.io/part-of: events-reporter
{{- end }}

{{/*
Create the name of the service account to use
*/}}
{{- define "event-reporters.events-reporter.serviceAccountName" -}}
{{- if .Values.events.serviceAccount.create }}
{{- default (include "event-reporters.events-reporter.fullname" .) .Values.events.serviceAccount.name }}
{{- else }}
{{- default "default" .Values.events.serviceAccount.name }}
{{- end }}
{{- end }}

{{/*
Expand the name of the chart.
*/}}
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

3 changes: 1 addition & 2 deletions charts/gitops-runtime/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,8 @@ Output comma separated list of installed runtime components
{{- $argoEvents := dict "name" "argo-events" "version" (get .Subcharts "argo-events").Chart.AppVersion }}
{{- $sealedSecrets := dict "name" "sealed-secrets" "version" (get .Subcharts "sealed-secrets").Chart.AppVersion }}
{{- $internalRouter := dict "name" "internal-router" "version" .Chart.AppVersion }}
{{- $eventsReporter := dict "name" "events-reporter" "version" .Chart.AppVersion }}
{{- $appProxy := dict "name" "app-proxy" "version" (index (get .Values "app-proxy") "image" "tag") }}
{{- $comptList := list $argoCD $argoEvents $appProxy $eventsReporter $sealedSecrets $internalRouter}}
{{- $comptList := list $argoCD $argoEvents $appProxy $sealedSecrets $internalRouter}}
{{- if index (get .Values "argo-rollouts") "enabled" }}
{{- $rolloutReporter := dict "name" "rollout-reporter" "version" .Chart.AppVersion }}
{{- $argoRollouts := dict "name" "argo-rollouts" "version" (get .Subcharts "argo-rollouts").Chart.AppVersion }}
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ templates:
- app-proxy/workflows-crb.yaml
- app-proxy/config.yaml
- internal-router/config.yaml
- event-reporters/events-reporter/eventsource.yaml
- event-reporters/rollout-reporter/clusterrolebinding.yaml
tests:
# ------------------------------------------------------------------------
Expand Down Expand Up @@ -37,29 +36,6 @@ tests:
path: data.argoCdUrl
value: https://argo-cd-test-server:443

- it: events reporter eventsource argocd url - http
template: 'event-reporters/events-reporter/eventsource.yaml'
values:
- ./values/mandatory-values.yaml
set:
argo-cd.fullnameOverride: argo-cd-test
argo-cd.configs.params.server\.insecure: true
asserts:
- equal:
path: spec.generic.events.url
value: argo-cd-test-server:80

- it: events reporter eventsource argocd url - http
template: 'event-reporters/events-reporter/eventsource.yaml'
values:
- ./values/mandatory-values.yaml
set:
argo-cd.fullnameOverride: argo-cd-test
argo-cd.configs.params.server\.insecure: false
asserts:
- equal:
path: spec.generic.events.url
value: argo-cd-test-server:443
# ------------------------------------------------------------------------------------------
# Argo Workflows
# Affected templates: app-proxy ClusterRoleBinding to argo-server role, intenal-url config
Expand Down
Loading