Skip to content

Commit 53a2205

Browse files
Merge pull request #199 from codefresh-io/CR-23328-product-crd
feat: codefresh-gitops-operator with product crd updates
2 parents 72217a9 + 8521e92 commit 53a2205

File tree

4 files changed

+18
-13
lines changed

4 files changed

+18
-13
lines changed

charts/gitops-runtime/Chart.yaml

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: v2
2-
appVersion: 0.1.46
2+
appVersion: 0.1.47
33
description: A Helm chart for Codefresh gitops runtime
44
name: gitops-runtime
55
version: 0.6.1
@@ -14,14 +14,16 @@ maintainers:
1414
annotations:
1515
artifacthub.io/alternativeName: "codefresh-gitops-runtime"
1616
artifacthub.io/changes: |
17-
- kind: security
18-
description: "Redis authenticaton in ArgoCD"
1917
- kind: changed
20-
description: "Please note that this version of the ArgoCD templates contains a breaking change for ArgoCD server ingress value structure - runtime ingress is not affected. Only relevant if argo-cd.server.ingress.enabled is true. For the new ingress value structure please see: https://github.com/codefresh-io/argo-helm/blob/f98f2f4d4aca081e7b26cbb1a3fcec138bb3d4ac/charts/argo-cd/values.yaml#L2126-L2329"
18+
description: "update codefresh-gitops-operator to 0.1.0-alpha.13"
19+
- kind: added
20+
description: "added runtime.isConfigurationRuntime field"
21+
- kind: changed
22+
description: "update cap-app-proxy to 1.2816.0"
2123
dependencies:
2224
- name: argo-cd
2325
repository: https://codefresh-io.github.io/argo-helm
24-
version: 6.7.18-3-cap-2.10-2024.5.14-9315e75e1
26+
version: 5.55.0-1-cap-2.10-2024.3.29-1dcc54e29
2527
- name: argo-events
2628
repository: https://codefresh-io.github.io/argo-helm
2729
version: 2.0.9-1-cap-CR-19893
@@ -43,6 +45,6 @@ dependencies:
4345
condition: tunnel-client.enabled
4446
- name: codefresh-gitops-operator
4547
repository: oci://quay.io/codefresh/charts
46-
version: 1.0.9
48+
version: 1.0.13
4749
alias: gitops-operator
4850
condition: gitops-operator.enabled

