Skip to content

Commit

Permalink
Increase Typha max fall behind window (#1897)
Browse files Browse the repository at this point in the history
  • Loading branch information
caseydavenport authored Apr 13, 2022
1 parent 06e82e4 commit 6521a6c
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions pkg/render/typha.go
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,8 @@ func (c *typhaComponent) typhaRole() *rbacv1.ClusterRole {
}
if c.installation.KubernetesProvider != operator.ProviderOpenShift {
// Allow access to the pod security policy in case this is enforced on the cluster
role.Rules = append(role.Rules, rbacv1.PolicyRule{APIGroups: []string{"policy"},
role.Rules = append(role.Rules, rbacv1.PolicyRule{
APIGroups: []string{"policy"},
Resources: []string{"podsecuritypolicies"},
Verbs: []string{"use"},
ResourceNames: []string{common.TyphaDeploymentName},
Expand Down Expand Up @@ -504,6 +505,7 @@ func (c *typhaComponent) typhaEnvVars() []v1.EnvVar {
}

typhaEnv := []v1.EnvVar{
{Name: "TYPHA_SERVERMAXFALLBEHINDSECS", Value: "600"},
{Name: "TYPHA_LOGSEVERITYSCREEN", Value: "info"},
{Name: "TYPHA_LOGFILEPATH", Value: "none"},
{Name: "TYPHA_LOGSEVERITYSYS", Value: "none"},
Expand Down Expand Up @@ -541,7 +543,8 @@ func (c *typhaComponent) typhaEnvVars() []v1.EnvVar {
if c.installation.CalicoNetwork != nil && c.installation.CalicoNetwork.MultiInterfaceMode != nil {
typhaEnv = append(typhaEnv, v1.EnvVar{
Name: "MULTI_INTERFACE_MODE",
Value: c.installation.CalicoNetwork.MultiInterfaceMode.Value()})
Value: c.installation.CalicoNetwork.MultiInterfaceMode.Value(),
})
}
}

Expand Down Expand Up @@ -624,10 +627,11 @@ func (c *typhaComponent) affinity() (aff *v1.Affinity) {
if c.installation.TyphaAffinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution == nil && len(c.installation.TyphaAffinity.NodeAffinity.PreferredDuringSchedulingIgnoredDuringExecution) == 0 {
return nil
}
aff = &v1.Affinity{NodeAffinity: &v1.NodeAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: c.installation.TyphaAffinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution,
PreferredDuringSchedulingIgnoredDuringExecution: c.installation.TyphaAffinity.NodeAffinity.PreferredDuringSchedulingIgnoredDuringExecution,
},
aff = &v1.Affinity{
NodeAffinity: &v1.NodeAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: c.installation.TyphaAffinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution,
PreferredDuringSchedulingIgnoredDuringExecution: c.installation.TyphaAffinity.NodeAffinity.PreferredDuringSchedulingIgnoredDuringExecution,
},
}

}
Expand Down

0 comments on commit 6521a6c

Please sign in to comment.