Skip to content

Commit 58024c1

Browse files
authored
Sam/revert wandelf (#1673)
* Revert "fix: gandalf path name" This reverts commit 00cb0aa. * Revert "feat: Install gandalf, salt-wrapper for infra (#1657)" This reverts commit e321760. * chore: bump versions
1 parent 00cb0aa commit 58024c1

File tree

8 files changed

+3
-159
lines changed

8 files changed

+3
-159
lines changed

ansible/files/gandalf_config/gandalf.sudoers.conf

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

ansible/files/gandalf_config/gandalf_salt.service

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

ansible/files/gandalf_config/gandalf_salt.timer

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

ansible/files/permission_check.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -94,17 +94,11 @@
9494
"systemd-coredump": [
9595
{"groupname": "systemd-coredump", "username": "systemd-coredump"}
9696
],
97-
"gandalf": [
98-
{"groupname": "gandalf", "username": "gandalf"},
99-
{"groupname": "admin", "username": "gandalf"},
100-
{"groupname": "salt", "username": "gandalf"},
101-
],
10297
}
10398

10499
# postgresql.service is expected to mount /etc as read-only
105100
expected_mount = "/etc ro"
106101

107-
108102
# This program depends on osquery being installed on the system
109103
# Function to run osquery
110104
def run_osquery(query):
@@ -160,7 +154,6 @@ def check_nixbld_users():
160154

161155
print("All nixbld users are in the 'nixbld' group.")
162156

163-
164157
def check_postgresql_mount():
165158
# processes table has the nix .postgres-wrapped path as the
166159
# binary path, rather than /usr/lib/postgresql/bin/postgres which
@@ -189,7 +182,6 @@ def check_postgresql_mount():
189182

190183
print("postgresql.service mounts /etc as read-only.")
191184

192-
193185
def main():
194186
parser = argparse.ArgumentParser(
195187
prog="Supabase Postgres Artifact Permissions Checker",
@@ -242,7 +234,6 @@ def main():
242234
"postgrest",
243235
"tcpdump",
244236
"systemd-coredump",
245-
"gandalf",
246237
]
247238
if not qemu_artifact:
248239
usernames.append("ec2-instance-connect")
@@ -260,6 +251,5 @@ def main():
260251
# Check if postgresql.service is using a read-only mount for /etc
261252
check_postgresql_mount()
262253

263-
264254
if __name__ == "__main__":
265255
main()

ansible/manifest-playbook.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -61,22 +61,6 @@
6161
shell: |
6262
cd /tmp && tar -cJf admin-mgr-{{ adminmgr_release }}-arm64.tar.xz admin-mgr
6363
64-
- name: Download gandalf archive
65-
get_url:
66-
url: "https://supabase-public-artifacts-bucket.s3.amazonaws.com/gandalf/v{{ gandalf_release }}/gandalf-{{ gandalf_release }}-linux-arm64.tar.gz"
67-
dest: "/tmp/gandalf.tar.gz"
68-
timeout: 90
69-
70-
- name: gandalf - unpack archive in /tmp
71-
unarchive:
72-
remote_src: yes
73-
src: /tmp/gandalf.tar.gz
74-
dest: /tmp
75-
76-
- name: gandalf - pack archive
77-
shell: |
78-
cd /tmp && tar -cJf gandalf-{{ gandalf_release }}-arm64.tar.xz gandalf
79-
8064
- name: upload archives
8165
shell: |
8266
aws s3 cp /tmp/{{ item.file }} s3://{{ internal_artifacts_bucket }}/upgrades/{{ item.service }}/{{ item.file }}
@@ -89,5 +73,3 @@
8973
file: supabase-admin-api-{{ adminapi_release }}-arm64.tar.xz
9074
- service: admin-mgr
9175
file: admin-mgr-{{ adminmgr_release }}-arm64.tar.xz
92-
- service: gandalf
93-
file: gandalf-{{ gandalf_release }}-arm64.tar.xz

ansible/tasks/internal/gandalf.yml

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

ansible/tasks/setup-supabase-internal.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,5 @@
115115
tags:
116116
- aws-only
117117

118-
- name: Install gandalf
119-
import_tasks: internal/gandalf.yml
120-
tags:
121-
- aws-only
122-
123118
- name: Envoy - use lds.supabase.yaml for /etc/envoy/lds.yaml
124119
command: mv /etc/envoy/lds.supabase.yaml /etc/envoy/lds.yaml

ansible/vars.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ postgres_major:
99

1010
# Full version strings for each major version
1111
postgres_release:
12-
postgresorioledb-17: "17.0.1.096-orioledb"
13-
postgres17: "17.4.1.046"
14-
postgres15: "15.8.1.103"
12+
postgresorioledb-17: "17.0.1.097-orioledb"
13+
postgres17: "17.4.1.47"
14+
postgres15: "15.8.1.104"
1515

1616
# Non Postgres Extensions
1717
pgbouncer_release: "1.19.0"
@@ -57,5 +57,3 @@ adminmgr_release: 0.25.1
5757

5858
vector_x86_deb: "https://packages.timber.io/vector/0.22.3/vector_0.22.3-1_amd64.deb"
5959
vector_arm_deb: "https://packages.timber.io/vector/0.22.3/vector_0.22.3-1_arm64.deb"
60-
61-
gandalf_release: 1.4.30

0 commit comments

Comments
 (0)