Skip to content

feat: update welcome email #503

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

Merged
JoseSzycho merged 4 commits into from
Mar 18, 2026
Merged

feat: update welcome email #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f7695e1
feat: Implement automatic platform access approval creation for new u…
JoseSzycho Feb 20, 2026
762d1e8
refactor: conditionally check for existing platform access approvals …
JoseSzycho Feb 20, 2026
bc655bf
Merge branch 'main' into feat/disable-wait-list
JoseSzycho Mar 18, 2026
561fec8
chore: remove automatic craetion of platformAccessApproval
JoseSzycho Mar 18, 2026
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
2 changes: 1 addition & 1 deletion cmd/milo/controller-manager/controllermanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ func NewCommand() *cobra.Command {
fs.StringVar(&AcceptInvitationRoleName, "accept-invitation-role-name", "iam.miloapis.com-acceptinvitation", "The name of the role that will be used to grant accept invitation permissions.")
fs.StringVar(&UserInvitationEmailTemplate, "user-invitation-email-template", "emailtemplates.notification.miloapis.com-userinvitationemailtemplate", "The name of the template that will be used to send the user invitation email.")
fs.StringVar(&UserWaitlistPendingEmailTemplate, "user-waitlist-pending-email-template", "emailtemplates.notification.miloapis.com-userwaitlistemailtemplate", "The name of the template that will be used to send the waitlist pending email.")
fs.StringVar(&UserWaitlistApprovedEmailTemplate, "user-waitlist-approved-email-template", "emailtemplates.notification.miloapis.com-userapprovedemailtemplate", "The name of the template that will be used to send the waitlist approved email.")
fs.StringVar(&UserWaitlistApprovedEmailTemplate, "user-waitlist-approved-email-template", "emailtemplates.notification.miloapis.com-userwelcomeemailtemplate", "The name of the template that will be used to send the waitlist approved email.")
fs.StringVar(&UserWaitlistRejectedEmailTemplate, "user-waitlist-rejected-email-template", "emailtemplates.notification.miloapis.com-userrejectedemailtemplate", "The name of the template that will be used to send the waitlist rejected email.")
fs.StringVar(&PlatformInvitationEmailTemplate, "platform-invitation-email-template", "emailtemplates.notification.miloapis.com-platforminvitationemailtemplate", "The name of the template that will be used to send the platform invitation email.")
fs.StringVar(&WaitlistRelatedResourcesNamespace, "waitlist-related-resources-namespace", "milo-system", "The namespace that contains the waitlist related resources.")
Expand Down
6 changes: 1 addition & 5 deletions internal/controllers/iam/user_waitlist_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,18 +203,14 @@ func (r *UserWaitlistController) getEmailTemplateName(condition iamv1alpha1.User
}

func (r *UserWaitlistController) getEmailVariables(condition iamv1alpha1.UserWaitlistEmailSentCondition, user *iamv1alpha1.User) []notificationv1alpha1.EmailVariable {
userName := fmt.Sprintf("%s %s", user.Spec.GivenName, user.Spec.FamilyName)
userName := user.Spec.GivenName
Comment thread
JoseSzycho marked this conversation as resolved.
if userName == "" {
userName = user.Spec.Email
}

switch condition {
case iamv1alpha1.UserWaitlistApprovedEmailSentCondition:
return []notificationv1alpha1.EmailVariable{
{
Name: "ActionUrl",
Value: "https://cloud.datum.net",
},
{
Name: "UserName",
Value: userName,
Expand Down
Loading