Skip to content

Commit e7aecfb

Browse files
ivanmatmatioktalz
authored andcommitted
BUG: remove unnecessary store argument for ingress
1 parent 1e57f81 commit e7aecfb

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

pkg/controller/controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ func (c *HAProxyController) updateHAProxy() {
150150
}
151151
c.store.SecretsProcessed = map[string]struct{}{}
152152
for _, ingResource := range namespace.Ingresses {
153-
i := ingress.New(c.store, ingResource, c.osArgs.IngressClass, c.osArgs.EmptyIngressClass, c.annotations)
153+
i := ingress.New(ingResource, c.osArgs.IngressClass, c.osArgs.EmptyIngressClass, c.annotations)
154154
if !i.Supported(c.store, c.annotations) {
155155
logger.Debugf("ingress '%s/%s' ignored: no matching", ingResource.Namespace, ingResource.Name)
156156
} else {

pkg/ingress/ingress.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ type Ingress struct {
4040
// New returns an Ingress instance to handle the k8s ingress resource given in params.
4141
// If the k8s ingress resource is not assigned to the controller (no matching IngressClass)
4242
// then New will return nil
43-
func New(k store.K8s, resource *store.Ingress, class string, emptyClass bool, a annotations.Annotations) *Ingress {
43+
func New(resource *store.Ingress, class string, emptyClass bool, a annotations.Annotations) *Ingress {
4444
return &Ingress{resource: resource, controllerClass: class, allowEmptyClass: emptyClass, annotations: a}
4545
}
4646

pkg/status/updatestatus.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func (m *UpdateStatusManagerImpl) Update(k store.K8s, h haproxy.HAProxy, a annot
5151
}
5252

5353
for _, ingResource := range namespace.Ingresses {
54-
i := ingress.New(k, ingResource, m.ingressClass, m.emptyIngressClass, a)
54+
i := ingress.New(ingResource, m.ingressClass, m.emptyIngressClass, a)
5555
supported := i.Supported(k, a)
5656

5757
if (!supported && (len(ingResource.Addresses) == 0 || !utils.EqualSliceStringsWithoutOrder(k.PublishServiceAddresses, ingResource.Addresses))) ||

0 commit comments

Comments
 (0)