Skip to content

Commit f2f720e

Browse files
danielm-codefreshdanielm-codefresh
authored
Merge pull request #86 from codefresh-io/release-0.3.0-new
Release 0.3.0(0.1.36)
2 parents db286d8 + 3772d14 commit f2f720e

18 files changed

+1385
-8
lines changed

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,7 @@ output
1010
# only ignore the values.yaml file at the root of the repo
1111
/values.yaml
1212
.devcontainer
13+
14+
# ignore local dev
15+
values-dev.yaml
16+
dry-run.yaml

‎charts/gitops-runtime/Chart.yaml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v2
2-
appVersion: 0.1.35
2+
appVersion: 0.1.36
33
description: A Helm chart for Codefresh gitops runtime
44
name: gitops-runtime
5-
version: 0.2.21
5+
version: 0.3.0
66
home: https://github.com/codefresh-io/gitops-runtime-helm
77
icon: https://avatars1.githubusercontent.com/u/11412079?v=3
88
keywords:
@@ -14,10 +14,14 @@ maintainers:
1414
annotations:
1515
artifacthub.io/alternativeName: "codefresh-gitops-runtime"
1616
artifacthub.io/changes: |
17-
- kind: fixed
18-
description: Fix argoCDServerServiceName and argoCDServerServicePort overrides
17+
- kind: added
18+
description: Add codefresh-gitops-operator
19+
- kind: changed
20+
description: Update app-proxy
1921
- kind: changed
20-
description: Update app-proxy for ARM support
22+
description: Update argo-workflowschart. Fix podGC label selector
23+
- kind: fixed
24+
description: Set default auth to client on workflows to be able to see workflow logs in UI
2125
dependencies:
2226
- name: argo-cd
2327
repository: https://codefresh-io.github.io/argo-helm
@@ -27,7 +31,7 @@ dependencies:
2731
version: 2.0.9-1-cap-CR-19893
2832
- name: argo-workflows
2933
repository: https://codefresh-io.github.io/argo-helm
30-
version: 0.22.9-1-CR-17426
34+
version: 0.22.10-1-CR-17426
3135
condition: argo-workflows.enabled
3236
- name: argo-rollouts
3337
repository: https://codefresh-io.github.io/argo-helm

‎charts/gitops-runtime/README.md

