Cleanup only available VCLs. Don't delete an already discarded VCL. (#30

)

Signed-off-by: Tomash Sidei <[email protected]>

pkg/varnishcontroller/controller/controller_varnish.go

@@ -57,7 +57,7 @@ func (r *ReconcileVarnish) reconcileVarnish(ctx context.Context, vc *v1alpha1.Va
 
 	// cleanup unused VCLs. It cleans up only VCLs created by varnish controller (those that start with our prefix)
 	for _, vclConfig := range configsList {
-		if vclConfig.Status != varnishadm.VCLStatusActive && strings.HasPrefix(vclConfig.Name, VCLVersionPrefix) {
+		if vclConfig.Status == varnishadm.VCLStatusAvailable && strings.HasPrefix(vclConfig.Name, VCLVersionPrefix) {
 			err := r.varnish.Discard(vclConfig.Name)
 			if err != nil {
 				return errors.Wrapf(err, "Can't delete VCL config %q", vclConfig.Name)

pkg/varnishcontroller/varnishadm/varnishadm.go

@@ -17,6 +17,8 @@ const (
 	VCLStatusAvailable = "available"
 	//VCLStatusActive - VCL configuration is active now
 	VCLStatusActive = "active"
+	//VCLStatusDiscarded - VCL configuration is discarded but still in use by in-flight requests
+	VCLStatusDiscarded = "discarded"
 	//VCLTemperatureCold - vanish VCL "temperature"
 	VCLTemperatureCold = "cold"
 	//VCLTemperatureWarm for preloaded varnish's VCL