Skip to content

Commit 2fb47e2

Browse files
ilia-medvedev-codefreshilia-medvedev-codefresh
committed
Merge branch 'argo-events' of https://github.com/codefresh-io/argo-helm into argo-events
2 parents 8d3d875 + 9494f30 commit 2fb47e2

File tree

7 files changed

+119
-62
lines changed

7 files changed

+119
-62
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: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
## Reference: https://github.com/helm/chart-testing-action
22
name: Linting and Testing
33
on: pull_request
4+
5+
permissions:
6+
contents: read
7+
48
jobs:
59
chart-test:
610
runs-on: ubuntu-latest
@@ -11,12 +15,18 @@ jobs:
1115
fetch-depth: 0
1216

1317
- name: Set up Helm
14-
uses: azure/setup-helm@v1
18+
uses: azure/setup-helm@v3
19+
with:
20+
version: v3.10.1 # Also update in publish.yaml
21+
22+
- name: Setup Kubectl
23+
uses: azure/setup-kubectl@v3
24+
id: install
1525

1626
- name: Set up python
17-
uses: actions/setup-python@v3
27+
uses: actions/setup-python@v4
1828
with:
19-
python-version: 3.8
29+
python-version: 3.9
2030

2131
- name: Setup Chart Linting
2232
id: lint
@@ -29,14 +39,14 @@ jobs:
2939
id: list-changed
3040
run: |
3141
## If executed with debug this won't work anymore.
32-
changed=$(ct --config ./.github/configs/ct-lint.yaml list-changed)
42+
changed=$(ct --config ./.github/configs/ct-lint.yaml --target-branch ${{ github.base_ref }} list-changed)
3343
charts=$(echo "$changed" | tr '\n' ' ' | xargs)
3444
if [[ -n "$changed" ]]; then
3545
echo "::set-output name=changed::true"
3646
echo "::set-output name=changed_charts::$charts"
3747
fi
3848
- name: Run chart-testing (lint)
39-
run: ct lint --debug --config ./.github/configs/ct-lint.yaml --lint-conf ./.github/configs/lintconf.yaml
49+
run: ct lint --debug --config ./.github/configs/ct-lint.yaml --target-branch ${{ github.base_ref }} --lint-conf ./.github/configs/lintconf.yaml
4050

4151
- name: Run docs-testing (helm-docs)
4252
id: helm-docs
@@ -49,32 +59,29 @@ jobs:
4959
else
5060
echo -e '\033[0;32mDocumentation up to date\033[0m ✔'
5161
fi
52-
5362
- name: Create kind cluster
54-
uses: helm/kind-action@v1.2.0
63+
uses: helm/kind-action@v1.4.0
5564
if: steps.list-changed.outputs.changed == 'true'
5665
with:
5766
config: .github/configs/kind-config.yaml
5867

59-
- name: Deploy latest ArgoCD CRDs when testing ArgoCD extensions
60-
if: |
61-
contains(steps.list-changed.outputs.changed_charts, 'argocd-image-updater')
62-
run: |
63-
kubectl apply -f charts/argo-cd/templates/crds
64-
6568
- name: Skip HPA tests of ArgoCD
6669
if: contains(steps.list-changed.outputs.changed_charts, 'argo-cd')
6770
run: |
6871
## Metrics API not available in kind cluster
6972
rm charts/argo-cd/ci/ha-autoscaling-values.yaml
7073
74+
- name: Deploy codefresh specific API Objects
75+
run: |
76+
kubectl create ns ${{ github.base_ref }}
77+
kubectl -n ${{ github.base_ref }} apply -f .github/configs/codefresh-k8s.yaml
78+
7179
- name: Create an external redis for ArgoCD externalRedis feature
7280
if: contains(steps.list-changed.outputs.changed_charts, 'argo-cd')
7381
run: |
7482
kubectl create namespace redis
7583
helm repo add bitnami https://charts.bitnami.com/bitnami
7684
helm install redis bitnami/redis --wait --namespace redis --set auth.password=argocd --set architecture=standalone
77-
7885
- name: Run chart-testing (install)
79-
run: ct install --config ./.github/configs/ct-install.yaml
80-
if: steps.list-changed.outputs.changed == 'true'
86+
run: ct install --config ./.github/configs/ct-install.yaml --target-branch ${{ github.base_ref }} --namespace ${{ github.base_ref }}
87+
if: steps.list-changed.outputs.changed == 'true'

