Skip to content

Commit 0cb0475

Browse files
committed
upgrade argo-events
2 parents db0f57b + f9a1b4c commit 0cb0475

File tree

9 files changed

+71
-43
lines changed

9 files changed

+71
-43
lines changed

.github/configs/codefresh-k8s.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Codefresh specific objects that are required for chart insllation to pass
2+
apiVersion: v1
3+
data:
4+
base-url: https://g.codefresh.io
5+
runtime: |
6+
apiVersion: codefresh.io/v1alpha1
7+
kind: Runtime
8+
metadata:
9+
name: test
10+
spec:
11+
test: test
12+
kind: ConfigMap
13+
metadata:
14+
name: codefresh-cm
15+
---
16+
apiVersion: v1
17+
kind: Secret
18+
metadata:
19+
name: codefresh-token
20+
type: Opaque
21+
stringData:
22+
token: "612312312356677888855.612312312356677888855"

.github/configs/ct-install.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Don't add the 'debug' attribute, otherwise the workflow won't work anymore
33
# Only Used for the CT Install Stage
44
remote: origin
5-
target-branch: main
5+
namespace: events
66
chart-dirs:
77
- charts
88
chart-repos:

.github/configs/ct-lint.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# Don't add the 'debug' attribute, otherwise the workflow won't work anymore
33
# Only Used for the CT Lint Stage
44
remote: origin
5-
target-branch: main
65
chart-dirs:
76
- charts
87
chart-repos:

.github/workflows/lint-and-test.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ jobs:
4747
id: list-changed
4848
run: |
4949
## If executed with debug this won't work anymore.
50-
changed=$(ct --config ./.github/configs/ct-lint.yaml list-changed)
50+
changed=$(ct --config ./.github/configs/ct-lint.yaml --target-branch ${{ github.base_ref }} list-changed)
5151
charts=$(echo "$changed" | tr '\n' ' ' | xargs)
5252
if [[ -n "$changed" ]]; then
5353
echo "changed=true" >> $GITHUB_OUTPUT
5454
echo "changed_charts=$charts" >> $GITHUB_OUTPUT
5555
fi
5656
5757
- name: Run chart-testing (lint)
58-
run: ct lint --debug --config ./.github/configs/ct-lint.yaml --lint-conf ./.github/configs/lintconf.yaml
58+
run: ct lint --debug --config ./.github/configs/ct-lint.yaml --target-branch ${{ github.base_ref }} --lint-conf ./.github/configs/lintconf.yaml
5959

6060
- name: Run docs-testing (helm-docs)
6161
id: helm-docs
@@ -68,13 +68,12 @@ jobs:
6868
else
6969
echo -e '\033[0;32mDocumentation up to date\033[0m ✔'
7070
fi
71-
7271
- name: Create kind cluster
7372
uses: helm/kind-action@0025e74a8c7512023d06dc019c617aa3cf561fde # v1.10.0
7473
if: steps.list-changed.outputs.changed == 'true'
7574
with:
7675
config: .github/configs/kind-config.yaml
77-
76+
7877
- name: Deploy latest ArgoCD CRDs when testing ArgoCD extensions
7978
if: |
8079
contains(steps.list-changed.outputs.changed_charts, 'argocd-image-updater') ||
@@ -90,13 +89,17 @@ jobs:
9089
## Metrics API not available in kind cluster
9190
rm charts/argo-cd/ci/ha-autoscaling-values.yaml
9291
92+
- name: Deploy codefresh specific API Objects
93+
run: |
94+
kubectl create ns ${{ github.base_ref }}
95+
kubectl -n ${{ github.base_ref }} apply -f .github/configs/codefresh-k8s.yaml
96+
9397
- name: Create an external redis for ArgoCD externalRedis feature
9498
if: contains(steps.list-changed.outputs.changed_charts, 'argo-cd')
9599
run: |
96100
kubectl create namespace redis
97101
helm repo add bitnami https://charts.bitnami.com/bitnami
98102
helm install redis bitnami/redis --wait --namespace redis --set auth.password=argocd --set architecture=standalone
99-
100103
- name: Run chart-testing (install)
101-
run: ct install --config ./.github/configs/ct-install.yaml
102-
if: steps.list-changed.outputs.changed == 'true'
104+
run: ct install --config ./.github/configs/ct-install.yaml --target-branch ${{ github.base_ref }} --namespace ${{ github.base_ref }}
105+
if: steps.list-changed.outputs.changed == 'true'

