flag off for r33

Author: Jim Ryan

cmd/nginx-ingress/main.go

@@ -32,7 +32,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	api_v1 "k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/types"
 	util_version "k8s.io/apimachinery/pkg/util/version"
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
@@ -84,12 +83,9 @@ func main() {
 	managerCollector, controllerCollector, registry := createManagerAndControllerCollectors(constLabels)
 
 	var licenseReporter *license_reporting.LicenseReporter
+
 	if *nginxPlus {
-		licenseReporter = license_reporting.NewLicenseReporter(license_reporting.LicenseReporterConfig{
-			Period:          24 * time.Hour,
-			K8sClientReader: kubeClient,
-			PodNSName:       types.NamespacedName{Namespace: os.Getenv("POD_NAMESPACE"), Name: os.Getenv("POD_NAME")},
-		})
+		licenseReporter = license_reporting.NewLicenseReporter(kubeClient)
 	}
 
 	nginxManager, useFakeNginxManager := createNginxManager(managerCollector, licenseReporter)

internal/license_reporting/license_reporting.go

@@ -60,9 +60,13 @@ type LicenseReporterConfig struct {
 }
 
 // NewLicenseReporter creates a new LicenseReporter
-func NewLicenseReporter(cfg LicenseReporterConfig) *LicenseReporter {
+func NewLicenseReporter(client kubernetes.Interface) *LicenseReporter {
 	return &LicenseReporter{
-		config: cfg,
+		config: LicenseReporterConfig{
+			Period:          24 * time.Hour,
+			K8sClientReader: client,
+			PodNSName:       types.NamespacedName{Namespace: os.Getenv("POD_NAMESPACE"), Name: os.Getenv("POD_NAME")},
+		},
 	}
 }
 

internal/license_reporting/license_reporting_test.go

@@ -5,9 +5,7 @@ import (
 	"os"
 	"path/filepath"
 	"testing"
-	"time"
 
-	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes/fake"
 )
 
@@ -60,17 +58,8 @@ func TestWriteLicenseInfo(t *testing.T) {
 }
 
 func TestNewLicenseReporter(t *testing.T) {
-	cfg := LicenseReporterConfig{
-		Period:          time.Minute,
-		K8sClientReader: fake.NewSimpleClientset(),
-		PodNSName:       types.NamespacedName{Namespace: "default", Name: "test-pod"},
-	}
-
-	reporter := NewLicenseReporter(cfg)
+	reporter := NewLicenseReporter(fake.NewSimpleClientset())
 	if reporter == nil {
 		t.Fatal("NewLicenseReporter() returned nil")
 	}
-	if reporter.config != cfg {
-		t.Errorf("NewLicenseReporter() config = %v, want %v", reporter.config, cfg)
-	}
 }

internal/nginx/manager.go

@@ -299,10 +299,15 @@ func (lm *LocalManager) ClearAppProtectFolder(name string) {
 // Start starts NGINX.
 func (lm *LocalManager) Start(done chan error) {
 	if lm.nginxPlus {
-		ctx, cancel := context.WithCancel(context.Background())
-		go lm.licenseReporter.Start(ctx)
-
-		lm.licenseReporterCancel = cancel
+		isR33OrGreater, versionErr := lm.Version().PlusGreaterThanOrEqualTo("nginx-plus-r33")
+		if versionErr != nil {
+			glog.Errorf("Error determining whether nginx version is >= r33: %v", versionErr)
+		}
+		if isR33OrGreater {
+			ctx, cancel := context.WithCancel(context.Background())
+			go lm.licenseReporter.Start(ctx)
+			lm.licenseReporterCancel = cancel
+		}
 	}
 
 	glog.V(3).Info("Starting nginx")
@@ -356,8 +361,14 @@ func (lm *LocalManager) Reload(isEndpointsUpdate bool) error {
 func (lm *LocalManager) Quit() {
 	glog.V(3).Info("Quitting nginx")
 
-	if lm.licenseReporterCancel != nil {
-		lm.licenseReporterCancel()
+	if lm.nginxPlus {
+		isR33OrGreater, err := lm.Version().PlusGreaterThanOrEqualTo("nginx-plus-r33")
+		if err != nil {
+			glog.Errorf("Error determining whether nginx version is >= r33: %v", err)
+		}
+		if isR33OrGreater && lm.licenseReporterCancel != nil {
+			lm.licenseReporterCancel()
+		}
 	}
 
 	binaryFilename := getBinaryFileName(lm.debug)