Skip to content

Commit 01e03c0

Browse files
committed
feat: remove openfga
BREAKING CHANGE: Not compatible with existing deployments using Openfga.
1 parent fc45d0f commit 01e03c0

File tree

7 files changed

+17
-110
lines changed

7 files changed

+17
-110
lines changed

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
```
6363

6464
Tilt manages the Kubernetes development environment. It starts all necessary services
65-
(KEDA, MongoDB, OpenFGA, PostgreSQL, Redis) and the Virtool workloads and services.
65+
(KEDA, MongoDB, PostgreSQL, Redis) and the Virtool workloads and services.
6666

6767
## Tilt
6868

@@ -163,4 +163,3 @@ If you need to start fresh, you can just run `init.sh` again:
163163
```shell
164164
bash scripts/init.sh
165165
```
166-

Tiltfile

Lines changed: 13 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -28,42 +28,25 @@ helm_resource(
2828
)
2929

3030
k8s_yaml('manifests/db/mongo.yaml')
31-
k8s_resource(
32-
"mongo",
33-
labels=['data'],
34-
)
35-
36-
3731
k8s_yaml('manifests/db/postgres.yaml')
38-
k8s_resource(
39-
"postgres",
40-
labels=['data'],
41-
objects=['pv-postgres', 'pvc-postgres']
42-
)
43-
44-
k8s_yaml('manifests/openfga.yaml')
45-
k8s_resource(
46-
'openfga',
47-
labels=['data'],
48-
resource_deps=["postgres"]
49-
)
50-
5132
k8s_yaml('manifests/db/redis.yaml')
52-
k8s_resource(
53-
'redis',
54-
labels=['data'],
55-
objects=['pv-redis', 'pvc-redis']
56-
)
57-
58-
59-
6033
k8s_yaml('manifests/storage.yaml')
34+
6135
k8s_resource(
62-
labels=['data'],
6336
new_name='storage',
64-
objects=['pv-virtool', 'pvc-virtool']
37+
objects=[
38+
'pv-mongo', 'pvc-mongo',
39+
'pv-postgres', 'pvc-postgres',
40+
'pv-redis', 'pvc-redis',
41+
'pv-virtool', 'pvc-virtool',
42+
],
43+
labels=['data']
6544
)
6645

46+
k8s_resource("mongo", labels=['data'], resource_deps=['storage'])
47+
k8s_resource("postgres", labels=['data'], resource_deps=['storage'])
48+
k8s_resource('redis', labels=['data'], resource_deps=['storage'])
49+
6750
if 'migration' in to_edit:
6851
docker_build('ghcr.io/virtool/migration', '../virtool-migration/')
6952

@@ -124,7 +107,7 @@ k8s_resource(
124107
'virtool-migration',
125108
labels=['virtool'],
126109
new_name="migration",
127-
resource_deps=["mongo", "openfga", "postgres", "redis", "storage"],
110+
resource_deps=["mongo", "postgres", "redis", "storage"],
128111
trigger_mode=TRIGGER_MODE_MANUAL
129112
)
130113

docs/commits_releases.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,5 +98,5 @@ Example:
9898
* Making changes that require a certain migration to have been applied.
9999
* Changing configuration options that could break configurations in
100100
production and development environments.
101-
* Making changes that require a certain version of a service like Postgres, Redis, or
102-
OpenFGA.
101+
* Making changes that require a certain version of a service like Postgres, or Redis.
102+

manifests/db/postgres.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
spec:
1616
restartPolicy: Always
1717
containers:
18-
- image: postgres:15
18+
- image: postgres:18
1919
name: postgressql
2020
imagePullPolicy: Always
2121
resources:

manifests/migration.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ spec:
2525
value: "0.0.0.0"
2626
- name: VT_MONGODB_CONNECTION_STRING
2727
value: "mongodb://virtool:virtool@mongo.default.svc.cluster.local/virtool"
28-
- name: VT_OPENFGA_SCHEME
29-
value: "http"
30-
- name: VT_OPENFGA_HOST
31-
value: "openfga.default.svc.cluster.local"
3228
- name: VT_POSTGRES_CONNECTION_STRING
3329
value: "postgresql+asyncpg://virtool@postgres.default.svc.cluster.local?password=virtool"
3430
- name: VT_REDIS_CONNECTION_STRING

manifests/openfga.yaml

Lines changed: 0 additions & 61 deletions
This file was deleted.

manifests/virtool/base/deployment.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ spec:
2121
value: "0.0.0.0"
2222
- name: VT_MONGODB_CONNECTION_STRING
2323
value: "mongodb://virtool:virtool@mongo.default.svc.cluster.local/virtool"
24-
- name: VT_OPENFGA_HOST
25-
value: "openfga.default.svc.cluster.local"
26-
- name: VT_OPENFGA_SCHEME
27-
value: "http"
2824
- name: VT_REDIS_CONNECTION_STRING
2925
value: "redis://:virtool@redis.default.svc.cluster.local"
3026
- name: VT_POSTGRES_CONNECTION_STRING
@@ -39,12 +35,6 @@ spec:
3935
requests:
4036
cpu: 300m
4137
memory: 300M
42-
# startupProbe:
43-
# httpGet:
44-
# path: /
45-
# port: 9950
46-
# initialDelaySeconds: 3
47-
# periodSeconds: 3
4838
volumeMounts:
4939
- name: data
5040
mountPath: /data

0 commit comments

Comments
 (0)