MINOR: make scale-server-slots annotation available at all scopes

Author: Mo3m3n

controller/service/endpoints.go

@@ -39,7 +39,7 @@ func (s *Service) HandleHAProxySrvs(client api.HAProxyClient, store store.K8s) (
 	backend.Name = s.backend.Name // set backendName in store.PortEndpoints for runtime updates.
 	// scale servers
 	if s.resource.DNS == "" {
-		srvsScaled = s.scaleHAProxySrvs(backend, store)
+		srvsScaled = s.scaleHAProxySrvs(backend)
 	}
 	// update servers
 	for _, srvSlot := range backend.HAProxySrvs {
@@ -85,7 +85,7 @@ func (s *Service) updateHAProxySrv(client api.HAProxyClient, srvSlot store.HAPro
 }
 
 // scaleHAproxySrvs adds servers to match available addresses
-func (s *Service) scaleHAProxySrvs(backend *store.RuntimeBackend, k8sStore store.K8s) (reload bool) {
+func (s *Service) scaleHAProxySrvs(backend *store.RuntimeBackend) (reload bool) {
 	var flag bool
 	var disabled []*store.HAProxySrv
 	var annVal int
@@ -95,7 +95,7 @@ func (s *Service) scaleHAProxySrvs(backend *store.RuntimeBackend, k8sStore store
 	// "servers-increment", "server-slots" are legacy annotations
 	srvSlots := 42
 	for _, annotation := range []string{"servers-increment", "server-slots", "scale-server-slots"} {
-		annVal, annErr = annotations.Int(annotation, k8sStore.ConfigMaps.Main.Annotations)
+		annVal, annErr = annotations.Int(annotation, s.annotations...)
 		if annErr != nil {
 			logger.Errorf("Scale HAProxy servers: %s", annErr)
 		} else if annVal != 0 {

documentation/README.md

@@ -68,7 +68,7 @@ This is autogenerated from [doc.yaml](doc.yaml). Description can be found in [ge
 | [server-proto](#server-proto) | ["h2"] |  |  |:large_blue_circle:|:large_blue_circle:|:large_blue_circle:|
 | [server-ssl](#server-ssl) | [bool](#bool) | "false" |  |:large_blue_circle:|:large_blue_circle:|:large_blue_circle:|
 | [set-host](#set-host) | string |  |  |:large_blue_circle:|:large_blue_circle:|:white_circle:|
-| [scale-server-slots](#backend-scaling) | number | 42 |  |:large_blue_circle:|:white_circle:|:white_circle:|
+| [scale-server-slots](#backend-scaling) | number | 42 |  |:large_blue_circle:|:large_blue_circle:|:large_blue_circle:|
 | [ssl-certificate](#ssl-offloading) | string |  |  |:large_blue_circle:|:white_circle:|:white_circle:|
 | [ssl-passthrough](#https) | [bool](#bool) | "false" |  |:large_blue_circle:|:large_blue_circle:|:large_blue_circle:|
 | [ssl-redirect](#https) | [bool](#bool) | "false" | https |:large_blue_circle:|:large_blue_circle:|:white_circle:|
@@ -469,7 +469,7 @@ check-interval: "1m"
 
   Sets the number of server slots to provision in order for HAProxy to scale dynamically with no reload. If this number is greater than the available endpoints/addresses, the remaining slots will be disabled (put on stand-by) and ready to be used. If this number is lower, the remaining endpoints/addresses will be added after scaling the HAProxy backend with a reload.
 
-  Available on:  `configmap`
+  Available on:  `configmap`  `ingress`  `service`
 
   :information_source: Equivalent old annotations are `servers-increment` and `server-slots`
 

documentation/doc.yaml

@@ -1456,6 +1456,8 @@ annotations:
       - Integer value indicating the number of backend servers to provision. Defaults to 42.
     applies_to:
       - configmap
+      - ingress
+      - service
     version_min: "1.4"
     example: ['scale-server-slots: "75"']
   - title: ssl-certificate