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.

Sign up for GitHub

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

Jump to bottom

chore(updatecli): improve end-dates manifest titles #753

Merged
merged 3 commits into from
Jun 26, 2024
Merged

chore(updatecli): improve end-dates manifest titles #753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ba88ad
chore(updatecli): improve end-dates manifest titles
lemeurherve Jun 24, 2024
6beb361
chore(updatecli) define PR body instructions for trusted.ci Azure SPs
dduportal Jun 24, 2024
2311001
Merge branch 'main' into chore-better-titles
lemeurherve Jun 26, 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
6 changes: 3 additions & 3 deletions updatecli/updatecli.d/fs-sp-writer-end-dates_infra.ci.jenkins.io.tf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{ $github := .github }}
{{ range $key, $val := .end_dates.infra_ci_jenkins_io }}
---
name: "Generate new end date for {{ $val.service }} File Share service principal writer"
name: "Generate new end date for {{ $val.service }} File Share service principal writer on infra.ci.jenkins.io"

scms:
default:
Expand Down Expand Up @@ -49,7 +49,7 @@ conditions:

targets:
updateNextEndDate:
name: generate new end date {{ source "shortNextEndDate" }} for {{ $val.service }} File Share service principal writer on infra.ci.jenkins.io
name: new end date `{{ source "shortNextEndDate" }}` for `{{ $val.service }}` File Share service principal writer on `infra.ci.jenkins.io`
kind: yaml
sourceid: nextEndDate
spec:
Expand All @@ -62,7 +62,7 @@ actions:
kind: github/pullrequest
scmid: default
spec:
title: Generate new end date {{ source "shortNextEndDate" }} for {{ $val.service }} File Share service principal writer on infra.ci.jenkins.io
title: New end date `{{ source "shortNextEndDate" }}` for `{{ $val.service }}` File Share service principal writer on `infra.ci.jenkins.io`
description: |
This PR updates the end date of {{ $val.service }} File Share service principal writer on infra.ci.jenkins.io.

Expand Down
16 changes: 6 additions & 10 deletions updatecli/updatecli.d/fs-sp-writer-end-dates_trusted.ci.jenkins.io.tf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{ $github := .github }}
{{ range $key, $val := .end_dates.trusted_ci_jenkins_io }}
---
name: "Generate new end date for {{ $val.service }} File Share service principal writer"
name: "Generate new end date for {{ $val.service }} File Share service principal writer on trusted.ci.jenkins.io"

scms:
default:
Expand Down Expand Up @@ -49,7 +49,7 @@ conditions:

targets:
updateNextEndDate:
name: generate new end date {{ source "shortNextEndDate" }} for {{ $val.service }} File Share service principal writer on trusted.ci.jenkins.io
name: new end date `{{ source "shortNextEndDate" }}` for `{{ $val.service }}` File Share service principal writer on `trusted.ci.jenkins.io`
kind: yaml
sourceid: nextEndDate
spec:
Expand All @@ -62,22 +62,18 @@ actions:
kind: github/pullrequest
scmid: default
spec:
title: Generate new end date {{ source "shortNextEndDate" }} for {{ $val.service }} File Share service principal writer on trusted.ci.jenkins.io
title: New end date `{{ source "shortNextEndDate" }}` for `{{ $val.service }}` File Share service principal writer on `trusted.ci.jenkins.io`
description: |
This PR updates the end date of {{ $val.service }} File Share service principal writer used in trusted.ci.jenkins.io.

The current end date is set to `{{ $val.end_date }}`.

After merging this PR, a new password will be generated.

> [!IMPORTANT]
> You'll have to ensure that `{{ $val.secret }}` is updated with this new password!
> You'll have to ensure that the trusted.ci.jenkins.io top-level credential `{{ $val.secret }}` is updated with this new password!

If you don't, {{ $val.service }} File Share won't be updated by trusted.ci.jenkins.io jobs anymore.

> [!NOTE]
> This message is a work in progress that needs to be improved
> Check https://github.com/jenkins-infra/helpdesk/issues/4148 for the next steps.
labels:
- terraform
- {{ $val.service }}
Expand Down
12 changes: 6 additions & 6 deletions updatecli/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@ end_dates:
trusted_ci_jenkins_io:
trustedci_updatesjenkinsio_content_fileshare_serviceprincipal_writer:
end_date: 2024-09-22T00:00:00Z
service: "updates.jenkins.io"
secret: "TODO: to be identified, related to updates.jenkins.io"
service: "updates.jenkins.io (content)"
secret: "trusted_ci_jenkins_io_fileshare_serviceprincipal_writer"
trustedci_updatesjenkinsio_redirections_fileshare_serviceprincipal_writer:
end_date: 2024-09-22T00:00:00Z
service: "updates.jenkins.io (httpd)"
secret: "TODO: to be identified, related to updates.jenkins.io (httpd)"
service: "updates.jenkins.io (redirections)"
secret: "TODO: to be identified, related to updates.jenkins.io (redirections)"
trustedci_jenkinsio_fileshare_serviceprincipal_writer:
end_date: "2024-07-23T00:00:00Z"
service: "jenkins.io"
secret: "TODO: to be identified, related to jenkins.io"
secret: "trustedci_jenkinsio_fileshare_serviceprincipal_writer"
trustedci_javadocjenkinsio_fileshare_serviceprincipal_writer:
end_date: "2024-07-28T00:00:00Z"
service: "javadoc.jenkins.io"
secret: "TODO: to be identified, related to javadoc.jenkins.io"
secret: "trustedci_javadocjenkinsio_fileshare_serviceprincipal_writer"