.github/workflows/publish.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ name: Chart Publish
33
on:
44
push:
55
branches:
6-
- main
7-
paths:
8-
- "charts/**"
6+
- argo-events
97

108
permissions:
119
contents: read
@@ -31,7 +29,6 @@ jobs:
3129
- name: Add dependency chart repos
3230
run: |
3331
helm repo add dandydeveloper https://dandydeveloper.github.io/charts/
34-
3532
- name: Configure Git
3633
run: |
3734
git config user.name "$GITHUB_ACTOR"
@@ -41,6 +38,12 @@ jobs:
4138
- name: Fetch current Chart Index
4239
run: |
4340
git checkout origin/gh-pages index.yaml
41+
42+
- name: Package chart
43+
run: |
44+
rm -rf .cr-release-packages
45+
mkdir .cr-release-packages
46+
helm package charts/argo-events -u -d .cr-release-packages/
4447
4548
# The GitHub repository secret `PGP_PRIVATE_KEY` contains the private key
4649
# in ASCII-armored format. To export a (new) key, run this command:
@@ -59,9 +62,12 @@ jobs:
5962
PGP_PASSPHRASE: "${{ secrets.PGP_PASSPHRASE }}"
6063

6164
- name: Run chart-releaser
62-
uses: helm/chart-releaser-action@a917fd15b20e8b64b94d9158ad54cd6345335584 # v1.6.0
65+
# todo: change later to v1.6.0 (also in agro-rollouts chart)
66+
# issue: https://github.com/helm/chart-releaser-action/issues/171
67+
uses: helm/chart-releaser-action@be16258da8010256c6e82849661221415f031968 # v1.5.0
6368
with:
6469
config: "./.github/configs/cr.yaml"
70+
skip_packaging: true
6571
env:
6672
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
6773

@@ -80,4 +86,4 @@ jobs:
8086
break
8187
fi
8288
helm push "${pkg}" oci://ghcr.io/${{ github.repository }}
83-
done
89+
done

charts/argo-events/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v2
2-
appVersion: v1.9.2
2+
appVersion: v1.9.2-cap-CR-24607
33
description: A Helm chart for Argo Events, the event-driven workflow automation framework
44
name: argo-events
5-
version: 2.4.7
5+
version: 2.4.7-cap-CR-24607
66
home: https://github.com/argoproj/argo-helm
77
icon: https://avatars.githubusercontent.com/u/30269780?s=200&v=4
88
keywords:

charts/argo-events/README.md

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ Some users would prefer to install the CRDs _outside_ of the chart. You can disa
3838

3939
You can install the CRDs manually from `templates/crds` folder.
4040

41+
### 2.4.*
42+
43+
At github events source githubUploadURL is required when githubBaseURL is set
44+
4145
### 2.0.*
4246

4347
Custom resource definitions were moved to `templates` folder so they can be managed by Helm.
@@ -58,13 +62,13 @@ done
5862

