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

terraform/jenkins-controller: add static builders #173

Merged
merged 1 commit into from
Jun 5, 2024

Conversation

flokli
Copy link
Collaborator

@flokli flokli commented Jun 5, 2024

This adds builder.vedenemo.dev and hetzarm.vedenemo.dev as static builders to /etc/nix/machines, as well as the keyscan machinery.

#171 already ensured that ssh key works.

maxJobs is set to the number of cores the system sees, and speedFactor is set to 3, making it more attractive than the other builders.

@flokli flokli requested a review from henrirosten June 5, 2024 09:23
@henrirosten henrirosten requested a review from a team June 5, 2024 09:28
@henrirosten
Copy link
Collaborator

henrirosten commented Jun 5, 2024

@joinemm commented offline that the current version would add the remote builders to 'prod' environment too.
In 'prod' the /etc/secrets/remote-build-ssh-key would not be able to access the added external remote builders (which is what we want).

However, it might still be better to conditionalize the usage of these external remote builders on the envtype only for the 'priv' and 'dev' environments under the environment-specific options:

@flokli flokli force-pushed the jenkins-controller-hetzner-builders branch from 5328ae9 to f75050a Compare June 5, 2024 10:13
@flokli flokli changed the title terraform/jenkins-controller: add hetzner builders terraform/jenkins-controller: add static builders Jun 5, 2024
@flokli
Copy link
Collaborator Author

flokli commented Jun 5, 2024

Updated, it's now conditionalized on (var.envtype == "dev" || var.envtype == "priv"). PTAL.

This adds builder.vedenemo.dev and hetzarm.vedenemo.dev as static
builders to /etc/nix/machines, as well as the keyscan machinery.

#171 already ensured that ssh
key works.

maxJobs is set to the number of cores the system sees, and speedFactor
is set to 3, making it more attractive than the other builders.

Signed-off-by: Florian Klink <flokli@flokli.de>
@flokli flokli force-pushed the jenkins-controller-hetzner-builders branch from f75050a to e0f819f Compare June 5, 2024 10:28
@henrirosten
Copy link
Collaborator

We might actually want to set the num_builders to 0 on 'priv' and 'dev' configurations either as part of this PR, or on a follow-up PR.

@flokli
Copy link
Collaborator Author

flokli commented Jun 5, 2024

Let's do it in a followup, it's unrelated to adding static builders (what this PR does)

@flokli flokli merged commit c069a75 into main Jun 5, 2024
2 checks passed
@flokli flokli deleted the jenkins-controller-hetzner-builders branch June 5, 2024 10:39
henrirosten added a commit that referenced this pull request Jun 5, 2024
Azure builders are no longer needed on 'priv' and 'dev' environments
after #173.

Also moves the external builder configuration to the
environment-specific configuration options to anticipate ghaf-infra
deployments on locations that might not want to use the
vedenemo.dev builders we are using with Ghaf.

Signed-off-by: Henri Rosten <henri.rosten@unikie.com>
@henrirosten henrirosten mentioned this pull request Jun 5, 2024
henrirosten added a commit that referenced this pull request Jun 5, 2024
Azure builders are no longer needed on 'priv' and 'dev' environments
after #173.

Also moves the external builder configuration to the
environment-specific configuration options to anticipate ghaf-infra
deployments on locations that might not want to use the
vedenemo.dev builders we are using with Ghaf.

Signed-off-by: Henri Rosten <henri.rosten@unikie.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants