Skip to content

Commit

Permalink
Merge pull request #80 from lianglli/fix-ingressclass-master
Browse files Browse the repository at this point in the history
K8s: supports IngressClass and default IngressClass
  • Loading branch information
lianglli authored Oct 23, 2023
2 parents 68cc5d9 + 783215e commit e08c337
Showing 1 changed file with 1 addition and 16 deletions.
17 changes: 1 addition & 16 deletions internal/ingress/controller/store/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ func New(
store.listers.IngressClass.Store = cache.NewStore(cache.MetaNamespaceKeyFunc)
}

store.informers.IngressCheckSum = ingCheckCrdFactory.Koastline().V1alpha1().IngressCheckSums().Informer()
store.informers.IngressCheckSum = ingCheckCrdFactory.Tengine().V1().IngressCheckSums().Informer()
store.listers.IngressCheckSum.Store = store.informers.IngressCheckSum.GetStore()

store.informers.SecretCheckSum = secretCheckCrdFactory.Tengine().V1().SecretCheckSums().Informer()
Expand Down Expand Up @@ -1501,21 +1501,6 @@ func (s *k8sStore) ListIngsWithAnnotation() []*ingress.Ingress {
return ingresses
}

// verifyAPIReferrer used to verify the API referrer
func (s *k8sStore) verifyAPIReferrer(key string, anns *annotations.Ingress) bool {
cfg := s.GetBackendConfiguration()
apiReferrers := strings.Split(cfg.APIReferrer, ",")
for _, apiReferrer := range apiReferrers {
if apiReferrer == anns.API.Referrer {
return true
}
}

s.mc.IncAPIReferInvalidCount()
klog.Warningf("API ingress[%v] with referrer [%v] is illegal, ignored", key, anns.API.Referrer)
return false
}

// verifyIngressReferrer used to verify the ingress referrer
func (s *k8sStore) verifyIngressReferrer(key string, anns *annotations.Ingress) bool {
if anns.Referrer.IngReferrer == "" {
Expand Down

0 comments on commit e08c337

Please sign in to comment.