Skip to content

Commit deeab0d

Browse files
author
Wei Tie
committed
Fix contiv-compose image updates
Signed-off-by: Wei Tie <[email protected]>
1 parent b40bdf6 commit deeab0d

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

install/k8s/contiv/contiv-compose

+9-5
Original file line numberDiff line numberDiff line change
@@ -164,13 +164,13 @@ class ContivComposer(object):
164164

165165
def use_release(self, resource, args):
166166
if args.get('version') is not None:
167-
args['netplugin_img'] = 'contiv/netplugin:%s' % args['use_release']
167+
args['netplugin_img'] = 'contiv/netplugin:%s' % args['version']
168168
args['netplugin_init_img'] = 'contiv/netplugin-init:%s' % args[
169-
'use_release']
170-
args['stat_exporter_img'] = 'contiv/stats:%s' % args['use_release']
169+
'version']
170+
args['stat_exporter_img'] = 'contiv/stats:%s' % args['version']
171171
args['auth_proxy_img'] = 'contiv/auth_proxy:%s' % args[
172-
'use_release']
173-
args['ovs_img'] = 'contiv/ovs:%s' % args['use_release']
172+
'version']
173+
args['ovs_img'] = 'contiv/ovs:%s' % args['version']
174174

175175
def compose(self, args):
176176
if args['target'] not in ('add-systest', 'add-prometheus',
@@ -213,6 +213,10 @@ class ContivComposer(object):
213213
args['netplugin_img'])
214214
self._update_container_image(resource, 'contiv-netmaster',
215215
args['netplugin_img'])
216+
self._update_container_image(resource, 'contiv-netctl',
217+
args['netplugin_img'])
218+
self._update_container_image(resource, 'contiv-cni',
219+
args['netplugin_img'])
216220
if args.get('netplugin_init_img') is not None:
217221
self._update_container_image(resource, 'contiv-netplugin-init',
218222
args['netplugin_init_img'])

0 commit comments

Comments
 (0)