Pass os.Getenv("BUILD_OS") directly to manager

Author: shaun-nx

cmd/gateway/commands.go

@@ -209,11 +209,6 @@ func createControllerCommand() *cobra.Command {
 				imageSource = "unknown"
 			}
 
-			buildOs := os.Getenv("BUILD_OS")
-			if buildOs == "" {
-				buildOs = "alpine"
-			}
-
 			period, err := time.ParseDuration(telemetryReportPeriod)
 			if err != nil {
 				return fmt.Errorf("error parsing telemetry report period: %w", err)
@@ -276,7 +271,6 @@ func createControllerCommand() *cobra.Command {
 				Plus:                 plus,
 				ExperimentalFeatures: gwExperimentalFeatures,
 				ImageSource:          imageSource,
-				BuildOS:              buildOs,
 				Flags: config.Flags{
 					Names:  flagKeys,
 					Values: flagValues,

internal/controller/config/config.go

@@ -26,8 +26,6 @@ type Config struct {
 	GatewayClassName string
 	// ImageSource is the source of the NGINX Gateway image.
 	ImageSource string
-	// BuildOS is the OS the NGF and NGINX binary was built on.
-	BuildOS string
 	// GatewayCtlrName is the name of this controller.
 	GatewayCtlrName string
 	// UsageReportConfig specifies the NGINX Plus usage reporting configuration.

internal/controller/manager.go

@@ -3,6 +3,7 @@ package controller
 import (
 	"context"
 	"fmt"
+	"os"
 	"time"
 
 	"github.com/go-logr/logr"
@@ -290,7 +291,7 @@ func StartManager(cfg config.Config) error {
 				Name:      cfg.GatewayPodConfig.Name,
 			},
 			ImageSource:               cfg.ImageSource,
-			BuildOS:                   cfg.BuildOS,
+			BuildOS:                   os.Getenv("BUILD_OS"),
 			Flags:                     cfg.Flags,
 			NginxOneConsoleConnection: cfg.NginxOneConsoleTelemetryConfig.DataplaneKeySecretName != "",
 		})

internal/controller/telemetry/collector.go

@@ -178,11 +178,6 @@ func (c DataCollectorImpl) Collect(ctx context.Context) (Data, error) {
 
 	nginxPodCount := getNginxPodCount(g, clusterInfo.NodeCount)
 
-	buildOS := c.cfg.BuildOS
-	if buildOS == "" {
-		buildOS = "alpine"
-	}
-
 	data := Data{
 		Data: tel.Data{
 			ProjectName:         "NGF",
@@ -196,7 +191,7 @@ func (c DataCollectorImpl) Collect(ctx context.Context) (Data, error) {
 		},
 		NGFResourceCounts:              graphResourceCount,
 		ImageSource:                    c.cfg.ImageSource,
-		BuildOS:                        buildOS,
+		BuildOS:                        c.cfg.BuildOS,
 		FlagNames:                      c.cfg.Flags.Names,
 		FlagValues:                     c.cfg.Flags.Values,
 		SnippetsFiltersDirectives:      snippetsFiltersDirectives,

internal/controller/telemetry/collector_test.go

@@ -72,64 +72,6 @@ func createGetCallsFunc(objects ...client.Object) getCallsFunc {
 }
 
 var _ = Describe("Collector", Ordered, func() {
-
-	Describe("BuildOS field", func() {
-		var (
-			k8sClientReader         *kubernetesfakes.FakeReader
-			fakeGraphGetter         *telemetryfakes.FakeGraphGetter
-			fakeConfigurationGetter *telemetryfakes.FakeConfigurationGetter
-			version                 string
-			podNSName               types.NamespacedName
-			flags                   config.Flags
-		)
-
-		BeforeEach(func() {
-			version = "1.1"
-			k8sClientReader = &kubernetesfakes.FakeReader{}
-			fakeGraphGetter = &telemetryfakes.FakeGraphGetter{}
-			fakeConfigurationGetter = &telemetryfakes.FakeConfigurationGetter{}
-			podNSName = types.NamespacedName{Namespace: "nginx-gateway", Name: "ngf-pod"}
-			flags = config.Flags{}
-			fakeGraphGetter.GetLatestGraphReturns(&graph.Graph{})
-			fakeConfigurationGetter.GetLatestConfigurationReturns(nil)
-		})
-
-		It("sets BuildOS to 'alpine' when config.BuildOS is empty", func(ctx SpecContext) {
-			dataCollector := telemetry.NewDataCollectorImpl(telemetry.DataCollectorConfig{
-				K8sClientReader:           k8sClientReader,
-				GraphGetter:               fakeGraphGetter,
-				ConfigurationGetter:       fakeConfigurationGetter,
-				Version:                   version,
-				PodNSName:                 podNSName,
-				ImageSource:               "local",
-				Flags:                     flags,
-				NginxOneConsoleConnection: true,
-				BuildOS:                   "",
-			})
-
-			data, err := dataCollector.Collect(ctx)
-			Expect(err).ToNot(HaveOccurred())
-			Expect(data.BuildOS).To(Equal("alpine"))
-		})
-
-		It("sets BuildOS to 'ubi' when config.BuildOS is 'ubi'", func(ctx SpecContext) {
-			dataCollector := telemetry.NewDataCollectorImpl(telemetry.DataCollectorConfig{
-				K8sClientReader:           k8sClientReader,
-				GraphGetter:               fakeGraphGetter,
-				ConfigurationGetter:       fakeConfigurationGetter,
-				Version:                   version,
-				PodNSName:                 podNSName,
-				ImageSource:               "local",
-				Flags:                     flags,
-				NginxOneConsoleConnection: true,
-				BuildOS:                   "ubi",
-			})
-
-			data, err := dataCollector.Collect(ctx)
-			Expect(err).ToNot(HaveOccurred())
-			Expect(data.BuildOS).To(Equal("ubi"))
-		})
-	})
 	var (
 		k8sClientReader         *kubernetesfakes.FakeReader
 		fakeGraphGetter         *telemetryfakes.FakeGraphGetter