Skip to content

Commit a032521

Browse files
author
Your Name
committed
Merge branch 'posixfs-support-3'
2 parents 41f0600 + 8b9a079 commit a032521

File tree

6 files changed

+59
-45
lines changed

6 files changed

+59
-45
lines changed

charts/opencloud-microservices/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ maintainers:
1212
1313
url: https://opencloud.eu
1414
type: application
15-
version: 0.3.3
15+
version: 0.3.4
1616
# renovate: datasource=docker depName=opencloudeu/opencloud-rolling
1717
appVersion: 3.4.0
1818
kubeVersion: ""

charts/opencloud-microservices/README.md

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,17 @@ helmfile sync
202202
```
203203
You can also install it with timoni and fluxcd instead of helm:
204204
```bash
205-
kubectl apply -f ./charts/opencloud-microservices/deployments/timoni/ && \
206-
timoni bundle apply -f ./charts/opencloud-microservices/deployments/timoni/opencloud.cue --runtime ./charts/opencloud-microservices/deployments/timoni/runtime.cue
205+
## Install opencloud
206+
kubectl apply -f ./charts/opencloud-microservices/deployments/timoni/opencloud && \
207+
timoni bundle apply -f ./charts/opencloud-microservices/deployments/timoni/opencloud/opencloud.cue --runtime ./charts/opencloud-microservices/deployments/timoni/opencloud/runtime.cue
208+
209+
## Install openldap
210+
kubectl apply -f ./charts/opencloud-microservices/deployments/timoni/openldap && \
211+
timoni bundle apply -f ./charts/opencloud-microservices/deployments/timoni/openldap/openldap.cue --runtime ./charts/opencloud-microservices/deployments/timoni/openldap/runtime.cue
212+
213+
## Install clamav
214+
kubectl apply -f ./charts/opencloud-microservices/deployments/timoni/clamav && \
215+
timoni bundle apply -f ./charts/opencloud-microservices/deployments/timoni/clamav/clamav.cue --runtime ./charts/opencloud-microservices/deployments/timoni/clamav/runtime.cue
207216
```
208217

209218

@@ -220,8 +229,17 @@ helmfile sync
220229
```
221230
You can also install it with timoni and fluxcd instead of helm:
222231
```bash
223-
kubectl apply -f ./charts/opencloud-microservices/deployments/timoni/ && \
224-
timoni bundle apply -f ./charts/opencloud-microservices/deployments/timoni/opencloud.cue --runtime ./charts/opencloud-microservices/deployments/timoni/runtime.cue
232+
## Install opencloud
233+
kubectl apply -f ./charts/opencloud-microservices/deployments/timoni/opencloud && \
234+
timoni bundle apply -f ./charts/opencloud-microservices/deployments/timoni/opencloud/opencloud.cue --runtime ./charts/opencloud-microservices/deployments/timoni/opencloud/runtime.cue
235+
236+
## Install openldap
237+
kubectl apply -f ./charts/opencloud-microservices/deployments/timoni/openldap && \
238+
timoni bundle apply -f ./charts/opencloud-microservices/deployments/timoni/openldap/openldap.cue --runtime ./charts/opencloud-microservices/deployments/timoni/openldap/runtime.cue
239+
240+
## Install clamav
241+
kubectl apply -f ./charts/opencloud-microservices/deployments/timoni/clamav && \
242+
timoni bundle apply -f ./charts/opencloud-microservices/deployments/timoni/clamav/clamav.cue --runtime ./charts/opencloud-microservices/deployments/timoni/clamav/runtime.cue
225243
```
226244

227245

charts/opencloud-microservices/deployments/timoni/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ kubectl apply -f ./charts/opencloud-microservices/deployments/timoni/openldap &&
1010
timoni bundle apply -f ./charts/opencloud-microservices/deployments/timoni/openldap/openldap.cue --runtime ./charts/opencloud-microservices/deployments/timoni/openldap/runtime.cue
1111

1212
## Install clamav
13-
kubectl apply -f ./charts/opencloud-microservices/deployments/timoni/openldap && \
14-
timoni bundle apply -f ./charts/opencloud-microservices/deployments/timoni/openldap/openldap.cue --runtime ./charts/opencloud-microservices/deployments/timoni/openldap/runtime.cue
13+
kubectl apply -f ./charts/opencloud-microservices/deployments/timoni/clamav && \
14+
timoni bundle apply -f ./charts/opencloud-microservices/deployments/timoni/clamav/clamav.cue --runtime ./charts/opencloud-microservices/deployments/timoni/clamav/runtime.cue
1515

1616

charts/opencloud-microservices/deployments/timoni/opencloud/opencloud.cue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ bundle: {
1414
}
1515
chart: {
1616
name: "opencloud-microservices"
17-
version: "0.3.3"
17+
version: "0.3.4"
1818
}
1919
sync: {
2020
timeout: 10

charts/opencloud-microservices/deployments/timoni/openldap/openldap.cue

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -157,43 +157,6 @@ bundle: {
157157
MAY ( openCloudExternalIdentity $ openCloudUserEnabled $ openCloudUserType $ openCloudLastSignInTimestamp) )
158158
"""
159159
}
160-
extraDeploy: [{
161-
apiVersion: "v1"
162-
kind: "ServiceAccount"
163-
metadata: {
164-
name: "flux"
165-
namespace: "openldap"
166-
}
167-
}, {
168-
apiVersion: "rbac.authorization.k8s.io/v1"
169-
kind: "Role"
170-
metadata: {
171-
name: "flux-full-access"
172-
namespace: "openldap"
173-
}
174-
rules: [{
175-
apiGroups: ["*"]
176-
resources: ["*"]
177-
verbs: ["*"]
178-
}]
179-
}, {
180-
apiVersion: "rbac.authorization.k8s.io/v1"
181-
kind: "RoleBinding"
182-
metadata: {
183-
name: "flux-full-access-binding"
184-
namespace: "openldap"
185-
}
186-
subjects: [{
187-
kind: "ServiceAccount"
188-
name: "flux"
189-
namespace: "openldap"
190-
}]
191-
roleRef: {
192-
apiGroup: "rbac.authorization.k8s.io"
193-
kind: "Role"
194-
name: "flux-full-access"
195-
}
196-
}]
197160
}
198161
}
199162
},
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Service account openldap namespace
2+
# 1) ServiceAccount — Flux will impersonate this
3+
apiVersion: v1
4+
kind: ServiceAccount
5+
metadata:
6+
name: flux
7+
namespace: openldap # <- target namespace
8+
---
9+
# 2) Role — full power *inside* that namespace
10+
apiVersion: rbac.authorization.k8s.io/v1
11+
kind: Role
12+
metadata:
13+
name: flux-full-access
14+
namespace: openldap
15+
rules:
16+
- apiGroups: ["*"] # core & all groups
17+
resources: ["*"] # every namespaced resource
18+
verbs: ["*"] # get, list, create, delete, …
19+
---
20+
# 3) RoleBinding — ties the Role to the SA
21+
apiVersion: rbac.authorization.k8s.io/v1
22+
kind: RoleBinding
23+
metadata:
24+
name: flux-full-access-binding
25+
namespace: openldap
26+
subjects:
27+
- kind: ServiceAccount
28+
name: flux
29+
namespace: openldap
30+
roleRef:
31+
apiGroup: rbac.authorization.k8s.io
32+
kind: Role
33+
name: flux-full-access

0 commit comments

Comments
 (0)