@@ -5,18 +5,18 @@ import (
55 "context"
66 "fmt"
77 "os/exec"
8+ "sort"
9+ "strconv"
10+ "strings"
811 "text/template"
12+ "time"
913
1014 "github.com/golang/glog"
1115 varnishclient "github.com/martin-helmich/go-varnish-client"
1216)
1317
1418func (v * VarnishController ) watchConfigUpdates (ctx context.Context , c * exec.Cmd , errors chan <- error ) {
15- i := 0
16-
1719 for {
18- i ++
19-
2020 select {
2121 case tmplContents := <- v .vclTemplateUpdates :
2222 glog .Infof ("VCL template has been updated" )
@@ -29,7 +29,7 @@ func (v *VarnishController) watchConfigUpdates(ctx context.Context, c *exec.Cmd,
2929
3030 v .vclTemplate = tmpl
3131
32- errors <- v .rebuildConfig (ctx , i )
32+ errors <- v .rebuildConfig (ctx )
3333
3434 case newConfig := <- v .frontendUpdates :
3535 glog .Infof ("received new frontend configuration: %+v" , newConfig )
@@ -40,14 +40,14 @@ func (v *VarnishController) watchConfigUpdates(ctx context.Context, c *exec.Cmd,
4040 v .varnishSignaller .SetEndpoints (v .frontend )
4141 }
4242
43- errors <- v .rebuildConfig (ctx , i )
43+ errors <- v .rebuildConfig (ctx )
4444
4545 case newConfig := <- v .backendUpdates :
4646 glog .Infof ("received new backend configuration: %+v" , newConfig )
4747
4848 v .backend = newConfig
4949
50- errors <- v .rebuildConfig (ctx , i )
50+ errors <- v .rebuildConfig (ctx )
5151
5252 case <- ctx .Done ():
5353 errors <- ctx .Err ()
@@ -56,7 +56,7 @@ func (v *VarnishController) watchConfigUpdates(ctx context.Context, c *exec.Cmd,
5656 }
5757}
5858
59- func (v * VarnishController ) rebuildConfig (ctx context.Context , i int ) error {
59+ func (v * VarnishController ) rebuildConfig (ctx context.Context ) error {
6060 buf := new (bytes.Buffer )
6161
6262 err := v .renderVCL (buf , v .frontend .Endpoints , v .frontend .Primary , v .backend .Endpoints , v .backend .Primary )
@@ -77,7 +77,46 @@ func (v *VarnishController) rebuildConfig(ctx context.Context, i int) error {
7777 return err
7878 }
7979
80- configname := fmt .Sprintf ("k8s-upstreamcfg-%d" , i )
80+ maxVclParam , err := client .GetParameter (ctx , "max_vcl" )
81+ if err != nil {
82+ return err
83+ }
84+
85+ maxVcl , err := strconv .Atoi (maxVclParam .Value )
86+ if err != nil {
87+ return err
88+ }
89+
90+ loadedVcl , err := client .ListVCL (ctx )
91+ if err != nil {
92+ return err
93+ }
94+
95+ availableVcl := make ([]varnishclient.VCLConfig , 0 )
96+
97+ for i := range loadedVcl {
98+ if loadedVcl [i ].Status == varnishclient .VCLAvailable {
99+ availableVcl = append (availableVcl , loadedVcl [i ])
100+ }
101+ }
102+
103+ if len (loadedVcl ) >= maxVcl {
104+ // we're abusing the fact that "boot" < "reload"
105+ sort .Slice (availableVcl , func (i , j int ) bool {
106+ return availableVcl [i ].Name < availableVcl [j ].Name
107+ })
108+
109+ for i := 0 ; i < len (loadedVcl )- maxVcl + 1 ; i ++ {
110+ glog .V (8 ).Infof ("discarding VCL: %s" , availableVcl [i ].Name )
111+
112+ err = client .DiscardVCL (ctx , availableVcl [i ].Name )
113+ if err != nil {
114+ return err
115+ }
116+ }
117+ }
118+
119+ configname := strings .ReplaceAll (time .Now ().Format ("reload_20060102_150405.00000" ), "." , "_" )
81120
82121 err = client .DefineInlineVCL (ctx , configname , vcl , varnishclient .VCLStateAuto )
83122 if err != nil {
0 commit comments