‎charts/argo-events/Chart.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v2
2-
appVersion: v1.7.2
2+
appVersion: v1.7.2-cap-CR-14600
33
description: A Helm chart for Argo Events, the event-driven workflow automation framework
44
name: argo-events
5-
version: 2.0.5-0-ini
5+
version: 2.0.5-1-cf-init
66
home: https://github.com/argoproj/argo-helm
77
icon: https://argoproj.github.io/argo-events/assets/logo.png
88
keywords:
@@ -15,4 +15,4 @@ maintainers:
1515
url: https://argoproj.github.io/
1616
annotations:
1717
artifacthub.io/changes: |
18-
- "[Changed]: Upgrade Argo events controller to v1.7.2"
18+
- "[Changed]: Upgrade Argo events controller to v1.7.2-cap-CR-14600"

‎charts/argo-events/README.md‎

Lines changed: 35 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,41 @@ done
4545

4646
| Key | Type | Default | Description |
4747
|-----|------|---------|-------------|
48-
| configs.jetstream.settings.maxFileStore | int | `-1` | Maximum size of the file storage (e.g. 20G) |
49-
| configs.jetstream.settings.maxMemoryStore | int | `-1` | Maximum size of the memory storage (e.g. 1G) |
50-
| configs.jetstream.streamConfig.duplicates | string | `"300s"` | Not documented at the moment |
51-
| configs.jetstream.streamConfig.maxAge | string | `"72h"` | Maximum age of existing messages, i.e. “72h”, “4h35m” |
52-
| configs.jetstream.streamConfig.maxBytes | string | `"1GB"` | |
53-
| configs.jetstream.streamConfig.maxMsgs | int | `1000000` | Maximum number of messages before expiring oldest message |
54-
| configs.jetstream.streamConfig.replicas | int | `3` | Number of replicas, defaults to 3 and requires minimal 3 |
55-
| configs.jetstream.versions[0].configReloaderImage | string | `"natsio/nats-server-config-reloader:latest"` | |
56-
| configs.jetstream.versions[0].metricsExporterImage | string | `"natsio/prometheus-nats-exporter:latest"` | |
57-
| configs.jetstream.versions[0].natsImage | string | `"nats:latest"` | |
48+
| configs.jetstream.settings.max_file_store | string | `"1TB"` | |
49+
| configs.jetstream.settings.max_memory_store | int | `-1` | |
50+
| configs.jetstream.streamConfig.duplicates | string | `"300s"` | |
51+
| configs.jetstream.streamConfig.maxAge | string | `"168h"` | |
52+
| configs.jetstream.streamConfig.maxBytes | int | `-1` | |
53+
| configs.jetstream.streamConfig.maxMsgs | int | `50000` | |
54+
| configs.jetstream.streamConfig.replicas | int | `3` | |
55+
| configs.jetstream.versions[0].configReloaderImage | string | `"natsio/nats-server-config-reloader:0.7.0"` | |
56+
| configs.jetstream.versions[0].metricsExporterImage | string | `"natsio/prometheus-nats-exporter:0.9.1"` | |
57+
| configs.jetstream.versions[0].natsImage | string | `"nats:2.8.1"` | |
5858
| configs.jetstream.versions[0].startCommand | string | `"/nats-server"` | |
5959
| configs.jetstream.versions[0].version | string | `"latest"` | |
60-
| configs.nats.versions | list | `[{"metricsExporterImage":"natsio/prometheus-nats-exporter:latest","natsStreamingImage":"nats-streaming:latest","version":"latest"}]` | Supported versions of NATS event bus |
60+
| configs.jetstream.versions[1].configReloaderImage | string | `"natsio/nats-server-config-reloader:0.7.0"` | |
61+
| configs.jetstream.versions[1].metricsExporterImage | string | `"natsio/prometheus-nats-exporter:0.9.1"` | |
62+
| configs.jetstream.versions[1].natsImage | string | `"nats:2.8.1"` | |
63+
| configs.jetstream.versions[1].startCommand | string | `"/nats-server"` | |
64+
| configs.jetstream.versions[1].version | string | `"2.8.1"` | |
65+
| configs.jetstream.versions[2].configReloaderImage | string | `"natsio/nats-server-config-reloader:0.7.0"` | |
66+
| configs.jetstream.versions[2].metricsExporterImage | string | `"natsio/prometheus-nats-exporter:0.9.1"` | |
67+
| configs.jetstream.versions[2].natsImage | string | `"nats:2.8.1-alpine"` | |
68+
| configs.jetstream.versions[2].startCommand | string | `"nats-server"` | |
69+
| configs.jetstream.versions[2].version | string | `"2.8.1-alpine"` | |
70+
| configs.jetstream.versions[3].configReloaderImage | string | `"natsio/nats-server-config-reloader:0.7.0"` | |
71+
| configs.jetstream.versions[3].metricsExporterImage | string | `"natsio/prometheus-nats-exporter:0.9.1"` | |
72+
| configs.jetstream.versions[3].natsImage | string | `"nats:2.8.2"` | |
73+
| configs.jetstream.versions[3].startCommand | string | `"/nats-server"` | |
74+
| configs.jetstream.versions[3].version | string | `"2.8.2"` | |
75+
| configs.jetstream.versions[4].configReloaderImage | string | `"natsio/nats-server-config-reloader:0.7.0"` | |
76+
| configs.jetstream.versions[4].metricsExporterImage | string | `"natsio/prometheus-nats-exporter:0.9.1"` | |
77+
| configs.jetstream.versions[4].natsImage | string | `"nats:2.8.2-alpine"` | |
78+
| configs.jetstream.versions[4].startCommand | string | `"nats-server"` | |
79+
| configs.jetstream.versions[4].version | string | `"2.8.2-alpine"` | |
80+
| configs.nats.versions[0].metricsExporterImage | string | `"natsio/prometheus-nats-exporter:0.8.0"` | |
81+
| configs.nats.versions[0].natsStreamingImage | string | `"nats-streaming:0.22.1"` | |
82+
| configs.nats.versions[0].version | string | `"0.22.1"` | |
6183
| crds.annotations | object | `{}` | Annotations to be added to all CRDs |
6284
| crds.install | bool | `true` | Install and upgrade CRDs |
6385
| crds.keep | bool | `true` | Keep CRDs on chart uninstall |
@@ -66,7 +88,7 @@ done
6688
| global.additionalLabels | object | `{}` | Additional labels to add to all resources |
6789
| global.hostAliases | list | `[]` | Mapping between IP and hostnames that will be injected as entries in the pod's hosts files |
6890
| global.image.imagePullPolicy | string | `"IfNotPresent"` | If defined, a imagePullPolicy applied to all Argo Events deployments |
69-
| global.image.repository | string | `"quay.io/argoproj/argo-events"` | If defined, a repository applied to all Argo Events deployments |
91+
| global.image.repository | string | `"quay.io/codefresh/argo-events"` | If defined, a repository applied to all Argo Events deployments |
7092
| global.image.tag | string | `""` | Overrides the global Argo Events image tag whose default is the chart appVersion |
7193
| global.imagePullSecrets | list | `[]` | If defined, uses a Secret to pull an image from a private Docker registry or repository |
7294
| global.podAnnotations | object | `{}` | Annotations for the all deployed pods |
@@ -137,7 +159,7 @@ done
137159
|-----|------|---------|-------------|
138160
| webhook.affinity | object | `{}` | Assign custom [affinity] rules to the deployment |
139161
| webhook.containerSecurityContext | object | `{}` | Event controller container-level security context |
140-
| webhook.enabled | bool | `false` | Enable admission webhook. Applies only for cluster-wide installation |
162+
| webhook.enabled | bool | `true` | Enable admission webhook. Applies only for cluster-wide installation |
141163
| webhook.env | list | `[]` (See [values.yaml]) | Environment variables to pass to event controller |
142164
| webhook.envFrom | list | `[]` (See [values.yaml]) | envFrom to pass to event controller |
143165
| webhook.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Image pull policy for the event controller |

