clan/clan-core
12
4
Fork 18
Code Issues 99 Pull Requests 3 Actions Packages Projects 1 Releases Wiki Activity

init diskLayouts #302

Merged
Mic92 merged 13 commits from lassulus-HEAD into main 2023-09-21 16:33:21 +00:00
Conversation 0 Commits 13 Files Changed 28 +536 -204
lassulus commented 2023-09-18 21:07:59 +00:00
Owner
Copy Link

add clan_core path helper function

pytest: add impure marker

cli: rename admin create to create

init clanModules.diskLayouts

secrets sops: deploy age key

add clan_core path helper function pytest: add impure marker cli: rename admin create to create init clanModules.diskLayouts secrets sops: deploy age key
lassulus force-pushed lassulus-HEAD from 58257c9284 to 5f3061fcef 2023-09-18 21:08:55 +00:00 Compare
lassulus changed title from use experimental flags everywhere to init diskLayouts 2023-09-18 21:09:06 +00:00
lassulus force-pushed lassulus-HEAD from 5f3061fcef to 201acc9614 2023-09-19 12:25:46 +00:00 Compare
lassulus force-pushed lassulus-HEAD from fcc98a18cb to 2b08f233fa 2023-09-19 14:29:50 +00:00 Compare
lassulus force-pushed lassulus-HEAD from 2b08f233fa to 3a8b9fc9b6 2023-09-19 14:47:25 +00:00 Compare
lassulus force-pushed lassulus-HEAD from 3a8b9fc9b6 to 218451e79f 2023-09-19 15:48:18 +00:00 Compare
Mic92 force-pushed lassulus-HEAD from 8680cbaf4e to b3159559f4 2023-09-19 20:54:28 +00:00 Compare
Mic92 force-pushed lassulus-HEAD from b3159559f4 to 3b5f532fe4 2023-09-19 20:57:49 +00:00 Compare
Mic92 force-pushed lassulus-HEAD from 3b5f532fe4 to e51f3b6a14 2023-09-19 20:59:08 +00:00 Compare
Mic92 force-pushed lassulus-HEAD from e51f3b6a14 to 359f776e6d 2023-09-19 21:00:08 +00:00 Compare
Mic92 force-pushed lassulus-HEAD from ec35f8085c to 5f7a925322 2023-09-20 09:00:33 +00:00 Compare
lassulus reviewed 2023-09-20 09:24:35 +00:00
nixosModules/clanCore/secrets/sops.nix Outdated
@ -71,0 +33,4 @@
generateSecrets = pkgs.writeScript "generate-secrets" ''
#!${pkgs'.python3}/bin/python
import json
from clan_cli.secrets.generate import generate_secrets_from_nix
lassulus commented 2023-09-20 09:24:35 +00:00
Author
Owner
Copy Link

how is clan_cli made available here? it would be nicer to have this independent of the clan_cli package.

how is clan_cli made available here? it would be nicer to have this independent of the clan_cli package.
Mic92 commented 2023-09-20 10:13:17 +00:00
Owner
Copy Link

We depend on the clan cli already because this is used to set secrets. So we would first need to make the secrets cli independent of clan.

We depend on the clan cli already because this is used to set secrets. So we would first need to make the secrets cli independent of clan.
Mic92 force-pushed lassulus-HEAD from 5f7a925322 to 9363dec49f 2023-09-20 09:33:02 +00:00 Compare
lassulus reviewed 2023-09-20 09:33:13 +00:00
nixosModules/clanCore/secrets/sops.nix Outdated
@ -71,0 +34,4 @@
#!${pkgs'.python3}/bin/python
import json
from clan_cli.secrets.generate import generate_secrets_from_nix
args = json.loads(${builtins.toJSON (builtins.toJSON { machine_name = config.clanCore.machineName; secret_submodules = config.clanCore.secrets; })})
lassulus commented 2023-09-20 09:33:13 +00:00
Author
Owner
Copy Link

