Skip to content

Commit

Permalink
example: remove UI image from Solution manifest
Browse files Browse the repository at this point in the history
Stop generating the ui_image section in the manifest
since the Solution framework no longer handle the
Solution UI deployment.

Refs: #2581
  • Loading branch information
alexandre-allard committed Jun 11, 2020
1 parent 61a08f9 commit 29eecb6
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 14 deletions.
1 change: 0 additions & 1 deletion examples/metalk8s-solution-example/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,6 @@ $(ISO_ROOT)/manifest.yaml: $(PWD)/manifest.py $(PWD)/VERSION FORCE
--annotation "solutions.metalk8s.scality.com/git-revision" "$(GIT_REVISION)" \
--extra-image "base-server" "$(VERSION_FULL)" \
--operator-image "$(OPERATOR_IMG_NAME)" "$(VERSION_FULL)" \
--ui-image "$(UI_IMG_NAME)" "$(VERSION_FULL)" \
--version "$(VERSION_FULL)" \
> $@ || (rm -f $@; false)

Expand Down
14 changes: 1 addition & 13 deletions examples/metalk8s-solution-example/manifest.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,6 @@ def parse_arguments():
help="set the Operator image name and tag in the manifest spec",
)

parser.add_argument(
'-u',
'--ui-image',
required=True,
nargs=2,
metavar=('NAME', 'TAG'),
help="set the UI image name and tag in the manifest spec",
)

parser.add_argument(
'-v',
'--version',
Expand All @@ -93,15 +84,12 @@ def build_manifest(args):
'spec': {
'images': list(set(
':'.join(image) for image in (
args.extra_images + [args.ui_image, args.operator_image]
args.extra_images + [args.operator_image]
)
)),
'operator': {
'image': dict(zip(('name', 'tag'), args.operator_image)),
},
'ui': {
'image': dict(zip(('name', 'tag'), args.ui_image)),
},
'version': args.version,
},
}
Expand Down

0 comments on commit 29eecb6

Please sign in to comment.