From deeab0dec55c08c247551bc37af3ef6444cc28b3 Mon Sep 17 00:00:00 2001 From: Wei Tie Date: Thu, 18 Jan 2018 19:25:44 -0800 Subject: [PATCH 1/3] Fix contiv-compose image updates Signed-off-by: Wei Tie --- install/k8s/contiv/contiv-compose | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/install/k8s/contiv/contiv-compose b/install/k8s/contiv/contiv-compose index ff4ec9eee..3179841b3 100755 --- a/install/k8s/contiv/contiv-compose +++ b/install/k8s/contiv/contiv-compose @@ -164,13 +164,13 @@ class ContivComposer(object): def use_release(self, resource, args): if args.get('version') is not None: - args['netplugin_img'] = 'contiv/netplugin:%s' % args['use_release'] + args['netplugin_img'] = 'contiv/netplugin:%s' % args['version'] args['netplugin_init_img'] = 'contiv/netplugin-init:%s' % args[ - 'use_release'] - args['stat_exporter_img'] = 'contiv/stats:%s' % args['use_release'] + 'version'] + args['stat_exporter_img'] = 'contiv/stats:%s' % args['version'] args['auth_proxy_img'] = 'contiv/auth_proxy:%s' % args[ - 'use_release'] - args['ovs_img'] = 'contiv/ovs:%s' % args['use_release'] + 'version'] + args['ovs_img'] = 'contiv/ovs:%s' % args['version'] def compose(self, args): if args['target'] not in ('add-systest', 'add-prometheus', @@ -213,6 +213,10 @@ class ContivComposer(object): args['netplugin_img']) self._update_container_image(resource, 'contiv-netmaster', args['netplugin_img']) + self._update_container_image(resource, 'contiv-netctl', + args['netplugin_img']) + self._update_container_image(resource, 'contiv-cni', + args['netplugin_img']) if args.get('netplugin_init_img') is not None: self._update_container_image(resource, 'contiv-netplugin-init', args['netplugin_init_img']) From 99b3e8c43db2fb46a0a58729700852f8b83069ec Mon Sep 17 00:00:00 2001 From: Wei Tie Date: Thu, 18 Jan 2018 19:39:59 -0800 Subject: [PATCH 2/3] Make release tar only contains contiv k8s yaml and compose Signed-off-by: Wei Tie --- Makefile | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index 98351ca30..3ebbb60a2 100755 --- a/Makefile +++ b/Makefile @@ -384,24 +384,10 @@ archive: -C ../scripts contrib/completion/bash/netctl get-contiv-diags # build versioned archive of netplugin binaries -tar: compile-with-docker binaries-from-container archive - -clean-tar: - @rm -f $(TAR_LOC)/*.$(TAR_EXT) - @rm -f install/v2plugin/v2plugin-*.tar.gz - -# do not run directly, use "release" target -release-built-version: tar - TAR_FILENAME=$(TAR_FILENAME) TAR_FILE=$(TAR_FILE) OLD_VERSION=${OLD_VERSION} \ - NIGHTLY_RELEASE=${NIGHTLY_RELEASE} scripts/release.sh - @make clean-tar - -# The first "release" below is not a target, it is a "target-specific variable" -# and sets (and in this case exports) a variable to the target's environment -# The second release runs make as a subshell but with BUILD_VERSION set -# to write the correct version for assets everywhere -# +tar: + rm -f $(TAR_FILE) + $(TAR) -jcf $(TAR_FILE) -C install/k8s/contiv/ . + # GITHUB_USER and GITHUB_TOKEN are needed be set (used by github-release) -release: export BUILD_VERSION=$(shell cat version/CURRENT_VERSION) -release: - @make release-built-version +release: tar + TAR_FILENAME=$(TAR_FILENAME) TAR_FILE=$(TAR_FILE) scripts/release.sh From 0e7433c172a80eb2e9bbf68790b7bbc6f6e207b4 Mon Sep 17 00:00:00 2001 From: Wei Tie Date: Thu, 18 Jan 2018 19:48:51 -0800 Subject: [PATCH 3/3] Update images to release version --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 3ebbb60a2..854c54909 100755 --- a/Makefile +++ b/Makefile @@ -386,6 +386,7 @@ archive: # build versioned archive of netplugin binaries tar: rm -f $(TAR_FILE) + ./install/k8s/contiv/contiv-compose use-release -i -v $(BUILD_VERSION) install/k8s/contiv/contiv-base.yaml $(TAR) -jcf $(TAR_FILE) -C install/k8s/contiv/ . # GITHUB_USER and GITHUB_TOKEN are needed be set (used by github-release)