Skip to content

Commit 41f0600

Browse files
author
Your Name
committed
Merge branch 'posixfs-support-3'
2 parents 76adcb4 + 77cc99d commit 41f0600

File tree

6 files changed

+49
-27
lines changed

6 files changed

+49
-27
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.2
15+
version: 0.3.3
1616
# renovate: datasource=docker depName=opencloudeu/opencloud-rolling
1717
appVersion: 3.4.0
1818
kubeVersion: ""

charts/opencloud-microservices/deployments/timoni/opencloud/configmap.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ data:
1515
EXTERNAL_DOMAIN: "cloud.opencloud.test"
1616
TAG: ""
1717

18-
###############################################################################
19-
# Flux RBAC Configuration
20-
###############################################################################
21-
SERVICE_ACCOUNT_ENABLED: "true"
22-
2318
###############################################################################
2419
# Deployment Strategy
2520
###############################################################################

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ bundle: {
1414
}
1515
chart: {
1616
name: "opencloud-microservices"
17-
version: "0.3.2"
17+
version: "0.3.3"
1818
}
1919
sync: {
2020
timeout: 10
@@ -37,9 +37,6 @@ bundle: {
3737
level: string @timoni(runtime:string:OPENCLOUD_LOGGING_LEVEL)
3838
}
3939
externalDomain: string @timoni(runtime:string:EXTERNAL_DOMAIN)
40-
serviceAccount: {
41-
enabled: bool @timoni(runtime:bool:SERVICE_ACCOUNT_ENABLED)
42-
}
4340
image: {
4441
tag: string @timoni(runtime:string:TAG)
4542
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ runtime: {
116116
"ANTIVIRUS_INFECTED_FILE_HANDLING": "obj.data.ANTIVIRUS_INFECTED_FILE_HANDLING"
117117
"ANTIVIRUS_ICAP_URL": "obj.data.ANTIVIRUS_ICAP_URL"
118118
"ANTIVIRUS_ICAP_SERVICE": "obj.data.ANTIVIRUS_ICAP_SERVICE"
119-
"SERVICE_ACCOUNT_ENABLED": "obj.data.SERVICE_ACCOUNT_ENABLED"
120119
}
121120
}
122121
]
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Service account opencloud namespace
2+
# 1) ServiceAccount — Flux will impersonate this
3+
apiVersion: v1
4+
kind: ServiceAccount
5+
metadata:
6+
name: flux
7+
namespace: opencloud # <- 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: opencloud
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: opencloud
26+
subjects:
27+
- kind: ServiceAccount
28+
name: flux
29+
namespace: opencloud
30+
roleRef:
31+
apiGroup: rbac.authorization.k8s.io
32+
kind: Role
33+
name: flux-full-access

charts/opencloud-microservices/values.schema.json

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,20 @@
22
"$schema": "http://json-schema.org/draft-07/schema#",
33
"additionalProperties": false,
44
"properties": {
5+
"serviceAccount": {
6+
"additionalProperties": false,
7+
"description": "ServiceAccount for Flux RBAC",
8+
"properties": {
9+
"enabled": {
10+
"required": [],
11+
"title": "enabled",
12+
"type": "boolean"
13+
}
14+
},
15+
"required": [],
16+
"title": "serviceAccount",
17+
"type": "object"
18+
},
519
"autoscaling": {
620
"additionalProperties": true,
721
"description": "Autoscaling settings.",
@@ -13363,21 +13377,5 @@
1336313377
"minio",
1336413378
"keycloak"
1336513379
],
13366-
"properties": {
13367-
"serviceAccount": {
13368-
"additionalProperties": false,
13369-
"description": "ServiceAccount for Flux RBAC",
13370-
"properties": {
13371-
"enabled": {
13372-
"required": [],
13373-
"title": "enabled",
13374-
"type": "boolean"
13375-
}
13376-
},
13377-
"required": [],
13378-
"title": "serviceAccount",
13379-
"type": "object"
13380-
}
13381-
},
1338213380
"type": "object"
1338313381
}

0 commit comments

Comments
 (0)