Skip to content

Commit 0559af2

Browse files
ilia-medvedev-codefreshdanielm-codefreshmikhail-klimko
authored
Release 0.2.14 (#61)
* fix private registry utility bug and switch to unprivileged nginx * update argocd * update argocd * bump app-proxy (#59) Co-authored-by: ilia-medvedev-codefresh <ilia.medvedev@codefresh.io> * add enrichment images to chart * fix lint * change app-proxy container port * update changes annotation * bump app-proxy * upd Chart.yaml * helm-docs * resolver values for internal-router Signed-off-by: mikhail-klimko <mikhail.klimko@codefresh.io> * add codeowners --------- Signed-off-by: mikhail-klimko <mikhail.klimko@codefresh.io> Co-authored-by: Daniel Maizel <daniel.maizel@codefresh.io> Co-authored-by: mikhail-klimko <mikhail.klimko@codefresh.io>
1 parent 62ce035 commit 0559af2

File tree

12 files changed

+156
-47
lines changed

12 files changed

+156
-47
lines changed

‎CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @codefresh-io/DevOps
1+
* @codefresh-io/DevOps daniel.maizel@codefresh.io noam.gal@codefresh.io

‎charts/gitops-runtime/Chart.yaml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v2
2-
appVersion: 0.1.30
2+
appVersion: 0.1.32
33
description: A Helm chart for Codefresh gitops runtime
44
name: gitops-runtime
5-
version: 0.2.13-alpha.1
5+
version: 0.2.14
66
home: https://github.com/codefresh-io/gitops-runtime-helm
77
icon: https://avatars1.githubusercontent.com/u/11412079?v=3
88
keywords:
@@ -13,18 +13,25 @@ maintainers:
1313
url: https://codefresh-io.github.io/
1414
annotations:
1515
artifacthub.io/alternativeName: "codefresh-gitops-runtime"
16-
artifacthub.io/prerelease: "true"
1716
artifacthub.io/changes: |
18-
- kind: fixed
19-
description: csv generation for private registry utility
17+
- kind: changed
18+
description: Updated `app-proxy` to `1.2337.0`
19+
- kind: changed
20+
description: Update ArgoCD version to v2.7.0-cap-CR-18361-custom-instance-label
21+
- kind: changed
22+
description: Switch internal router to unprivileged (rootless) nginx
23+
- kind: changed
24+
description: Installer image now supports arm64 and amd64 platforms
2025
- kind: added
21-
description: pdb for eventbus
26+
description: Include enrichment images in the chart with possibility to override through values
2227
- kind: fixed
23-
description: fix eventbusname
28+
description: Private registry utility - the utility omitted repositories for images with short names (i.e natsio/prometheus-nats-exporter:0.8.0 was created as registry.example.com/prometheus-nats-exporter:0.8.0). In this version it works as expected.
29+
- kind: changed
30+
description: App-proxy container port changed to 8080
2431
dependencies:
2532
- name: argo-cd
2633
repository: https://codefresh-io.github.io/argo-helm
27-
version: 5.29.2-cap-CR-18430
34+
version: 5.38.1-1-cap-CR-18361
2835
- name: argo-events
2936
repository: https://codefresh-io.github.io/argo-helm
3037
version: 2.0.5-1-cf-init

‎charts/gitops-runtime/README.md

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## Codefresh gitops runtime
2-
![Version: 0.2.13-alpha.1](https://img.shields.io/badge/Version-0.2.13--alpha.1-informational?style=flat-square) ![AppVersion: 0.1.30](https://img.shields.io/badge/AppVersion-0.1.30-informational?style=flat-square)
2+
![Version: 0.2.14](https://img.shields.io/badge/Version-0.2.14-informational?style=flat-square) ![AppVersion: 0.1.32](https://img.shields.io/badge/AppVersion-0.1.32-informational?style=flat-square)
33

44
## Codefresh official documentation:
55
Prior to running the installation please see the official documentation at: https://codefresh.io/docs/docs/installation/gitops/hybrid-gitops-helm-installation/
@@ -15,7 +15,7 @@ We have created a helper utility to resolve this issue:
1515
The utility is packaged in a container image. Below are instructions on executing the utility using Docker:
1616

1717
```
18-
docker run -v <output_dir>:/output quay.io/codefresh/gitops-runtime-private-registry-utils:0.2.13-alpha.1 <local_registry>
18+
docker run -v <output_dir>:/output quay.io/codefresh/gitops-runtime-private-registry-utils:0.2.14 <local_registry>
1919
```
2020
`output_dir` - is a local directory where the utility will output files. <br>
2121
`local_registry` - is your local registry where you want to mirror the images to
@@ -42,11 +42,13 @@ The utility will output 4 files into the folder:
4242
| app-proxy.extraVolumeMounts | list | `[]` | Extra volume mounts for main container |
4343
| app-proxy.extraVolumes | list | `[]` | extra volumes |
4444
| app-proxy.fullnameOverride | string | `"cap-app-proxy"` | |
45-
| app-proxy.image-enrichment | object | `{"config":{"clientHeartbeatIntervalInSeconds":5,"concurrencyCmKey":"imageReportExecutor","concurrencyCmName":"workflow-synchronization-semaphores","podGcStrategy":"OnWorkflowCompletion","ttlActiveInSeconds":900,"ttlAfterCompletionInSeconds":86400},"enabled":true,"serviceAccount":{"annotations":null,"create":true,"name":"codefresh-image-enrichment-sa"}}` | Image enrichment process configuration |
46-
| app-proxy.image-enrichment.config | object | `{"clientHeartbeatIntervalInSeconds":5,"concurrencyCmKey":"imageReportExecutor","concurrencyCmName":"workflow-synchronization-semaphores","podGcStrategy":"OnWorkflowCompletion","ttlActiveInSeconds":900,"ttlAfterCompletionInSeconds":86400}` | Configurations for image enrichment workflow |
45+
| app-proxy.image-enrichment | object | `{"config":{"clientHeartbeatIntervalInSeconds":5,"concurrencyCmKey":"imageReportExecutor","concurrencyCmName":"workflow-synchronization-semaphores","images":{"gitEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-git-info","tag":"1.1.10-main"},"jiraEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-jira-info","tag":"1.1.10-main"},"reportImage":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-report-image-info","tag":"1.1.10-main"}},"podGcStrategy":"OnWorkflowCompletion","ttlActiveInSeconds":900,"ttlAfterCompletionInSeconds":86400},"enabled":true,"serviceAccount":{"annotations":null,"create":true,"name":"codefresh-image-enrichment-sa"}}` | Image enrichment process configuration |
46+
| app-proxy.image-enrichment.config | object | `{"clientHeartbeatIntervalInSeconds":5,"concurrencyCmKey":"imageReportExecutor","concurrencyCmName":"workflow-synchronization-semaphores","images":{"gitEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-git-info","tag":"1.1.10-main"},"jiraEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-jira-info","tag":"1.1.10-main"},"reportImage":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-report-image-info","tag":"1.1.10-main"}},"podGcStrategy":"OnWorkflowCompletion","ttlActiveInSeconds":900,"ttlAfterCompletionInSeconds":86400}` | Configurations for image enrichment workflow |
4747
| app-proxy.image-enrichment.config.clientHeartbeatIntervalInSeconds | int | `5` | Client heartbeat interval in seconds for image enrichemnt workflow |
4848
| app-proxy.image-enrichment.config.concurrencyCmKey | string | `"imageReportExecutor"` | The name of the key in the configmap to use as synchronization semaphore |
4949
| app-proxy.image-enrichment.config.concurrencyCmName | string | `"workflow-synchronization-semaphores"` | The name of the configmap to use as synchronization semaphore, see https://argoproj.github.io/argo-workflows/synchronization/ |
50+
| app-proxy.image-enrichment.config.images | object | `{"gitEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-git-info","tag":"1.1.10-main"},"jiraEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-jira-info","tag":"1.1.10-main"},"reportImage":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-report-image-info","tag":"1.1.10-main"}}` | Enrichemnt images |
51+
| app-proxy.image-enrichment.config.images.reportImage | object | `{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-report-image-info","tag":"1.1.10-main"}` | Report image enrichment task image |
5052
| app-proxy.image-enrichment.config.podGcStrategy | string | `"OnWorkflowCompletion"` | Pod grabage collection strategy. By default all pods will be deleted when the enrichment workflow completes. |
5153
| app-proxy.image-enrichment.config.ttlActiveInSeconds | int | `900` | Maximum allowed runtime for the enrichment workflow |
5254
| app-proxy.image-enrichment.config.ttlAfterCompletionInSeconds | int | `86400` | Number of seconds to live after completion |
@@ -57,14 +59,14 @@ The utility will output 4 files into the folder:
5759
| 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 |
5860
| app-proxy.image.pullPolicy | string | `"IfNotPresent"` | |
5961
| app-proxy.image.repository | string | `"quay.io/codefresh/cap-app-proxy"` | |
60-
| app-proxy.image.tag | string | `"1.2268.0"` | |
62+
| app-proxy.image.tag | string | `"1.2337.0"` | |
6163
| app-proxy.imagePullSecrets | list | `[]` | |
6264
| app-proxy.initContainer.command[0] | string | `"./init.sh"` | |
6365
| app-proxy.initContainer.env | object | `{}` | |
6466
| app-proxy.initContainer.extraVolumeMounts | list | `[]` | Extra volume mounts for init container |
6567
| app-proxy.initContainer.image.pullPolicy | string | `"IfNotPresent"` | |
6668
| app-proxy.initContainer.image.repository | string | `"quay.io/codefresh/cap-app-proxy-init"` | |
67-
| app-proxy.initContainer.image.tag | string | `"1.2268.0"` | |
69+
| app-proxy.initContainer.image.tag | string | `"1.2337.0"` | |
6870
| app-proxy.initContainer.resources.limits.cpu | string | `"1"` | |
6971
| app-proxy.initContainer.resources.limits.memory | string | `"512Mi"` | |
7072
| app-proxy.initContainer.resources.requests.cpu | string | `"0.2"` | |
@@ -103,6 +105,7 @@ The utility will output 4 files into the folder:
103105
| argo-cd.configs.params."server.insecure" | bool | `true` | |
104106
| argo-cd.crds.install | bool | `true` | |
105107
| argo-cd.fullnameOverride | string | `"argo-cd"` | |
108+
| argo-cd.notifications.bots.slack | string | `nil` | |
106109
| argo-events.crds.install | bool | `false` | |
107110
| argo-events.fullnameOverride | string | `"argo-events"` | |
108111
| argo-rollouts.controller.replicas | int | `1` | |
@@ -161,11 +164,14 @@ The utility will output 4 files into the folder:
161164
| installer | object | `{"image":{"pullPolicy":"IfNotPresent","repository":"quay.io/codefresh/gitops-runtime-installer","tag":""},"skipValidation":false}` | Runtime installer used for running hooks and checks on the release |
162165
| installer.skipValidation | bool | `false` | if set to true, pre-install hook will *not* run |
163166
| internal-router.affinity | object | `{}` | |
167+
| internal-router.clusterDomain | string | `"cluster.local"` | |
168+
| internal-router.dnsNamespace | string | `"kube-system"` | |
169+
| internal-router.dnsService | string | `"kube-dns"` | |
164170
| internal-router.env | object | `{}` | Environment variables - see values.yaml inside the chart for usage |
165171
| internal-router.fullnameOverride | string | `"internal-router"` | |
166172
| internal-router.image.pullPolicy | string | `"IfNotPresent"` | |
167-
| internal-router.image.repository | string | `"nginx"` | |
168-
| internal-router.image.tag | string | `"1.22-bullseye"` | |
173+
| internal-router.image.repository | string | `"nginxinc/nginx-unprivileged"` | |
174+
| internal-router.image.tag | string | `"1.23-alpine"` | |
169175
| internal-router.imagePullSecrets | list | `[]` | |
170176
| internal-router.nameOverride | string | `""` | |
171177
| internal-router.nodeSelector | object | `{}` | |

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ enrichmentPodGcStrategy: {{ $enrichmentValues.config.podGcStrategy | quote}}
1717
enrichmentTtlAfterCompletionInSeconds: {{ $enrichmentValues.config.ttlAfterCompletionInSeconds | quote }}
1818
enrichmentTtlActiveInSeconds: {{ $enrichmentValues.config.ttlActiveInSeconds | quote }}
1919
enrichmentClientHeartbeatIntervalInSeconds: {{ $enrichmentValues.config.clientHeartbeatIntervalInSeconds | quote }}
20+
enrichmentImageReportingImage: {{ printf "%s/%s:%s" $enrichmentValues.config.images.reportImage.registry $enrichmentValues.config.images.reportImage.repository $enrichmentValues.config.images.reportImage.tag | quote }}
21+
enrichmentGitEnrichmentImage: {{ printf "%s/%s:%s" $enrichmentValues.config.images.gitEnrichment.registry $enrichmentValues.config.images.gitEnrichment.repository $enrichmentValues.config.images.gitEnrichment.tag | quote }}
22+
enrichmentJiraEnrichmentImage: {{ printf "%s/%s:%s" $enrichmentValues.config.images.jiraEnrichment.registry $enrichmentValues.config.images.jiraEnrichment.repository $enrichmentValues.config.images.jiraEnrichment.tag | quote }}
2023
{{- end }}
2124
{{- end }}
2225

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ spec:
5656
imagePullPolicy: {{ .Values.image.pullPolicy }}
5757
ports:
5858
- name: http
59-
containerPort: 80
59+
containerPort: 8080
6060
readinessProbe:
6161
initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
6262
periodSeconds: {{ .Values.readinessProbe.periodSeconds }}

‎charts/gitops-runtime/templates/_components/cap-app-proxy/environment-variables/_main-container.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,24 @@ IRW_HEARTBEAT_INTERVAL_IN_SECONDS:
183183
name: cap-app-proxy-cm
184184
key: enrichmentClientHeartbeatIntervalInSeconds
185185
optional: true
186+
IRW_REPORT_IMAGE_TASK_IMAGE:
187+
valueFrom:
188+
configMapKeyRef:
189+
name: cap-app-proxy-cm
190+
key: enrichmentImageReportingImage
191+
optional: true
192+
IRW_GIT_ENRICHMENT_TASK_IMAGE:
193+
valueFrom:
194+
configMapKeyRef:
195+
name: cap-app-proxy-cm
196+
key: enrichmentGitEnrichmentImage
197+
optional: true
198+
IRW_JIRA_ENRICHMENT_TASK_IMAGE:
199+
valueFrom:
200+
configMapKeyRef:
201+
name: cap-app-proxy-cm
202+
key: enrichmentJiraEnrichmentImage
203+
optional: true
186204
NODE_EXTRA_CA_CERTS: /app/config/all/all.cer
187205
{{- end -}}
188206

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

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,23 @@ metadata:
66
data:
77
default.conf.template: |
88
server {
9-
listen 80 default_server;
10-
root /usr/local/app;
9+
listen 8080;
1110
access_log /dev/stdout main;
1211
error_log /dev/stdout;
13-
14-
12+
13+
{{- if .Values.resolver }}
14+
resolver {{ .Values.resolver }} valid=10s;
15+
{{- else }}
16+
resolver {{ .Values.dnsService }}.{{ .Values.dnsNamespace }}.svc.{{ .Values.clusterDomain }} valid=10s;
17+
{{- end }}
18+
1519
location /app-proxy {
1620
# WebSocket support
1721
proxy_http_version 1.1;
1822
proxy_set_header Upgrade $http_upgrade;
1923
proxy_set_header Connection "upgrade";
2024
chunked_transfer_encoding off;
21-
25+
2226
proxy_pass {{ index (get .Values.routing "app-proxy") "internalUrl" }};
2327
}
2428
@@ -28,20 +32,19 @@ data:
2832
proxy_set_header Connection '';
2933
proxy_http_version 1.1;
3034
chunked_transfer_encoding off;
31-
35+
3236
proxy_pass {{ .Values.routing.workflows.internalUrl }};
3337
}
3438
{{- end }}
35-
39+
3640
location ~ /webhooks/([^/]+)/([^/]+) {
37-
resolver kube-dns.kube-system.svc.cluster.local valid=10s;
3841
proxy_pass http://$2-eventsource-svc.$1.svc.cluster.local;
3942
}
40-
43+
4144
location /readyz {
4245
return 200 'ok';
4346
}
44-
47+
4548
location /healthz {
4649
return 200 'ok';
4750
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,20 @@ spec:
3838
imagePullPolicy: {{ .Values.image.pullPolicy }}
3939
ports:
4040
- name: http
41-
containerPort: 80
41+
containerPort: 8080
4242
protocol: TCP
4343
readinessProbe:
4444
initialDelaySeconds: 10
4545
timeoutSeconds: 10
4646
httpGet:
47-
port: 80
47+
port: http
4848
path: /readyz
4949
livenessProbe:
5050
initialDelaySeconds: 10
5151
timeoutSeconds: 10
5252
failureThreshold: 10
5353
httpGet:
54-
port: 80
54+
port: http
5555
path: /healthz
5656
resources:
5757
{{- toYaml .Values.resources | nindent 12 }}

‎charts/gitops-runtime/tests/app-proxy-image-enrichemnt_test.yaml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,21 @@ tests:
3030
app-proxy.image-enrichment.config.ttlActiveInSeconds: 1
3131
app-proxy.image-enrichment.config.clientHeartbeatIntervalInSeconds: 1
3232
app-proxy.image-enrichment.serviceAccount.name: test
33+
app-proxy.image-enrichment.config.images:
34+
reportImage:
35+
registry: registry.example
36+
repository: codefresh/report-image
37+
tag: 1-test-report
38+
# Git enrichment task image
39+
gitEnrichment:
40+
registry: reg.ex
41+
repository: codefresh/git-enrich
42+
tag: 1-test-git
43+
# Jira enrichment task image
44+
jiraEnrichment:
45+
registry: my.reg
46+
repository: codefresh/jira-enrich
47+
tag: 1-test-jira
3348
asserts:
3449
- equal:
3550
path: data.enrichmentConcurrencyCmName
@@ -52,6 +67,15 @@ tests:
5267
- equal:
5368
path: data.enrichmentServiceAccountName
5469
value: test
70+
- equal:
71+
path: data.enrichmentImageReportingImage
72+
value: registry.example/codefresh/report-image:1-test-report
73+
- equal:
74+
path: data.enrichmentGitEnrichmentImage
75+
value: reg.ex/codefresh/git-enrich:1-test-git
76+
- equal:
77+
path: data.enrichmentJiraEnrichmentImage
78+
value: my.reg/codefresh/jira-enrich:1-test-jira
5579

5680
- it: app proxy environment variables set for enrichemnt and match the values in the configmap
5781
template: 'app-proxy/deployment.yaml'
@@ -123,6 +147,33 @@ tests:
123147
name: cap-app-proxy-cm
124148
key: enrichmentServiceAccountName
125149
optional: true
150+
- contains:
151+
path: spec.template.spec.containers[0].env
152+
content:
153+
name: IRW_REPORT_IMAGE_TASK_IMAGE
154+
valueFrom:
155+
configMapKeyRef:
156+
name: cap-app-proxy-cm
157+
key: enrichmentImageReportingImage
158+
optional: true
159+
- contains:
160+
path: spec.template.spec.containers[0].env
161+
content:
162+
name: IRW_GIT_ENRICHMENT_TASK_IMAGE
163+
valueFrom:
164+
configMapKeyRef:
165+
name: cap-app-proxy-cm
166+
key: enrichmentGitEnrichmentImage
167+
optional: true
168+
- contains:
169+
path: spec.template.spec.containers[0].env
170+
content:
171+
name: IRW_JIRA_ENRICHMENT_TASK_IMAGE
172+
valueFrom:
173+
configMapKeyRef:
174+
name: cap-app-proxy-cm
175+
key: enrichmentJiraEnrichmentImage
176+
optional: true
126177

127178
- it: Verify correct name of serviceAccount
128179
template: 'app-proxy/enrichment/sa.yaml'

0 commit comments

Comments
 (0)