Lines changed: 52 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## Codefresh gitops runtime
2-
![Version: 0.2.21](https://img.shields.io/badge/Version-0.2.21-informational?style=flat-square) ![AppVersion: 0.1.35](https://img.shields.io/badge/AppVersion-0.1.35-informational?style=flat-square)
2+
![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![AppVersion: 0.1.36](https://img.shields.io/badge/AppVersion-0.1.36-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.21 <local_registry>
18+
docker run -v <output_dir>:/output quay.io/codefresh/gitops-runtime-private-registry-utils:0.3.0 <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
@@ -130,7 +130,9 @@ sealed-secrets:
130130
| app-proxy.serviceAccount.name | string | `"cap-app-proxy"` | |
131131
| app-proxy.tolerations | list | `[]` | |
132132
| argo-cd.configs.cm."accounts.admin" | string | `"apiKey,login"` | |
133+
| argo-cd.configs.cm."application.resourceTrackingMethod" | string | `"annotation+label"` | |
133134
| argo-cd.configs.cm."timeout.reconciliation" | string | `"20s"` | |
135+
| argo-cd.configs.params."application.namespaces" | string | `"cf-*"` | |
134136
| argo-cd.configs.params."server.insecure" | bool | `true` | |
135137
| argo-cd.crds.install | bool | `true` | |
136138
| argo-cd.fullnameOverride | string | `"argo-cd"` | |
@@ -144,6 +146,7 @@ sealed-secrets:
144146
| argo-workflows.crds.install | bool | `true` | Install and upgrade CRDs |
145147
| argo-workflows.enabled | bool | `true` | |
146148
| argo-workflows.fullnameOverride | string | `"argo"` | |
149+
| argo-workflows.server.extraArgs | list | `["--auth-mode=client"]` | auth-mode needs to be set to client to be able to see workflow logs from Codefresh UI |
147150
| event-reporters.events.argoCDServerServiceName | string | `nil` | LEAVE EMPTY and let the chart logic determine the name. Change only if you are totally sure you need to override ArgoCD service name. |
148151
| event-reporters.events.argoCDServerServicePort | string | `nil` | LEAVE EMPTY and let the chart logic determine the name. Change only if you are totally sure you need to override ArgoCD service port. |
149152
| event-reporters.events.eventSource.affinity | object | `{}` | |
@@ -179,6 +182,53 @@ sealed-secrets:
179182
| event-reporters.workflow.sensor.resources | object | `{}` | |
180183
| event-reporters.workflow.sensor.tolerations | list | `[]` | |
181184
| event-reporters.workflow.serviceAccount.create | bool | `true` | |
185+
| gitops-operator.affinity | object | `{}` | |
186+
| gitops-operator.crds | object | `{"additionalLabels":{},"annotations":{},"install":true,"keep":false}` | Codefresh gitops operator crds |
187+
| gitops-operator.crds.additionalLabels | object | `{}` | Additional labels for gitops operator CRDs |
188+
| gitops-operator.crds.annotations | object | `{}` | Annotations on gitops operator CRDs |
189+
| gitops-operator.crds.install | bool | `true` | Whether or not to install CRDs |
190+
| gitops-operator.crds.keep | bool | `false` | Keep CRDs if gitops runtime release is uninstalled |
191+
| gitops-operator.env | object | `{}` | |
192+
| gitops-operator.fullnameOverride | string | `""` | |
193+
| gitops-operator.image.pullPolicy | string | `"IfNotPresent"` | |
194+
| gitops-operator.image.repository | string | `"quay.io/codefresh/codefresh-gitops-operator"` | |
195+
| gitops-operator.image.tag | string | `"v0.1.0-alpha.3"` | |
196+
| gitops-operator.imagePullSecrets | list | `[]` | |
197+
| gitops-operator.kube-rbac-proxy.image.pullPolicy | string | `"IfNotPresent"` | |
198+
| gitops-operator.kube-rbac-proxy.image.repository | string | `"gcr.io/kubebuilder/kube-rbac-proxy"` | |
199+
| gitops-operator.kube-rbac-proxy.image.tag | string | `"v0.14.1"` | |
200+
| gitops-operator.kube-rbac-proxy.resources.limits.cpu | string | `"500m"` | |
201+
| gitops-operator.kube-rbac-proxy.resources.limits.memory | string | `"128Mi"` | |
202+
| gitops-operator.kube-rbac-proxy.resources.requests.cpu | string | `"100m"` | |
203+
| gitops-operator.kube-rbac-proxy.resources.requests.memory | string | `"64Mi"` | |
204+
| gitops-operator.kube-rbac-proxy.securityContext.allowPrivilegeEscalation | bool | `false` | |
205+
| gitops-operator.kube-rbac-proxy.securityContext.capabilities.drop[0] | string | `"ALL"` | |
206+
| gitops-operator.livenessProbe.failureThreshold | int | `10` | |
207+
| gitops-operator.livenessProbe.initialDelaySeconds | int | `10` | |
208+
| gitops-operator.livenessProbe.periodSeconds | int | `10` | |
209+
| gitops-operator.livenessProbe.successThreshold | int | `1` | |
210+
| gitops-operator.livenessProbe.timeoutSeconds | int | `10` | |
211+
| gitops-operator.nameOverride | string | `""` | |
212+
| gitops-operator.nodeSelector | object | `{}` | |
213+
| gitops-operator.podAnnotations | object | `{}` | |
214+
| gitops-operator.podLabels | object | `{}` | |
215+
| gitops-operator.podSecurityContext.runAsNonRoot | bool | `true` | |
216+
| gitops-operator.readinessProbe.failureThreshold | int | `3` | |
217+
| gitops-operator.readinessProbe.initialDelaySeconds | int | `10` | |
218+
| gitops-operator.readinessProbe.periodSeconds | int | `10` | |
219+
| gitops-operator.readinessProbe.successThreshold | int | `1` | |
220+
| gitops-operator.readinessProbe.timeoutSeconds | int | `10` | |
221+
| gitops-operator.replicaCount | int | `1` | |
222+
| gitops-operator.resources.limits.cpu | string | `"500m"` | |
223+
| gitops-operator.resources.limits.memory | string | `"128Mi"` | |
224+
| gitops-operator.resources.requests.cpu | string | `"100m"` | |
225+
| gitops-operator.resources.requests.memory | string | `"64Mi"` | |
226+
| gitops-operator.securityContext.allowPrivilegeEscalation | bool | `false` | |
227+
| gitops-operator.securityContext.capabilities.drop[0] | string | `"ALL"` | |
228+
| gitops-operator.serviceAccount.annotations | object | `{}` | |
229+
| gitops-operator.serviceAccount.create | bool | `true` | |
230+
| gitops-operator.serviceAccount.name | string | `"gitops-operator-controller-manager"` | |
231+
| gitops-operator.tolerations | list | `[]` | |
182232
| global.codefresh | object | `{"accountId":"","apiEventsPath":"/2.0/api/events","tls":{"caCerts":{"secret":{"annotations":{},"content":"","create":false,"key":"ca-bundle.crt"},"secretKeyRef":{}},"workflowPipelinesGitWebhooks":{"annotatins":{},"certificates":{}}},"url":"https://g.codefresh.io","userToken":{"secretKeyRef":{},"token":""}}` | Codefresh platform and account-related settings |
183233
| global.codefresh.accountId | string | `""` | Codefresh Account ID. |
184234
| global.codefresh.apiEventsPath | string | `"/2.0/api/events"` | Events API endpoint URL suffix. |

‎charts/gitops-runtime/templates/_components/gitops-operator/_all_resources.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{{- define "gitops-operator.resources" }}
2+
---
3+
{{ include "gitops-operator.resources.deployment" . }} #
4+
---
5+
{{ include "gitops-operator.resources.rbac" . }}
6+
---
7+
{{ include "gitops-operator.resources.auth_proxy_rbac" . }}
8+
---
9+
{{ include "gitops-operator.resources.leader_election_rbac" . }}
10+
---
11+
{{ include "gitops-operator.resources.restricted_git_source_rbac" . }}
12+
---
13+
{{ include "gitops-operator.resources.sa" .}}
14+
---
15+
{{- include "gitops-operator.crds.restricted-gitsource" . }} #
16+
{{- end }}

‎charts/gitops-runtime/templates/_components/gitops-operator/_deployment.yaml

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
{{- define "gitops-operator.resources.deployment" }}
2+
apiVersion: apps/v1
3+
kind: Deployment
4+
metadata:
5+
name: {{ include "gitops-operator.fullname" . }}
6+
labels:
7+
{{- include "gitops-operator.labels" . | nindent 4 }}
8+
spec:
9+
replicas: {{ .Values.replicaCount }}
10+
selector:
11+
matchLabels:
12+
{{- include "gitops-operator.selectorLabels" . | nindent 6 }}
13+
template:
14+
metadata:
15+
{{- with .Values.podAnnotations }}
16+
annotations:
17+
{{- toYaml . | nindent 8 }}
18+
{{- end }}
19+
labels:
20+
{{- include "gitops-operator.selectorLabels" . | nindent 8 }}
21+
{{- with .Values.podLabels }}
22+
{{- toYaml . | nindent 8 }}
23+
{{- end }}
24+
spec:
25+
{{- with .Values.imagePullSecrets }}
26+
imagePullSecrets:
27+
{{- toYaml . | nindent 8 }}
28+
{{- end }}
29+
serviceAccountName: {{ include "gitops-operator.serviceAccountName" . }}
30+
securityContext:
31+
{{- toYaml .Values.podSecurityContext | nindent 8 }}
32+
containers:
33+
- name: kube-rbac-proxy
34+
securityContext:
35+
{{- toYaml (index .Values "kube-rbac-proxy" "securityContext") | nindent 12 }}
36+
image: '{{ index .Values "kube-rbac-proxy" "image" "repository" }}:{{ index .Values "kube-rbac-proxy" "image" "tag" }}'
37+
imagePullPolicy: {{ index .Values "kube-rbac-proxy" "image" "pullPolicy" }}
38+
ports:
39+
- name: https
40+
containerPort: 8443
41+
protocol: TCP
42+
resources:
43+
{{- toYaml (index .Values "kube-rbac-proxy" "resources") | nindent 12 }}
44+
args:
45+
- "--secure-listen-address=0.0.0.0:8443"
46+
- "--upstream=http://127.0.0.1:8080/"
47+
- "--logtostderr=true"
48+
- "--v=0"
49+
- name: manager
50+
securityContext:
51+
{{- toYaml .Values.securityContext | nindent 12 }}
52+
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
53+
{{- include "codefresh-gitops-runtime.components.common_helpers.container-templates.env-vars" .Values.env | nindent 8 }}
54+
imagePullPolicy: {{ .Values.image.pullPolicy }}
55+
command:
56+
- /manager
57+
args:
58+
- "--health-probe-bind-address=:8081"
59+
- "--metrics-bind-address=127.0.0.1:8080"
60+
- "--leader-elect"
61+
ports:
62+
- name: http
63+
containerPort: 8081
64+
- name: http-metrics
65+
containerPort: 8080
66+
readinessProbe:
67+
initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
68+
periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
69+
timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
70+
successThreshold: {{ .Values.readinessProbe.successThreshold }}
71+
failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
72+
httpGet:
73+
port: http
74+
path: /readyz
75+
livenessProbe:
76+
initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
77+
periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
78+
timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
79+
successThreshold: {{ .Values.livenessProbe.successThreshold }}
80+
failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
81+
httpGet:
82+
port: http
83+
path: /healthz
84+
resources:
85+
{{- toYaml .Values.resources | nindent 12 }}
86+
volumeMounts:
87+
{{- with .Values.extraVolumeMounts }}
88+
{{- toYaml . | nindent 8 }}
89+
{{- end }}
90+
{{- with .Values.nodeSelector }}
91+
nodeSelector:
92+
{{- toYaml . | nindent 8 }}
93+
{{- end }}
94+
{{- with .Values.affinity }}
95+
affinity:
96+
{{- toYaml . | nindent 8}}
97+
{{- end }}
98+
{{- with .Values.tolerations }}
99+
tolerations:
100+
{{- toYaml . | nindent 6 }}
101+
{{- end }}
102+
volumes:
103+
{{- with .Values.extraVolumes }}
104+
{{- toYaml . | nindent 6 }}
105+
{{- end }}
106+
{{- end }}

‎charts/gitops-runtime/templates/_components/gitops-operator/_helpers.tpl

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{{/*
2+
Create a default fully qualified app name.
3+
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
4+
If release name contains chart name it will be used as a full name.
5+
*/}}
6+
{{- define "gitops-operator.fullname" -}}
7+
{{- print "gitops-operator" }}
8+
{{- end }}
9+
10+
{{/*
11+
Create chart name and version as used by the chart label.
12+
*/}}
13+
{{- define "gitops-operator.chart" -}}
14+
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
15+
{{- end }}
16+
17+
{{/*
18+
Common labels
19+
*/}}
20+
{{- define "gitops-operator.labels" -}}
21+
helm.sh/chart: {{ include "gitops-operator.chart" . }}
22+
{{ include "gitops-operator.selectorLabels" . }}
23+
{{- if .Chart.AppVersion }}
24+
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
25+
{{- end }}
26+
app.kubernetes.io/managed-by: {{ .Release.Service }}
27+
app.kubernetes.io/part-of: gitops-operator
28+
codefresh.io/internal: "true"
29+
{{- end }}
30+
31+
{{/*
32+
Selector labels
33+
*/}}
34+
{{- define "gitops-operator.selectorLabels" -}}
35+
app: gitops-operator
36+
{{- end }}
37+
38+
{{/*
39+
Create the name of the service account to use
40+
*/}}
41+
{{- define "gitops-operator.serviceAccountName" -}}
42+
{{- if .Values.serviceAccount.create }}
43+
{{- default (include "gitops-operator.fullname" .) .Values.serviceAccount.name }}
44+
{{- else }}
45+
{{- default "default" .Values.serviceAccount.name }}
46+
{{- end }}
47+
{{- end }}

‎charts/gitops-runtime/templates/_components/gitops-operator/_rbac.yaml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
2+
{{- define "gitops-operator.resources.rbac" }}
3+
apiVersion: rbac.authorization.k8s.io/v1
4+
kind: ClusterRole
5+
metadata:
6+
labels:
7+
{{- include "gitops-operator.selectorLabels" . | nindent 4 }}
8+
name: codefresh-gitops-operator
9+
rules:
10+
- apiGroups:
11+
- argoproj.io
12+
resources:
13+
- applications
14+
- appprojects
15+
verbs:
16+
- create
17+
- delete
18+
- get
19+
- list
20+
- update
21+
- watch
22+
- apiGroups:
23+
- csdp.codefresh.io
24+
resources:
25+
- restrictedgitsources
26+
verbs:
27+
- create
28+
- delete
29+
- get
30+
- list
31+
- patch
32+
- update
33+
- watch
34+
- apiGroups:
35+
- csdp.codefresh.io
36+
resources:
37+
- restrictedgitsources/finalizers
38+
verbs:
39+
- update
40+
- apiGroups:
41+
- csdp.codefresh.io
42+
resources:
43+
- restrictedgitsources/status
44+
verbs:
45+
- get
46+
- patch
47+
- update
48+
---
49+
apiVersion: rbac.authorization.k8s.io/v1
50+
kind: ClusterRoleBinding
51+
metadata:
52+
labels:
53+
{{- include "gitops-operator.selectorLabels" . | nindent 4 }}
54+
name: codefresh-gitops-operator
55+
roleRef:
56+
apiGroup: rbac.authorization.k8s.io
57+
kind: ClusterRole
58+
name: codefresh-gitops-operator
59+
subjects:
60+
- kind: ServiceAccount
61+
name: {{ include "gitops-operator.serviceAccountName" . }}
62+
namespace: {{ .Release.Namespace }}
63+
{{- end }}

‎charts/gitops-runtime/templates/_components/gitops-operator/_serviceaccount.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{{- define "gitops-operator.resources.sa" }}
2+
{{- if .Values.serviceAccount.create }}
3+
apiVersion: v1
4+
kind: ServiceAccount
5+
metadata:
6+
name: {{ include "gitops-operator.serviceAccountName" . }}
7+
labels:
8+
{{- include "gitops-operator.labels" . | nindent 4 }}
9+
{{- with .Values.serviceAccount.annotations }}
10+
annotations:
11+
{{- toYaml . | nindent 4 }}
12+
{{- end }}
13+
{{- end }}
14+
{{- end }}

0 commit comments

Comments
 (0)