Skip to content

Commit fc96b5d

Browse files
abaysabays
committed
[imagePullPolicy] Switch imagePullPolicy from Always to IfNotPresent
Use IfNotPresent instead of PullAlways for container image pull policy to avoid unnecessary image pulls when the image already exists locally. Updates source code and kuttl test assertions. Jira: https://redhat.atlassian.net/browse/OSPRH-28872
1 parent 2e0be68 commit fc96b5d

15 files changed

Lines changed: 45 additions & 45 deletions

File tree

‎internal/dataplane/util/ansibleee.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ func (a *EEJob) JobForOpenStackAnsibleEE(h *helper.Helper) (*batchv1.Job, error)
102102
podSpec := corev1.PodSpec{
103103
RestartPolicy: corev1.RestartPolicyNever,
104104
Containers: []corev1.Container{{
105-
ImagePullPolicy: corev1.PullAlways,
105+
ImagePullPolicy: corev1.PullIfNotPresent,
106106
Image: a.Image,
107107
Name: a.Name,
108108
Args: args,

‎test/kuttl/tests/dataplane-deploy-global-service-test/01-assert.yaml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ spec:
135135
edpm_service_type: custom-global-service
136136
137137
138-
imagePullPolicy: Always
138+
imagePullPolicy: IfNotPresent
139139
name: custom-global-service-edpm-compute-global
140140
resources: {}
141141
terminationMessagePath: /dev/termination-log
@@ -237,7 +237,7 @@ spec:
237237
edpm_service_type: download-cache
238238
239239
240-
imagePullPolicy: Always
240+
imagePullPolicy: IfNotPresent
241241
name: download-cache-edpm-compute-global-edpm-compute-global
242242
resources: {}
243243
terminationMessagePath: /dev/termination-log
@@ -335,7 +335,7 @@ spec:
335335
edpm_service_type: bootstrap
336336
337337
338-
imagePullPolicy: Always
338+
imagePullPolicy: IfNotPresent
339339
name: bootstrap-edpm-compute-global-edpm-compute-global
340340
resources: {}
341341
terminationMessagePath: /dev/termination-log
@@ -439,7 +439,7 @@ spec:
439439
edpm_service_type: configure-network
440440
441441
442-
imagePullPolicy: Always
442+
imagePullPolicy: IfNotPresent
443443
name: configure-network-edpm-compute-global-edpm-compute-global
444444
resources: {}
445445
terminationMessagePath: /dev/termination-log
@@ -537,7 +537,7 @@ spec:
537537
edpm_service_type: validate-network
538538
539539
540-
imagePullPolicy: Always
540+
imagePullPolicy: IfNotPresent
541541
name: validate-network-edpm-compute-global-edpm-compute-global
542542
resources: {}
543543
terminationMessagePath: /dev/termination-log
@@ -635,7 +635,7 @@ spec:
635635
edpm_service_type: configure-os
636636
637637
638-
imagePullPolicy: Always
638+
imagePullPolicy: IfNotPresent
639639
name: configure-os-edpm-compute-global-edpm-compute-global
640640
resources: {}
641641
terminationMessagePath: /dev/termination-log
@@ -733,7 +733,7 @@ spec:
733733
edpm_service_type: install-certs
734734
735735
736-
imagePullPolicy: Always
736+
imagePullPolicy: IfNotPresent
737737
name: install-certs-edpm-compute-global-edpm-compute-global
738738
resources: {}
739739
terminationMessagePath: /dev/termination-log
@@ -880,7 +880,7 @@ spec:
880880
edpm_service_type: ovn
881881
882882
883-
imagePullPolicy: Always
883+
imagePullPolicy: IfNotPresent
884884
name: ovn-edpm-compute-global-edpm-compute-global
885885
resources: {}
886886
terminationMessagePath: /dev/termination-log
@@ -989,7 +989,7 @@ spec:
989989
edpm_service_type: neutron-metadata
990990
991991
992-
imagePullPolicy: Always
992+
imagePullPolicy: IfNotPresent
993993
name: neutron-metadata-edpm-compute-global-edpm-compute-global
994994
resources: {}
995995
terminationMessagePath: /dev/termination-log
@@ -1128,7 +1128,7 @@ spec:
11281128
edpm_service_type: neutron-ovn
11291129
11301130
1131-
imagePullPolicy: Always
1131+
imagePullPolicy: IfNotPresent
11321132
name: neutron-ovn-edpm-compute-global-edpm-compute-global
11331133
resources: {}
11341134
terminationMessagePath: /dev/termination-log
@@ -1267,7 +1267,7 @@ spec:
12671267
edpm_service_type: neutron-sriov
12681268
12691269
1270-
imagePullPolicy: Always
1270+
imagePullPolicy: IfNotPresent
12711271
name: neutron-sriov-edpm-compute-global-edpm-compute-global
12721272
resources: {}
12731273
terminationMessagePath: /dev/termination-log
@@ -1376,7 +1376,7 @@ spec:
13761376
edpm_service_type: neutron-dhcp
13771377
13781378
1379-
imagePullPolicy: Always
1379+
imagePullPolicy: IfNotPresent
13801380
name: neutron-dhcp-edpm-compute-global-edpm-compute-global
13811381
resources: {}
13821382
terminationMessagePath: /dev/termination-log
@@ -1485,7 +1485,7 @@ spec:
14851485
edpm_service_type: libvirt
14861486
14871487
1488-
imagePullPolicy: Always
1488+
imagePullPolicy: IfNotPresent
14891489
name: libvirt-edpm-compute-global-edpm-compute-global
14901490
resources: {}
14911491
terminationMessagePath: /dev/termination-log
@@ -1594,7 +1594,7 @@ spec:
15941594
edpm_service_type: nova
15951595
15961596
1597-
imagePullPolicy: Always
1597+
imagePullPolicy: IfNotPresent
15981598
name: nova-edpm-compute-global-edpm-compute-global
15991599
resources: {}
16001600
terminationMessagePath: /dev/termination-log

‎test/kuttl/tests/dataplane-deploy-global-service-test/02-assert.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ spec:
130130
edpm_service_type: download-cache
131131
132132
133-
imagePullPolicy: Always
133+
imagePullPolicy: IfNotPresent
134134
name: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset
135135
resources: {}
136136
terminationMessagePath: /dev/termination-log
@@ -227,7 +227,7 @@ spec:
227227
edpm_service_type: bootstrap
228228
229229
230-
imagePullPolicy: Always
230+
imagePullPolicy: IfNotPresent
231231
name: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset
232232
resources: {}
233233
terminationMessagePath: /dev/termination-log

‎test/kuttl/tests/dataplane-deploy-multiple-secrets/02-assert.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ spec:
167167
edpm_service_type: install-certs-ovr
168168
169169
170-
imagePullPolicy: Always
170+
imagePullPolicy: IfNotPresent
171171
name: install-certs-ovr-openstack-edpm-tls-openstack-edpm-tls
172172
resources: {}
173173
terminationMessagePath: /dev/termination-log
@@ -292,7 +292,7 @@ spec:
292292
edpm_service_type: generic-service1
293293
294294
295-
imagePullPolicy: Always
295+
imagePullPolicy: IfNotPresent
296296
name: generic-service1-openstack-edpm-tls-openstack-edpm-tls
297297
resources: {}
298298
terminationMessagePath: /dev/termination-log

‎test/kuttl/tests/dataplane-deploy-no-nodes-test/01-assert.yaml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ spec:
126126
foo: bar
127127
128128
129-
imagePullPolicy: Always
129+
imagePullPolicy: IfNotPresent
130130
name: download-cache-edpm-compute-no-nodes-edpm-compute-no-nodes
131131
resources: {}
132132
terminationMessagePath: /dev/termination-log
@@ -225,7 +225,7 @@ spec:
225225
foo: bar
226226
227227
228-
imagePullPolicy: Always
228+
imagePullPolicy: IfNotPresent
229229
name: bootstrap-edpm-compute-no-nodes-edpm-compute-no-nodes
230230
resources: {}
231231
terminationMessagePath: /dev/termination-log
@@ -331,7 +331,7 @@ spec:
331331
foo: bar
332332
333333
334-
imagePullPolicy: Always
334+
imagePullPolicy: IfNotPresent
335335
name: configure-network-edpm-compute-no-nodes-edpm-compute-no-nodes
336336
resources: {}
337337
terminationMessagePath: /dev/termination-log
@@ -431,7 +431,7 @@ spec:
431431
foo: bar
432432
433433
434-
imagePullPolicy: Always
434+
imagePullPolicy: IfNotPresent
435435
name: validate-network-edpm-compute-no-nodes-edpm-compute-no-nodes
436436
resources: {}
437437
terminationMessagePath: /dev/termination-log
@@ -531,7 +531,7 @@ spec:
531531
foo: bar
532532
533533
534-
imagePullPolicy: Always
534+
imagePullPolicy: IfNotPresent
535535
name: configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes
536536
resources: {}
537537
terminationMessagePath: /dev/termination-log
@@ -631,7 +631,7 @@ spec:
631631
foo: bar
632632
633633
634-
imagePullPolicy: Always
634+
imagePullPolicy: IfNotPresent
635635
name: install-certs-edpm-compute-no-nodes-edpm-compute-no-nodes
636636
resources: {}
637637
terminationMessagePath: /dev/termination-log
@@ -773,7 +773,7 @@ spec:
773773
foo: bar
774774
775775
776-
imagePullPolicy: Always
776+
imagePullPolicy: IfNotPresent
777777
name: ovn-edpm-compute-no-nodes-edpm-compute-no-nodes
778778
resources: {}
779779
terminationMessagePath: /dev/termination-log
@@ -883,7 +883,7 @@ spec:
883883
foo: bar
884884
885885
886-
imagePullPolicy: Always
886+
imagePullPolicy: IfNotPresent
887887
name: neutron-metadata-edpm-compute-no-nodes-edpm-compute-no-nodes
888888
resources: {}
889889
terminationMessagePath: /dev/termination-log
@@ -1023,7 +1023,7 @@ spec:
10231023
foo: bar
10241024
10251025
1026-
imagePullPolicy: Always
1026+
imagePullPolicy: IfNotPresent
10271027
name: neutron-ovn-edpm-compute-no-nodes-edpm-compute-no-nodes
10281028
resources: {}
10291029
terminationMessagePath: /dev/termination-log
@@ -1163,7 +1163,7 @@ spec:
11631163
foo: bar
11641164
11651165
1166-
imagePullPolicy: Always
1166+
imagePullPolicy: IfNotPresent
11671167
name: neutron-sriov-edpm-compute-no-nodes-edpm-compute-no-nodes
11681168
resources: {}
11691169
terminationMessagePath: /dev/termination-log
@@ -1273,7 +1273,7 @@ spec:
12731273
foo: bar
12741274
12751275
1276-
imagePullPolicy: Always
1276+
imagePullPolicy: IfNotPresent
12771277
name: neutron-dhcp-edpm-compute-no-nodes-edpm-compute-no-nodes
12781278
resources: {}
12791279
terminationMessagePath: /dev/termination-log
@@ -1383,7 +1383,7 @@ spec:
13831383
foo: bar
13841384
13851385
1386-
imagePullPolicy: Always
1386+
imagePullPolicy: IfNotPresent
13871387
name: libvirt-edpm-compute-no-nodes-edpm-compute-no-nodes
13881388
resources: {}
13891389
terminationMessagePath: /dev/termination-log
@@ -1493,7 +1493,7 @@ spec:
14931493
foo: bar
14941494
14951495
1496-
imagePullPolicy: Always
1496+
imagePullPolicy: IfNotPresent
14971497
name: nova-edpm-compute-no-nodes-edpm-compute-no-nodes
14981498
resources: {}
14991499
terminationMessagePath: /dev/termination-log

‎test/kuttl/tests/dataplane-deploy-no-nodes-test/02-assert.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ spec:
6868
foo: bar
6969
7070
71-
imagePullPolicy: Always
71+
imagePullPolicy: IfNotPresent
7272
name: configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes
7373
resources: {}
7474
terminationMessagePath: /dev/termination-log

‎test/kuttl/tests/dataplane-deploy-no-nodes-test/04-assert.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ spec:
128128
- ovn
129129
130130
131-
imagePullPolicy: Always
131+
imagePullPolicy: IfNotPresent
132132
name: ovn-edpm-compute-no-nodes-updated-ovn-cm-edpm-compute-no-nodes
133133
resources: {}
134134
terminationMessagePath: /dev/termination-log

‎test/kuttl/tests/dataplane-deploy-no-nodes-test/06-assert.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ spec:
129129
foo: bar
130130
131131
132-
imagePullPolicy: Always
132+
imagePullPolicy: IfNotPresent
133133
name: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset
134134
resources: {}
135135
terminationMessagePath: /dev/termination-log
@@ -236,7 +236,7 @@ spec:
236236
foo: bar
237237
238238
239-
imagePullPolicy: Always
239+
imagePullPolicy: IfNotPresent
240240
name: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset
241241
resources: {}
242242
terminationMessagePath: /dev/termination-log

‎test/kuttl/tests/dataplane-deploy-no-nodes-test/07-assert.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ spec:
6262
- configure-os
6363
6464
65-
imagePullPolicy: Always
65+
imagePullPolicy: IfNotPresent
6666
name: configure-os-edpm-compute-node-selection-edpm-compute-no-nodes
6767
resources: {}
6868
terminationMessagePath: /dev/termination-log

‎test/kuttl/tests/dataplane-deploy-tls-test/02-assert.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ spec:
200200
edpm_service_type: install-certs-ovrd
201201
202202
203-
imagePullPolicy: Always
203+
imagePullPolicy: IfNotPresent
204204
name: install-certs-ovrd-openstack-edpm-tls-openstack-edpm-tls
205205
resources: {}
206206
terminationMessagePath: /dev/termination-log
@@ -334,7 +334,7 @@ spec:
334334
edpm_service_type: tls-dnsnames
335335
336336
337-
imagePullPolicy: Always
337+
imagePullPolicy: IfNotPresent
338338
name: tls-dnsnames-openstack-edpm-tls-openstack-edpm-tls
339339
resources: {}
340340
terminationMessagePath: /dev/termination-log

0 commit comments

Comments
 (0)