Skip to content

Commit 449781c

Browse files
yaroslav-codefreshdenis-codefreshmikhail-klimkoilia-medvedev-codefresh
authored
Release 0.2.16 (0.1.34) (#73)
* events-v1.7.3-cap-CR-19893 * update version and artifacthub.io/changes * add openshift example * add openshift example * docs * fix: openshift title * release 0.2.16 (0.1.34) * ipv6 support in internal router (#67) * feat: update env-vars helper template (#69) * feat: update env-vars helper template --------- Co-authored-by: Denys Melnyk <denis@codefresh.io> Co-authored-by: mikhail-klimko <mikhail.klimko@codefresh.io> Co-authored-by: ilia-medvedev-codefresh <ilia.medvedev@codefresh.io>
1 parent 24117e4 commit 449781c

File tree

8 files changed

+92
-25
lines changed

8 files changed

+92
-25
lines changed

‎charts/gitops-runtime/Chart.yaml‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v2
2-
appVersion: 0.1.33
2+
appVersion: 0.1.34
33
description: A Helm chart for Codefresh gitops runtime
44
name: gitops-runtime
5-
version: 0.2.15
5+
version: 0.2.16
66
home: https://github.com/codefresh-io/gitops-runtime-helm
77
icon: https://avatars1.githubusercontent.com/u/11412079?v=3
88
keywords:
@@ -15,16 +15,24 @@ annotations:
1515
artifacthub.io/alternativeName: "codefresh-gitops-runtime"
1616
artifacthub.io/changes: |
1717
- kind: changed
18-
description: Updated `app-proxy` to `1.2400.4`
18+
description: Update `argo-events` to 2.0.5-1-cf-init
1919
- kind: changed
20-
description: Update ArgoCD version to v2.7.0-cap-CR-19754-deletion-fix
20+
description: Updated `app-proxy` to `1.2411.2`
21+
- kind: changed
22+
description: Update ArgoCD version to v2.8.1-cap-CR-20116-rollout-sync-sha
23+
- kind: changed
24+
description: Update Argo Events version to v1.7.3-cap-CR-19893
25+
- kind: changed
26+
description: Update env-vars helper template
27+
- kind: changed
28+
description: Add ipv6 support in internal-router
2129
dependencies:
2230
- name: argo-cd
2331
repository: https://codefresh-io.github.io/argo-helm
24-
version: 5.38.1-2-cap-CR-19754
32+
version: 5.46.2-1-cap-CR-20116
2533
- name: argo-events
2634
repository: https://codefresh-io.github.io/argo-helm
27-
version: 2.0.5-1-cf-init
35+
version: 2.0.9-1-cap-CR-19893
2836
- name: argo-workflows
2937
repository: https://codefresh-io.github.io/argo-helm
3038
version: 0.22.9-1-CR-17426

‎charts/gitops-runtime/README.md‎

Lines changed: 34 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
## Codefresh gitops runtime
2-
![Version: 0.2.15](https://img.shields.io/badge/Version-0.2.15-informational?style=flat-square) ![AppVersion: 0.1.33](https://img.shields.io/badge/AppVersion-0.1.33-informational?style=flat-square)
2+
![Version: 0.2.16](https://img.shields.io/badge/Version-0.2.16-informational?style=flat-square) ![AppVersion: 0.1.34](https://img.shields.io/badge/AppVersion-0.1.34-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/
66

77
## Using with private registries - Helper utility
88
The GitOps Runtime comprises multiple subcharts and container images. Subcharts also vary in values structure, making it difficult to override image specific values to use private registries.
9-
We have created a helper utility to resolve this issue:
9+
We have created a helper utility to resolve this issue:
1010
- The utility create values files in the correct structure, overriding the registry for each image. When installing the chart, you can then provide those values files to override all images.
1111
- The utility also creates other files with data to help you identify and correctly mirror all the images.
1212

@@ -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.15 <local_registry>
18+
docker run -v <output_dir>:/output quay.io/codefresh/gitops-runtime-private-registry-utils:0.2.16 <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
@@ -26,6 +26,35 @@ The utility will output 4 files into the folder:
2626
3. `values-images-no-tags.yaml` - a values file with all image values with the private registry **excluding tags**. If provided through --values to helm install/upgrade command - it will override all images to use the private registry.
2727
4. `values-images-with-tags.yaml` - The same as 3 but with tags **included**.
2828

29+
## Openshift
30+
31+
```yaml
32+
internal-router:
33+
dnsService: dns-default
34+
dnsNamespace: openshift-dns
35+
clusterDomain: cluster.local
36+
37+
argo-cd:
38+
redis:
39+
securityContext:
40+
runAsUser: 1000680000 # Arbitrary user ID within allowed range
41+
42+
openshift:
43+
enabled: true
44+
45+
argo-events:
46+
openshift: true
47+
48+
webhook:
49+
port: 8443
50+
51+
sealed-secrets:
52+
podSecurityContext:
53+
enabled: false
54+
containerSecurityContext:
55+
enabled: false
56+
```
57+
2958
## Values
3059
3160
| Key | Type | Default | Description |
@@ -59,14 +88,14 @@ The utility will output 4 files into the folder:
5988
| 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 |
6089
| app-proxy.image.pullPolicy | string | `"IfNotPresent"` | |
6190
| app-proxy.image.repository | string | `"quay.io/codefresh/cap-app-proxy"` | |
62-
| app-proxy.image.tag | string | `"1.2400.4"` | |
91+
| app-proxy.image.tag | string | `"1.2411.2"` | |
6392
| app-proxy.imagePullSecrets | list | `[]` | |
6493
| app-proxy.initContainer.command[0] | string | `"./init.sh"` | |
6594
| app-proxy.initContainer.env | object | `{}` | |
6695
| app-proxy.initContainer.extraVolumeMounts | list | `[]` | Extra volume mounts for init container |
6796
| app-proxy.initContainer.image.pullPolicy | string | `"IfNotPresent"` | |
6897
| app-proxy.initContainer.image.repository | string | `"quay.io/codefresh/cap-app-proxy-init"` | |
69-
| app-proxy.initContainer.image.tag | string | `"1.2400.4"` | |
98+
| app-proxy.initContainer.image.tag | string | `"1.2411.2"` | |
7099
| app-proxy.initContainer.resources.limits.cpu | string | `"1"` | |
71100
| app-proxy.initContainer.resources.limits.memory | string | `"512Mi"` | |
72101
| app-proxy.initContainer.resources.requests.cpu | string | `"0.2"` | |

‎charts/gitops-runtime/README.md.gotmpl‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Prior to running the installation please see the official documentation at: http
66

77
## Using with private registries - Helper utility
88
The GitOps Runtime comprises multiple subcharts and container images. Subcharts also vary in values structure, making it difficult to override image specific values to use private registries.
9-
We have created a helper utility to resolve this issue:
9+
We have created a helper utility to resolve this issue:
1010
- The utility create values files in the correct structure, overriding the registry for each image. When installing the chart, you can then provide those values files to override all images.
1111
- The utility also creates other files with data to help you identify and correctly mirror all the images.
1212

@@ -26,4 +26,33 @@ The utility will output 4 files into the folder:
2626
3. `values-images-no-tags.yaml` - a values file with all image values with the private registry **excluding tags**. If provided through --values to helm install/upgrade command - it will override all images to use the private registry.
2727
4. `values-images-with-tags.yaml` - The same as 3 but with tags **included**.
2828

29+
## Openshift
30+
31+
```yaml
32+
internal-router:
33+
dnsService: dns-default
34+
dnsNamespace: openshift-dns
35+
clusterDomain: cluster.local
36+
37+
argo-cd:
38+
redis:
39+
securityContext:
40+
runAsUser: 1000680000 # Arbitrary user ID within allowed range
41+
42+
openshift:
43+
enabled: true
44+
45+
argo-events:
46+
openshift: true
47+
48+
webhook:
49+
port: 8443
50+
51+
sealed-secrets:
52+
podSecurityContext:
53+
enabled: false
54+
containerSecurityContext:
55+
enabled: false
56+
```
57+
2958
{{ template "chart.valuesSection" . }}

‎charts/gitops-runtime/templates/_components/_common_helpers.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ env: []
99
{{- else -}}
1010
env:
1111
{{- range $name, $val := . }}
12-
{{- if kindIs "string" $val}}
12+
{{- if or (kindIs "string" $val) (kindIs "bool" $val) (kindIs "int" $val) (kindIs "float64" $val) }}
1313
- name: {{ $name }}
14-
value: {{ $val }}
14+
value: {{ $val | quote }}
1515
{{- else if kindIs "map" $val}}
1616
{{- if hasKey $val "valueFrom" }}
1717
{{- if or (hasKey $val.valueFrom "secretKeyRef") (hasKey $val.valueFrom "configMapKeyRef") (hasKey $val.valueFrom "fieldRef") }}
1818
- name: {{ $name }}
19-
{{- $val | toYaml | nindent 2}}
19+
{{- $val | toYaml | nindent 2}}
2020
{{- else}}
2121
{{ fail "ERROR: Only secretKeyRef/configMapKeyRef/fieldRef are supported for valueFrom block for environment variables" }}
2222
{{- end}}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,23 +61,23 @@ GRAPHQL_PLAYGROUND:
6161
name: cap-app-proxy-cm
6262
key: graphqlPlayground
6363
optional: true
64-
INGRESS_CLASS_NAME:
64+
INGRESS_CLASS_NAME:
6565
valueFrom:
6666
configMapKeyRef:
6767
name: codefresh-cm
6868
key: ingressClassName
69-
INGRESS_CONTROLLER:
69+
INGRESS_CONTROLLER:
7070
valueFrom:
7171
configMapKeyRef:
7272
name: codefresh-cm
7373
key: ingressController
74-
INGRESS_HOST:
74+
INGRESS_HOST:
7575
valueFrom:
7676
configMapKeyRef:
7777
name: codefresh-cm
7878
key: ingressHost
7979
INSTALLATION_TYPE: HELM
80-
MANAGED: '"false"'
80+
MANAGED: false
8181
NAMESPACE:
8282
valueFrom:
8383
fieldRef:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ data:
77
default.conf.template: |
88
server {
99
listen 8080;
10+
listen [::]:80 default_server;
1011
access_log /dev/stdout main;
1112
error_log /dev/stdout;
1213

‎charts/gitops-runtime/tests/app-proxy-misc_test.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ tests:
1414
path: spec.template.spec.containers[0].env
1515
content:
1616
name: PORT
17-
value: 8787
17+
value: "8787"
1818
- it: adding environment variables on main container
1919
template: 'app-proxy/deployment.yaml'
2020
values:
@@ -103,7 +103,7 @@ tests:
103103
values:
104104
- ./values/mandatory-values.yaml
105105
set:
106-
app-proxy.nodeSelector:
106+
app-proxy.nodeSelector:
107107
test.io/node: "test"
108108
asserts:
109109
- equal:
@@ -135,7 +135,7 @@ tests:
135135
values:
136136
- ./values/mandatory-values.yaml
137137
set:
138-
app-proxy.affinity:
138+
app-proxy.affinity:
139139
nodeAffinity:
140140
requiredDuringSchedulingIgnoredDuringExecution:
141141
nodeSelectorTerms:
@@ -218,4 +218,4 @@ tests:
218218
path: spec.template.spec.initContainers[0].volumeMounts
219219
content:
220220
name: my-secret
221-
mountPath: /my-secret
221+
mountPath: /my-secret

‎charts/gitops-runtime/values.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,15 +335,15 @@ app-proxy:
335335
tag: 1.1.10-main
336336
image:
337337
repository: quay.io/codefresh/cap-app-proxy
338-
tag: 1.2400.4
338+
tag: 1.2411.2
339339
pullPolicy: IfNotPresent
340340
# -- Extra volume mounts for main container
341341
extraVolumeMounts: []
342342

343343
initContainer:
344344
image:
345345
repository: quay.io/codefresh/cap-app-proxy-init
346-
tag: 1.2400.4
346+
tag: 1.2411.2
347347
pullPolicy: IfNotPresent
348348
command:
349349
- ./init.sh

0 commit comments

Comments
 (0)