charts/gitops-runtime/README.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## Codefresh gitops runtime
2-
![Version: 0.6.1](https://img.shields.io/badge/Version-0.6.1-informational?style=flat-square) ![AppVersion: 0.1.46](https://img.shields.io/badge/AppVersion-0.1.46-informational?style=flat-square)
2+
![Version: 0.6.1](https://img.shields.io/badge/Version-0.6.1-informational?style=flat-square) ![AppVersion: 0.1.47](https://img.shields.io/badge/AppVersion-0.1.47-informational?style=flat-square)
33

44
## Prerequisites
55

@@ -100,14 +100,14 @@ sealed-secrets:
100100
| 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 |
101101
| app-proxy.image.pullPolicy | string | `"IfNotPresent"` | |
102102
| app-proxy.image.repository | string | `"quay.io/codefresh/cap-app-proxy"` | |
103-
| app-proxy.image.tag | string | `"1.2751.1"` | |
103+
| app-proxy.image.tag | string | `"1.2816.0"` | |
104104
| app-proxy.imagePullSecrets | list | `[]` | |
105105
| app-proxy.initContainer.command[0] | string | `"./init.sh"` | |
106106
| app-proxy.initContainer.env | object | `{}` | |
107107
| app-proxy.initContainer.extraVolumeMounts | list | `[]` | Extra volume mounts for init container |
108108
| app-proxy.initContainer.image.pullPolicy | string | `"IfNotPresent"` | |
109109
| app-proxy.initContainer.image.repository | string | `"quay.io/codefresh/cap-app-proxy-init"` | |
110-
| app-proxy.initContainer.image.tag | string | `"1.2751.1"` | |
110+
| app-proxy.initContainer.image.tag | string | `"1.2816.0"` | |
111111
| app-proxy.initContainer.resources.limits.cpu | string | `"1"` | |
112112
| app-proxy.initContainer.resources.limits.memory | string | `"512Mi"` | |
113113
| app-proxy.initContainer.resources.requests.cpu | string | `"0.2"` | |
@@ -277,7 +277,7 @@ sealed-secrets:
277277
| global.codefresh.userToken | object | `{"secretKeyRef":{},"token":""}` | User token. Used for runtime registration against the patform. One of token (for plain text value) or secretKeyRef must be provided. |
278278
| global.codefresh.userToken.secretKeyRef | object | `{}` | User token that references an existing secret containing the token. |
279279
| global.codefresh.userToken.token | string | `""` | User token in plain text. The chart creates and manages the secret for this token. |
280-
| global.runtime | object | `{"cluster":"https://kubernetes.default.svc","codefreshHosted":false,"eventBus":{"annotations":{},"name":"codefresh-eventbus","nats":{"native":{"auth":"token","containerTemplate":{"resources":{"limits":{"cpu":"500m","ephemeral-storage":"2Gi","memory":"4Gi"},"requests":{"cpu":"200m","ephemeral-storage":"2Gi","memory":"1Gi"}}},"maxPayload":"4MB","replicas":3}},"pdb":{"enabled":true,"minAvailable":2}},"gitCredentials":{"password":{"secretKeyRef":{},"value":null},"username":"username"},"ingress":{"annotations":{},"className":"nginx","enabled":false,"hosts":[],"protocol":"https","tls":[]},"ingressUrl":"","name":null}` | Runtime level settings |
280+
| global.runtime | object | `{"cluster":"https://kubernetes.default.svc","codefreshHosted":false,"eventBus":{"annotations":{},"name":"codefresh-eventbus","nats":{"native":{"auth":"token","containerTemplate":{"resources":{"limits":{"cpu":"500m","ephemeral-storage":"2Gi","memory":"4Gi"},"requests":{"cpu":"200m","ephemeral-storage":"2Gi","memory":"1Gi"}}},"maxPayload":"4MB","replicas":3}},"pdb":{"enabled":true,"minAvailable":2}},"gitCredentials":{"password":{"secretKeyRef":{},"value":null},"username":"username"},"ingress":{"annotations":{},"className":"nginx","enabled":false,"hosts":[],"protocol":"https","tls":[]},"ingressUrl":"","isConfigurationRuntime":false,"name":null}` | Runtime level settings |
281281
| global.runtime.cluster | string | `"https://kubernetes.default.svc"` | Runtime cluster. Should not be changed. |
282282
| global.runtime.codefreshHosted | bool | `false` | Defines whether this is a Codefresh hosted runtime. Should not be changed. |
283283
| global.runtime.eventBus.annotations | object | `{}` | Annotations on EventBus resource |
@@ -294,6 +294,7 @@ sealed-secrets:
294294
| global.runtime.ingress.hosts | list | `[]` | Hosts for runtime ingress. Note that Codefresh platform will always use the first host in the list to access the runtime. |
295295
| global.runtime.ingress.protocol | string | `"https"` | The protocol that Codefresh platform will use to access the runtime ingress. Can be http or https. |
296296
| global.runtime.ingressUrl | string | `""` | Explicit url for runtime ingress. Provide this value only if you don't want the chart to create and ingress (global.runtime.ingress.enabled=false) and tunnel-client is not used (tunnel-client.enabled=false) |
297+
| global.runtime.isConfigurationRuntime | bool | `false` | is the runtime set as a "configuration runtime". |
297298
| global.runtime.name | string | `nil` | Runtime name. Must be unique per platform account. |
298299
| 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 |
299300
| installer.skipValidation | bool | `false` | if set to true, pre-install hook will *not* run |

charts/gitops-runtime/templates/codefresh-cm.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ data:
1414
ingressClassName: {{ .Values.global.runtime.ingress.className | default "" | quote }}
1515
ingressController: {{ .Values.global.runtime.ingress.className | default "" | quote }}
1616
ingressHost: {{ include "codefresh-gitops-runtime.ingress-url" . }}
17+
isConfigurationRuntime: {{ .Values.global.runtime.isConfigurationRuntime | quote }}
1718
version: {{ .Chart.AppVersion }}

charts/gitops-runtime/values.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ global:
6565
hosts: []
6666
# -- Explicit url for runtime ingress. Provide this value only if you don't want the chart to create and ingress (global.runtime.ingress.enabled=false) and tunnel-client is not used (tunnel-client.enabled=false)
6767
ingressUrl: ""
68+
# -- is the runtime set as a "configuration runtime".
69+
isConfigurationRuntime: false
6870
# -- Git credentials runtime. Runtime is not fully functional without those credentials.
6971
# If not provided through the installation, they must be provided through the Codefresh UI.
7072
gitCredentials:
@@ -216,7 +218,6 @@ argo-cd:
216218
send:
217219
- cf-promotion-app-revision-changed-template
218220
219-
220221
#-----------------------------------------------------------------------------------------------------------------------
221222
# Argo Events
222223
#-----------------------------------------------------------------------------------------------------------------------
@@ -493,15 +494,15 @@ app-proxy:
493494
tag: 1.1.10-main
494495
image:
495496
repository: quay.io/codefresh/cap-app-proxy
496-
tag: 1.2751.1
497+
tag: 1.2816.0
497498
pullPolicy: IfNotPresent
498499
# -- Extra volume mounts for main container
499500
extraVolumeMounts: []
500501

501502
initContainer:
502503
image:
503504
repository: quay.io/codefresh/cap-app-proxy-init
504-
tag: 1.2751.1
505+
tag: 1.2816.0
505506
pullPolicy: IfNotPresent
506507
command:
507508
- ./init.sh

0 commit comments

Comments
 (0)