diff --git a/internal/ingress/types_equals.go b/internal/ingress/types_equals.go index 359d74a11..b6efe25dd 100644 --- a/internal/ingress/types_equals.go +++ b/internal/ingress/types_equals.go @@ -256,34 +256,43 @@ func (s1 *Server) Equal(s2 *Server) bool { if s1.Hostname != s2.Hostname { return false } - if s1.Alias != s2.Alias { - return false - } if s1.SSLPassthrough != s2.SSLPassthrough { return false } if s1.SSLCertificate != s2.SSLCertificate { return false } + if s1.SSLFullChainCertificate != s2.SSLFullChainCertificate { + return false + } + if !s1.SSLExpireTime.Equal(s2.SSLExpireTime) { + return false + } if s1.SSLPemChecksum != s2.SSLPemChecksum { return false } - if !(&s1.CertificateAuth).Equal(&s2.CertificateAuth) { - return false - } - if s1.SSLFullChainCertificate != s2.SSLFullChainCertificate { + if s1.Alias != s2.Alias { return false } if s1.RedirectFromToWWW != s2.RedirectFromToWWW { return false } - - if len(s1.Locations) != len(s2.Locations) { + if !(&s1.CertificateAuth).Equal(&s2.CertificateAuth) { + return false + } + if s1.ServerSnippet != s2.ServerSnippet { return false } if s1.SSLCiphers != s2.SSLCiphers { return false } + if s1.AuthTLSError != s2.AuthTLSError { + return false + } + + if len(s1.Locations) != len(s2.Locations) { + return false + } // Location are sorted for idx, s1l := range s1.Locations {