5963
| Key | Type | Default | Description |
6064
|-----|------|---------|-------------|
61-
| configs.jetstream.settings.maxFileStore | int | `-1` | Maximum size of the file storage (e.g. 20G) |
62-
| configs.jetstream.settings.maxMemoryStore | int | `-1` | Maximum size of the memory storage (e.g. 1G) |
63-
| configs.jetstream.streamConfig.duplicates | string | `"300s"` | Not documented at the moment |
64-
| configs.jetstream.streamConfig.maxAge | string | `"72h"` | Maximum age of existing messages, i.e. “72h”, “4h35m” |
65-
| configs.jetstream.streamConfig.maxBytes | string | `"1GB"` | |
66-
| configs.jetstream.streamConfig.maxMsgs | int | `1000000` | Maximum number of messages before expiring oldest message |
67-
| configs.jetstream.streamConfig.replicas | int | `3` | Number of replicas, defaults to 3 and requires minimal 3 |
65+
| configs.jetstream.settings.max_file_store | string | `"1TB"` | |
66+
| configs.jetstream.settings.max_memory_store | int | `-1` | |
67+
| configs.jetstream.streamConfig.duplicates | string | `"300s"` | |
68+
| configs.jetstream.streamConfig.maxAge | string | `"168h"` | |
69+
| configs.jetstream.streamConfig.maxBytes | int | `-1` | |
70+
| configs.jetstream.streamConfig.maxMsgs | int | `50000` | |
71+
| configs.jetstream.streamConfig.replicas | int | `3` | |
6872
| configs.jetstream.versions[0].configReloaderImage | string | `"natsio/nats-server-config-reloader:0.14.0"` | |
6973
| configs.jetstream.versions[0].metricsExporterImage | string | `"natsio/prometheus-nats-exporter:0.14.0"` | |
7074
| configs.jetstream.versions[0].natsImage | string | `"nats:2.10.10"` | |
@@ -120,7 +124,7 @@ done
120124
| global.additionalLabels | object | `{}` | Additional labels to add to all resources |
121125
| global.hostAliases | list | `[]` | Mapping between IP and hostnames that will be injected as entries in the pod's hosts files |
122126
| global.image.imagePullPolicy | string | `"IfNotPresent"` | If defined, a imagePullPolicy applied to all Argo Events deployments |
123-
| global.image.repository | string | `"quay.io/argoproj/argo-events"` | If defined, a repository applied to all Argo Events deployments |
127+
| global.image.repository | string | `"quay.io/codefresh/argo-events"` | If defined, a repository applied to all Argo Events deployments |
124128
| global.image.tag | string | `""` | Overrides the global Argo Events image tag whose default is the chart appVersion |
125129
| global.imagePullSecrets | list | `[]` | If defined, uses a Secret to pull an image from a private Docker registry or repository |
126130
| global.podAnnotations | object | `{}` | Annotations for the all deployed pods |
@@ -193,7 +197,7 @@ done
193197
|-----|------|---------|-------------|
194198
| webhook.affinity | object | `{}` | Assign custom [affinity] rules to the deployment |
195199
| webhook.containerSecurityContext | object | `{}` | Event controller container-level security context |
196-
| webhook.enabled | bool | `false` | Enable admission webhook. Applies only for cluster-wide installation |
200+
| webhook.enabled | bool | `true` | Enable admission webhook. Applies only for cluster-wide installation |
197201
| webhook.env | list | `[]` (See [values.yaml]) | Environment variables to pass to event controller |
198202
| webhook.envFrom | list | `[]` (See [values.yaml]) | envFrom to pass to event controller |
199203
| webhook.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Image pull policy for the event controller |

charts/argo-events/README.md.gotmpl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ Some users would prefer to install the CRDs _outside_ of the chart. You can disa
3838

3939
You can install the CRDs manually from `templates/crds` folder.
4040

41+
### 2.4.*
42+
43+
At github events source githubUploadURL is required when githubBaseURL is set
44+
4145
### 2.0.*
4246

4347
Custom resource definitions were moved to `templates` folder so they can be managed by Helm.

charts/argo-events/values.yaml

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ crds:
3030
global:
3131
image:
3232
# -- If defined, a repository applied to all Argo Events deployments
33-
repository: quay.io/argoproj/argo-events
33+
repository: quay.io/codefresh/argo-events
3434
# -- Overrides the global Argo Events image tag whose default is the chart appVersion
3535
tag: ""
3636
# -- If defined, a imagePullPolicy applied to all Argo Events deployments
@@ -76,25 +76,15 @@ configs:
7676

7777
## JetStream event bus
7878
jetstream:
79-
# Default JetStream settings, could be overridden by EventBus JetStream spec
80-
# Ref: https://docs.nats.io/running-a-nats-service/configuration#jetstream
8179
settings:
82-
# -- Maximum size of the memory storage (e.g. 1G)
83-
maxMemoryStore: -1
84-
# -- Maximum size of the file storage (e.g. 20G)
85-
maxFileStore: -1
80+
max_memory_store: -1
81+
max_file_store: 1TB
8682
streamConfig:
87-
# -- Maximum number of messages before expiring oldest message
88-
maxMsgs: 1000000
89-
# -- Maximum age of existing messages, i.e. “72h”, “4h35m”
90-
maxAge: 72h
91-
# Total size of messages before expiring oldest message, 0 means unlimited.
92-
maxBytes: 1GB
93-
# -- Number of replicas, defaults to 3 and requires minimal 3
83+
maxMsgs: 50000
84+
maxAge: 168h
85+
maxBytes: -1
9486
replicas: 3
95-
# -- Not documented at the moment
9687
duplicates: 300s
97-
# Supported versions of JetStream eventbus
9888
versions:
9989
- version: latest
10090
natsImage: nats:2.10.10
@@ -343,7 +333,7 @@ controller:
343333
## Argo Events admission webhook
344334
webhook:
345335
# -- Enable admission webhook. Applies only for cluster-wide installation
346-
enabled: false
336+
enabled: true
347337

348338
# -- Argo Events admission webhook name string
349339
name: events-webhook

0 commit comments

Comments
 (0)