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

Make the idler template generic #965

Merged
merged 3 commits into from
Feb 6, 2024
Merged

Make the idler template generic #965

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
a5ae35f
Make the idler template generic
rajivnathan Feb 6, 2024
e1741ce
Test
rajivnathan Feb 6, 2024
d4ffa2c
Merge branch 'master' into genericIdlerTemplate
alexeykazakov Feb 6, 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
7 changes: 3 additions & 4 deletions deploy/templates/notificationtemplates/sandbox/idlertriggered/notification.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>
Notice: Your running application in namespace has been idled
Notice: Your running workload has been idled
</title>
<style>
a:hover {
Expand Down Expand Up @@ -41,13 +41,12 @@
>

<p>
You are receiving this email because one or more of your applications in the Developer Sandbox for
You are receiving this email because one or more of your workloads in the Developer Sandbox for
Red Hat OpenShift has been running for 12 hours.
</p>

<p>
In accordance with the usage terms of Developer Sandbox, we have reduced the number of instances of your
application {{.AppType}} {{.AppName}} to zero (0). You can restart your application(s) by increasing the number of instances from the
In accordance with the usage terms of Developer Sandbox, your workload {{.AppType}} {{.AppName}} has been scaled down. You can restart your workload(s) or scale up the number of instances from the
Developer Sandbox User Interface.
</p>

Expand Down
2 changes: 1 addition & 1 deletion deploy/templates/notificationtemplates/sandbox/idlertriggered/subject.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Notice: Your running application in namespace {{.Namespace}} has been idled
Notice: Your running workload in namespace {{.Namespace}} has been idled
4 changes: 2 additions & 2 deletions pkg/templates/notificationtemplates/notification_generator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ func TestGetNotificationTemplate(t *testing.T) {
// then
require.NoError(t, err)
require.NotNil(t, template)
assert.Equal(t, "Notice: Your running application in namespace {{.Namespace}} has been idled", template.Subject)
assert.Contains(t, template.Content, "In accordance with the usage terms of Developer Sandbox, we have reduced the number of instances of your\n application {{.AppType}} {{.AppName}} to zero (0).")
assert.Equal(t, "Notice: Your running workload in namespace {{.Namespace}} has been idled", template.Subject)
assert.Contains(t, template.Content, "In accordance with the usage terms of Developer Sandbox, your workload {{.AppType}} {{.AppName}} has been scaled down.")

})
})
Expand Down
Loading