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

Fix endless rotation because of serviceAccount default #163

Merged
merged 1 commit into from
Jun 7, 2018
Merged

Fix endless rotation because of serviceAccount default #163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 11 additions & 1 deletion pkg/deployment/reconcile/plan_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,13 +289,21 @@ func podNeedsRotation(p v1.Pod, apiObject metav1.Object, spec api.DeploymentSpec
}*/

// Check service account
if p.Spec.ServiceAccountName != groupSpec.GetServiceAccountName() {
if normalizeServiceAccountName(p.Spec.ServiceAccountName) != normalizeServiceAccountName(groupSpec.GetServiceAccountName()) {
return true, "ServiceAccountName changed"
}

return false, ""
}

// normalizeServiceAccountName replaces default with empty string, otherwise returns the input.
func normalizeServiceAccountName(name string) string {
if name == "default" {
return ""
}
return ""
}

// tlsKeyfileNeedsRenewal decides if the certificate in the given keyfile
// should be renewed.
func tlsKeyfileNeedsRenewal(log zerolog.Logger, keyfile string) bool {
Expand Down Expand Up @@ -374,6 +382,7 @@ func createRotateMemberPlan(log zerolog.Logger, member api.MemberStatus,
log.Debug().
Str("id", member.ID).
Str("role", group.AsRole()).
Str("reason", reason).
Msg("Creating rotation plan")
plan := api.Plan{
api.NewAction(api.ActionTypeRotateMember, group, member.ID, reason),
Expand All @@ -389,6 +398,7 @@ func createUpgradeMemberPlan(log zerolog.Logger, member api.MemberStatus,
log.Debug().
Str("id", member.ID).
Str("role", group.AsRole()).
Str("reason", reason).
Msg("Creating upgrade plan")
plan := api.Plan{
api.NewAction(api.ActionTypeUpgradeMember, group, member.ID, reason),
Expand Down