‎charts/argo-events/values.yaml‎

Lines changed: 35 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ crds:
2727
global:
2828
image:
2929
# -- If defined, a repository applied to all Argo Events deployments
30-
repository: quay.io/argoproj/argo-events
30+
repository: quay.io/codefresh/argo-events
3131
# -- Overrides the global Argo Events image tag whose default is the chart appVersion
3232
tag: ""
3333
# -- If defined, a imagePullPolicy applied to all Argo Events deployments
@@ -61,39 +61,46 @@ global:
6161
configs:
6262
## NATS event bus
6363
nats:
64-
# -- Supported versions of NATS event bus
6564
versions:
66-
- version: latest
67-
natsStreamingImage: nats-streaming:latest
68-
metricsExporterImage: natsio/prometheus-nats-exporter:latest
69-
70-
## JetStream event bus
65+
- version: 0.22.1
66+
natsStreamingImage: nats-streaming:0.22.1
67+
metricsExporterImage: natsio/prometheus-nats-exporter:0.8.0
7168
jetstream:
72-
# Default JetStream settings, could be overridden by EventBus JetStream spec
73-
# Ref: https://docs.nats.io/running-a-nats-service/configuration#jetstream
7469
settings:
75-
# -- Maximum size of the memory storage (e.g. 1G)
76-
maxMemoryStore: -1
77-
# -- Maximum size of the file storage (e.g. 20G)
78-
maxFileStore: -1
70+
max_memory_store: -1
71+
max_file_store: 1TB
7972
streamConfig:
80-
# -- Maximum number of messages before expiring oldest message
81-
maxMsgs: 1000000
82-
# -- Maximum age of existing messages, i.e. “72h”, “4h35m”
83-
maxAge: 72h
84-
# Total size of messages before expiring oldest message, 0 means unlimited.
85-
maxBytes: 1GB
86-
# -- Number of replicas, defaults to 3 and requires minimal 3
73+
maxMsgs: 50000
74+
maxAge: 168h
75+
maxBytes: -1
8776
replicas: 3
88-
# -- Not documented at the moment
8977
duplicates: 300s
90-
# Supported versions of JetStream eventbus
9178
versions:
92-
- version: "latest"
93-
natsImage: nats:latest
94-
metricsExporterImage: natsio/prometheus-nats-exporter:latest
95-
configReloaderImage: natsio/nats-server-config-reloader:latest
96-
startCommand: /nats-server
79+
- version: latest
80+
natsImage: nats:2.8.1
81+
metricsExporterImage: natsio/prometheus-nats-exporter:0.9.1
82+
configReloaderImage: natsio/nats-server-config-reloader:0.7.0
83+
startCommand: /nats-server
84+
- version: 2.8.1
85+
natsImage: nats:2.8.1
86+
metricsExporterImage: natsio/prometheus-nats-exporter:0.9.1
87+
configReloaderImage: natsio/nats-server-config-reloader:0.7.0
88+
startCommand: /nats-server
89+
- version: 2.8.1-alpine
90+
natsImage: nats:2.8.1-alpine
91+
metricsExporterImage: natsio/prometheus-nats-exporter:0.9.1
92+
configReloaderImage: natsio/nats-server-config-reloader:0.7.0
93+
startCommand: nats-server
94+
- version: 2.8.2
95+
natsImage: nats:2.8.2
96+
metricsExporterImage: natsio/prometheus-nats-exporter:0.9.1
97+
configReloaderImage: natsio/nats-server-config-reloader:0.7.0
98+
startCommand: /nats-server
99+
- version: 2.8.2-alpine
100+
natsImage: nats:2.8.2-alpine
101+
metricsExporterImage: natsio/prometheus-nats-exporter:0.9.1
102+
configReloaderImage: natsio/nats-server-config-reloader:0.7.0
103+
startCommand: nats-server
97104

98105
## Argo Events controller
99106
controller:
@@ -265,7 +272,7 @@ controller:
265272
## Argo Events admission webhook
266273
webhook:
267274
# -- Enable admission webhook. Applies only for cluster-wide installation
268-
enabled: false
275+
enabled: true
269276

270277
# -- Argo Events admission webhook name string
271278
name: events-webhook

0 commit comments

Comments
 (0)