Custom Image Pull Policy

[edenkoveshi]

Which problem is this PR solving?

• This is a resubmission of this Custom ImagePullPolicy and ImagePullSecrets #1771 after adding my ImagePullPolicy changes on top of the other PR (which has been merged since then, so on top of this repository's main branch)

Short description of the changes

This is quite simple really.

I've added corev1.PullPolicy to the JaegerCommonSpec and then handled it within the util.Merge function
And then I have added the policy from JaegerCommonSpec to the relevant containers being set up.

If any of them is not set, Kubernetes default is taken.

Following any other JaegerCommonSpec properties, those defined under Jaeger.Spec.JaegerCommonSpec are overwritten by the internal ones (Jaeger.Spec.Agent.JaegerCommonSpec,Jaeger.Spec.AllInOne.JaegerCommonSpec, etc.)

Test cases have been added and relevant tests updated. Also tested manually on a minikube environment.

CRD Changes:

• All deployment modes now have imagePullPolicy field, including the Jaeger object itself

[frzifus]

Hi @edenkoveshi, again thanks for your contribution. Your change looks good to me!

could you have a look @rubenvp8510?

We might want to include the changes in the e2e tests too. #1744

[frzifus]

oh @edenkoveshi seems you need to regenerate crd files. (make manifests should solve it)

https://github.com/jaegertracing/jaeger-operator/runs/5360852359?check_suite_focus=true#step:6:167

[edenkoveshi]

Done.

[frzifus]

perfect :)

[frzifus]

@edenkoveshi seems there are a few to many files overwritten 🤦

https://github.com/jaegertracing/jaeger-operator/runs/5366866489?check_suite_focus=true#step:6:177

[edenkoveshi]

Looking on the command that it runs

cd config/manager && /home/runner/work/jaeger-operator/jaeger-operator/bin/kustomize edit set image controller=quay.io/jaegertracing/jaeger-operator:"1.31.0"

Comparing this with the one in the Makefile bundle entry:

cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
	$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle -q --overwrite --manifests --version $(VERSION) $(BUNDLE_METADATA_OPTS)

This sets automatically my user as the image prefix, which is obviously different than the one running in the CI, and a version which is 1.31.0-{commit_id} which is obviously different than 1.31.0

What am I missing?

[frzifus]

What am I missing?

I assume it was:

IMG=quay.io/jaegertracing/jaeger-operator:1.31.0 VERSION=v1.31.0 make ...

[frzifus]

LGTM :)

[codecov]

Codecov Report

Merging #1798 (c87b4a5) into main (7762494) will increase coverage by 0.01%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##             main    #1798      +/-   ##
==========================================
+ Coverage   87.68%   87.70%   +0.01%     
==========================================
  Files         100      100              
  Lines        6009     6018       +9     
==========================================
+ Hits         5269     5278       +9     
  Misses        563      563              
  Partials      177      177              

Impacted Files	Coverage Δ
apis/v1/jaeger_types.go	87.50% <ø> (ø)
pkg/deployment/agent.go	100.00% <100.00%> (ø)
pkg/deployment/all_in_one.go	100.00% <100.00%> (ø)
pkg/deployment/collector.go	100.00% <100.00%> (ø)
pkg/deployment/ingester.go	100.00% <100.00%> (ø)
pkg/deployment/query.go	100.00% <100.00%> (ø)
pkg/util/util.go	94.21% <100.00%> (+0.13%)	⬆️

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7762494...c87b4a5. Read the comment docs.