Skip to content

Commit

Permalink
chore(updates.jenkins.io): allow trusted.ci.jenkins.io to interract w…
Browse files Browse the repository at this point in the history
…ith updates-jenkins-io-httpd File Share (#677)

This PR allows trusted.ci.jenkins.io to interract with
updates-jenkins-io-httpd File Share.

Follow-up of:
- #676

Ref:
-
jenkins-infra/helpdesk#2649 (comment)
  • Loading branch information
lemeurherve authored Apr 25, 2024
1 parent ed94020 commit 4eb2504
Showing 1 changed file with 18 additions and 0 deletions.
18 changes: 18 additions & 0 deletions trusted.ci.jenkins.io.tf
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,31 @@ module "trusted_ci_jenkins_io_fileshare_serviceprincipal_writer" {
storage_account_id = azurerm_storage_account.updates_jenkins_io.id
default_tags = local.default_tags
}
module "trustedci_updates_jenkins_io_httpd_fileshare_serviceprincipal_writer" {
source = "./.shared-tools/terraform/modules/azure-jenkinsinfra-fileshare-serviceprincipal-writer"

service_fqdn = "${module.trusted_ci_jenkins_io.service_fqdn}-fileshare_serviceprincipal_writer"
active_directory_owners = [data.azuread_service_principal.terraform_production.id]
active_directory_url = "https://github.com/jenkins-infra/azure"
service_principal_end_date = "2024-06-20T19:00:00Z"
file_share_resource_manager_id = azurerm_storage_share.updates_jenkins_io_httpd.resource_manager_id
storage_account_id = azurerm_storage_account.updates_jenkins_io.id
default_tags = local.default_tags
}
output "trusted_ci_jenkins_io_fileshare_serviceprincipal_writer_id" {
value = module.trusted_ci_jenkins_io_fileshare_serviceprincipal_writer.fileshare_serviceprincipal_writer_id
}
output "trusted_ci_jenkins_io_fileshare_serviceprincipal_writer_password" {
sensitive = true
value = module.trusted_ci_jenkins_io_fileshare_serviceprincipal_writer.fileshare_serviceprincipal_writer_password
}
output "trustedci_updates_jenkins_io_httpd_fileshare_serviceprincipal_writer_id" {
value = module.trustedci_updates_jenkins_io_httpd_fileshare_serviceprincipal_writer.fileshare_serviceprincipal_writer_id
}
output "trustedci_updates_jenkins_io_httpd_fileshare_serviceprincipal_writer_password" {
sensitive = true
value = module.trustedci_updates_jenkins_io_httpd_fileshare_serviceprincipal_writer.fileshare_serviceprincipal_writer_password
}

# Required to allow azcopy sync of jenkins.io File Share
module "trustedci_jenkinsio_fileshare_serviceprincipal_writer" {
Expand Down

0 comments on commit 4eb2504

Please sign in to comment.