Use fallback image tag

Author: sjberman

cmd/gateway/commands.go

@@ -6,6 +6,7 @@ import (
 	"os"
 	"runtime/debug"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/spf13/cobra"
@@ -674,13 +675,19 @@ func createGatewayPodConfig(version, svcName string) (config.GatewayPodConfig, e
 		return config.GatewayPodConfig{}, err
 	}
 
+	// use image tag version if set, otherwise fall back to binary version
+	ngfVersion := version
+	if imageParts := strings.Split(image, ":"); len(imageParts) == 2 {
+		ngfVersion = imageParts[1]
+	}
+
 	c := config.GatewayPodConfig{
 		ServiceName:  svcName,
 		Namespace:    ns,
 		Name:         name,
 		UID:          podUID,
 		InstanceName: instance,
-		Version:      version,
+		Version:      ngfVersion,
 		Image:        image,
 	}
 

cmd/gateway/commands_test.go

@@ -683,13 +683,21 @@ func TestCreateGatewayPodConfig(t *testing.T) {
 		Name:         "my-pod",
 		UID:          "1234",
 		InstanceName: "my-pod-xyz",
-		Version:      version,
+		Version:      "tag",
 		Image:        "my-pod-image:tag",
 	}
 	cfg, err := createGatewayPodConfig(version, "svc")
 	g.Expect(err).To(Not(HaveOccurred()))
 	g.Expect(cfg).To(Equal(expCfg))
 
+	// unset image tag and use provided version
+	g.Expect(os.Setenv("IMAGE_NAME", "my-pod-image")).To(Succeed())
+	expCfg.Version = version
+	expCfg.Image = "my-pod-image"
+	cfg, err = createGatewayPodConfig(version, "svc")
+	g.Expect(err).To(Not(HaveOccurred()))
+	g.Expect(cfg).To(Equal(expCfg))
+
 	// unset image name
 	g.Expect(os.Unsetenv("IMAGE_NAME")).To(Succeed())
 	cfg, err = createGatewayPodConfig(version, "svc")

internal/mode/static/provisioner/objects.go

@@ -456,8 +456,6 @@ func (p *NginxProvisioner) buildNginxPodTemplateSpec(
 
 func (p *NginxProvisioner) buildImage(nProxyCfg *graph.EffectiveNginxProxy) (string, corev1.PullPolicy) {
 	image := defaultNginxImagePath
-	// TODO(sberman): maybe default image tag should just be the tag on the control plane image,
-	// instead of version
 	tag := p.cfg.GatewayPodConfig.Version
 	pullPolicy := defaultImagePullPolicy