doesn't this also need 2 json.loads? otherwise it's just one big string?

doesn't this also need 2 json.loads? otherwise it's just one big string?
Mic92 commented 2023-09-20 10:12:27 +00:00
Owner
Copy Link

No. it's a python string that gets parsed as json.

No. it's a python string that gets parsed as json.
Mic92 reviewed 2023-09-21 12:17:20 +00:00
clanModules/diskLayouts/singleDiskExt4.nix Outdated
@ -0,0 +1,44 @@
{ config, lib, ... }:
Mic92 commented 2023-09-21 12:17:20 +00:00
Owner
Copy Link

This pull requests already touches a lot of stuff. Can you split the disko part into a new pull request?
I think disk partition configurations needs to be versioned so we can evolve the format without breaking existing machines.

This pull requests already touches a lot of stuff. Can you split the disko part into a new pull request? I think disk partition configurations needs to be versioned so we can evolve the format without breaking existing machines.
lassulus force-pushed lassulus-HEAD from f29dcc0a70 to 15a578b455 2023-09-21 15:27:54 +00:00 Compare
lassulus force-pushed lassulus-HEAD from 15a578b455 to ad15d9a6c7 2023-09-21 15:34:36 +00:00 Compare
lassulus force-pushed lassulus-HEAD from ad15d9a6c7 to 456b3c9769 2023-09-21 15:44:29 +00:00 Compare
lassulus force-pushed lassulus-HEAD from 456b3c9769 to 3923feb66e 2023-09-21 15:50:16 +00:00 Compare
lassulus force-pushed lassulus-HEAD from 3923feb66e to ac37453258 2023-09-21 15:51:27 +00:00 Compare
lassulus force-pushed lassulus-HEAD from ac37453258 to a522ee2611 2023-09-21 16:03:01 +00:00 Compare
lassulus force-pushed lassulus-HEAD from a522ee2611 to 8bdc780eee 2023-09-21 16:09:00 +00:00 Compare
lassulus force-pushed lassulus-HEAD from 8bdc780eee to 67c79f411d 2023-09-21 16:10:47 +00:00 Compare
lassulus force-pushed lassulus-HEAD from 67c79f411d to d983a77fb9 2023-09-21 16:13:14 +00:00 Compare
lassulus force-pushed lassulus-HEAD from d983a77fb9 to c91d7d8c2e 2023-09-21 16:14:38 +00:00 Compare
lassulus force-pushed lassulus-HEAD from c91d7d8c2e to 62ad4bcd67 2023-09-21 16:29:41 +00:00 Compare
Mic92 merged commit 4f3f7a4feb into main 2023-09-21 16:33:21 +00:00
Mic92 deleted branch lassulus-HEAD 2023-09-21 16:33:21 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
backups

   
blog

   
bootstrapping

Issues regarding bootstrapping, or onboarding

  
bug

Something is not working.

  
changes-requested

Please fix this.

  
cli

   
documentation

   
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
facts

Issues regarding facts and secrets setting and generation

  
help wanted

Need some help

  
invalid

Something is wrong

  
Inventory

Inventory

  
low_prio

   
manager

   
modules

   
needs-review

This PR needs to be reviewed. Use the request-changes label to request changes

  
networking

   
packaging

   
question

More information is needed

  
secrets

   
template

Issues regarding templates.

  
test

Issues regarding testing

  
tooling

Issues regarding internal devtools

  
user-testing

Issues that cristallised after hands on user testing.

  
vm

Issues regarding virtual machines.

  
wontfix

This won't be fixed

No Label
backups
blog
bootstrapping
bug
changes-requested
cli
documentation
duplicate
enhancement
facts
help wanted
invalid
Inventory
low_prio
manager
modules
needs-review
networking
packaging
question
secrets
template
test
tooling
user-testing
vm
wontfix
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: clan/clan-core#302
No description provided.
Delete Branch "lassulus-HEAD"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?