Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions internal/controller/provisioner/objects.go
Original file line number Diff line number Diff line change
Expand Up @@ -1113,6 +1113,9 @@ func (p *NginxProvisioner) buildNginxPodTemplateSpec(

func (p *NginxProvisioner) buildImage(nProxyCfg *graph.EffectiveNginxProxy) (string, corev1.PullPolicy) {
image := defaultNginxImagePath
if p.cfg.Plus {
image = defaultNginxPlusImagePath
}
tag := p.cfg.GatewayPodConfig.Version
pullPolicy := defaultImagePullPolicy

Expand Down
2 changes: 2 additions & 0 deletions internal/controller/provisioner/objects_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,7 @@ func TestBuildNginxResourceObjects_Plus(t *testing.T) {
cfg: Config{
GatewayPodConfig: &config.GatewayPodConfig{
Namespace: ngfNamespace,
Version: "1.0.0",
},
Plus: true,
PlusUsageConfig: &config.UsageReportConfig{
Expand Down Expand Up @@ -611,6 +612,7 @@ func TestBuildNginxResourceObjects_Plus(t *testing.T) {
Name: "nginx-plus-usage-certs",
MountPath: "/etc/nginx/certs-bootstrap/",
}))
g.Expect(container.Image).To(Equal(fmt.Sprintf("%s:1.0.0", defaultNginxPlusImagePath)))
}

func TestBuildNginxResourceObjects_DockerSecrets(t *testing.T) {
Expand Down
Loading