Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PAD-173: 2 node HA - Tech Preview #131

Merged
merged 90 commits into from
Jun 11, 2024
Merged
Changes from 1 commit
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
6143c81
use custom k3s provider; add marmot & sqlite
TylerGillson Oct 4, 2023
b8c1312
fix marmot install
TylerGillson Oct 4, 2023
6322198
fix marmot install; add less
TylerGillson Oct 5, 2023
30dd861
revert Dockerfile, move two node packages into Earthfile
TylerGillson Oct 6, 2023
b9e32c3
revert Dockerfile
TylerGillson Oct 6, 2023
18c401b
Fix bug in earthfile
oz123 Oct 9, 2023
e73955c
revert kairos-provider-image change
TylerGillson Oct 11, 2023
7042cc4
Parametrize marmot version
oz123 Oct 12, 2023
be2c1f4
Don't install less (there is already more in the image)
oz123 Oct 12, 2023
bcacb79
Add marmot installation to opensuse-leap
oz123 Oct 12, 2023
7b41a6c
DRY single curl block to download marmot
oz123 Oct 13, 2023
a18f456
PAD-156: Add custom health check script
oz123 Oct 18, 2023
221a477
PAD-156: Update user-data template, include health-check-script
oz123 Oct 18, 2023
2fec909
chore: use patched marmot binary
TylerGillson Oct 19, 2023
4187d98
install ping for two node
TylerGillson Oct 26, 2023
54ef5b6
Merge branch 'main' into two-node
TylerGillson Oct 30, 2023
7e3f355
Add E2E automation, debug helpers (#94)
TylerGillson Nov 6, 2023
5efa2fe
chore: use 0.8.7-beta.1 marmot release
TylerGillson Nov 7, 2023
b22e102
fix: increase EARTHLY_BUILDKIT_CACHE_SIZE_MB & upgrade PE version
TylerGillson Nov 7, 2023
1cab1e7
docs: fix debug README
TylerGillson Nov 7, 2023
96558cd
Update README.md
TylerGillson Nov 8, 2023
e499803
fix: specify liveness backend, bump earthly cache, eject both ISOs
TylerGillson Nov 13, 2023
0a5c09b
Add kine to the base installation (#98)
oz123 Nov 28, 2023
f979835
Add option to specify the two node backend
oz123 Dec 20, 2023
6bc814b
Add postgresql (#111)
oz123 Dec 20, 2023
bc244a3
DRY configuration of postgresql (#112)
oz123 Dec 20, 2023
5965f79
Parameterize build branches (#113)
oz123 Dec 22, 2023
09d9162
Correct the two node variable name
oz123 Dec 22, 2023
c1cf44e
Explicitly pass TWO_NODE_BACKEND to earthly
oz123 Dec 22, 2023
3ae3327
Correct the variable name passed to userdata
oz123 Dec 22, 2023
9930d98
fix sourcing of test-two-node.sh
TylerGillson Dec 22, 2023
086b9e9
Fix perl path so psql works in CanvOS
oz123 Dec 22, 2023
295a395
Don't exit from function, instead use return
oz123 Dec 22, 2023
525e2ac
Add missing kine version
oz123 Dec 24, 2023
824d72c
Merge branch 'main' into two-node
TylerGillson Jan 4, 2024
92f463e
chore: tidy Dockerfile examples
TylerGillson Jan 4, 2024
4432f00
fix: configure postgres conditionally; tidy Earthfile
TylerGillson Jan 4, 2024
e997f22
Add external datastore to default k3s config
oz123 Jan 8, 2024
5ab6bfc
Fix format of cluster create
oz123 Jan 8, 2024
e479c83
Parameterize CE_VERSION
oz123 Jan 10, 2024
dc6bf12
fix: parameterize k3s & PE versions
TylerGillson Jan 10, 2024
a9fface
fix: add two-node provider option; tidy
TylerGillson Jan 10, 2024
a98809a
chore: add master-master template
TylerGillson Jan 11, 2024
98418b5
Update env.example
TylerGillson Jan 11, 2024
3f37db0
Add stylus hash to machine and cluster names
oz123 Jan 12, 2024
062ca38
fix: align edge host names w/ cluster template
TylerGillson Jan 15, 2024
7115c36
chore: update master-master template
TylerGillson Jan 15, 2024
27d8d17
chore: remove sqlite support
TylerGillson Jan 15, 2024
07d5716
chore: use node-role, not two-node
TylerGillson Jan 15, 2024
092b6e8
chore: switch to master-master, remove userdata customization
TylerGillson Jan 16, 2024
944f5cd
fix: include edge host names
TylerGillson Jan 18, 2024
6fe1bd8
fix typo
TylerGillson Jan 18, 2024
69b57d2
tidy
TylerGillson Jan 20, 2024
40c900c
feat: remove backend flag; configure pg log rotation
TylerGillson Jan 22, 2024
fd0ba50
add host replacement var, update template
TylerGillson Jan 23, 2024
47e0181
upgrade k3s & kine; parameterize k3s version
TylerGillson Jan 23, 2024
45b831b
fix: finish parameterizing k3s version
TylerGillson Jan 23, 2024
968d3b0
bump kine as releases are missing amd64 build for 0.11.0
TylerGillson Jan 23, 2024
166e24b
remove --pod-eviction-timeout
TylerGillson Jan 23, 2024
9cf8e16
revert k3s & kine versions; update templates for k3s 1.28.x
TylerGillson Jan 24, 2024
17b84af
move pg_data dir into COS_PERSISTENT
TylerGillson Jan 25, 2024
e218b83
move rsync to stylus
TylerGillson Jan 26, 2024
124548e
fix REPLACEMENT_HOST logic
TylerGillson Jan 26, 2024
5dc914a
move pg config to stylus
TylerGillson Jan 27, 2024
8599efc
add prepare_cluster_update
TylerGillson Jan 27, 2024
44a3c1b
add SUFFIX_OVERRIDE; fix vm_array
TylerGillson Jan 30, 2024
41fdc7f
chore: fix instructions & default K3S_VERSION; make function detectio…
TylerGillson Jan 31, 2024
2282361
chore: update stylus branch
TylerGillson Feb 5, 2024
ae28b42
fix: update kine & k3s versions
TylerGillson Mar 7, 2024
d91e7a0
chore: merge main
TylerGillson Mar 8, 2024
982599f
chore: bump default PE_VERSION, k3s version
TylerGillson Mar 11, 2024
b25869d
fix: sort + dedupe k8s versions
TylerGillson Mar 14, 2024
6ebea8a
feat: use single ISO, dynamic edge host names
TylerGillson Mar 14, 2024
cb390ce
chore: add logging
TylerGillson Mar 14, 2024
141e649
fix: init globals after sourcing .env
TylerGillson Mar 14, 2024
273049a
chore: add logging
TylerGillson Mar 14, 2024
d42e19f
docs: add govc version warning
TylerGillson Mar 14, 2024
5546877
chore: remove two-node-update.json
TylerGillson Mar 15, 2024
1b153fa
feat: proxy support
TylerGillson Mar 29, 2024
6e1bb04
refactor: install postgres in provider image only
TylerGillson Apr 1, 2024
103cd4a
feat: wifi setup
TylerGillson Apr 4, 2024
f0f760e
Merge branch 'main' into 2-node
TylerGillson Apr 6, 2024
025f60c
Merge branch 'main' into 2-node
TylerGillson Apr 26, 2024
ff0f44e
Merge branch 'main' into 2-node
TylerGillson May 21, 2024
bbdc9a7
chore: fix typo; add gnupg
TylerGillson May 23, 2024
836facb
refactor: install postgresql w/o gpg
TylerGillson May 24, 2024
f5802c6
Merge branch 'main' into 2-node
TylerGillson May 28, 2024
c12598f
chore: bump provider-k3s version
TylerGillson Jun 11, 2024
ac574f8
Merge branch 'main' into 2-node
TylerGillson Jun 11, 2024
3e9a2d0
chore: fix merge conflicts
TylerGillson Jun 11, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor: install postgresql w/o gpg
Signed-off-by: Tyler Gillson <[email protected]>
TylerGillson committed May 24, 2024
commit 836facbd82e624cdb1ff0911da4c1a193b9fcc9e
10 changes: 4 additions & 6 deletions Earthfile
Original file line number Diff line number Diff line change
@@ -560,11 +560,10 @@ provider-image:
IF $TWO_NODE
# Install postgresql 16
IF [ "$OS_DISTRIBUTION" = "ubuntu" ] && [ "$ARCH" = "amd64" ]
RUN apt install -y apt-transport-https ca-certificates curl gnupg && \
echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
curl -fsSL -o postgresql.asc https://www.postgresql.org/media/keys/ACCC4CF8.asc && \
gpg --batch --yes --dearmor -o /etc/apt/trusted.gpg.d/postgresql.gpg postgresql.asc && \
rm postgresql.asc && \
RUN apt install -y ca-certificates curl && \
install -d /usr/share/postgresql-common/pgdg && \
curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc && \
echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
apt update && \
apt install -y postgresql-16 postgresql-contrib-16 iputils-ping
ELSE IF [ "$OS_DISTRIBUTION" = "opensuse-leap" ] && [ "$ARCH" = "amd64" ]
@@ -583,7 +582,6 @@ provider-image:

SAVE IMAGE --push $IMAGE_PATH


provider-image-rootfs:
FROM --platform=linux/${ARCH} +provider-image
SAVE ARTIFACT --keep-own /. rootfs