Change it into a command
This commit is contained in:
parent
d2654ba21f
commit
86c962e0cf
@ -1 +0,0 @@
|
|||||||
PyYAML>=6.0.1
|
|
@ -22,6 +22,7 @@ from stack_orchestrator.deploy.deploy import up_operation, down_operation, ps_op
|
|||||||
from stack_orchestrator.deploy.deploy import exec_operation, logs_operation, create_deploy_context
|
from stack_orchestrator.deploy.deploy import exec_operation, logs_operation, create_deploy_context
|
||||||
from stack_orchestrator.deploy.deploy_types import DeployCommandContext
|
from stack_orchestrator.deploy.deploy_types import DeployCommandContext
|
||||||
from stack_orchestrator.deploy.deployment_context import DeploymentContext
|
from stack_orchestrator.deploy.deployment_context import DeploymentContext
|
||||||
|
from stack_orchestrator.deploy.webapp import update_from_registry as webapp_update
|
||||||
|
|
||||||
|
|
||||||
@click.group()
|
@click.group()
|
||||||
@ -148,3 +149,15 @@ def logs(ctx, tail, follow, extra_args):
|
|||||||
@click.pass_context
|
@click.pass_context
|
||||||
def status(ctx):
|
def status(ctx):
|
||||||
print(f"Context: {ctx.parent.obj}")
|
print(f"Context: {ctx.parent.obj}")
|
||||||
|
|
||||||
|
|
||||||
|
@command.command()
|
||||||
|
@click.option("--laconic-config", help="laconic-cli config file", required=True)
|
||||||
|
# TODO: Add to spec.yml?
|
||||||
|
@click.option("--app-crn", help="application CRN", required=True)
|
||||||
|
@click.option("--deployment-crn", help="webapp deployment CRN", required=True)
|
||||||
|
@click.option("--force", help="force redeployment", is_flag=True, default=False)
|
||||||
|
@click.pass_context
|
||||||
|
def update_from_registry(ctx, laconic_config, app_crn, deployment_crn, force):
|
||||||
|
ctx.obj = make_deploy_context(ctx)
|
||||||
|
webapp_update.update(ctx, str(ctx.obj.stack.parent), laconic_config, app_crn, deployment_crn, force)
|
||||||
|
@ -1,6 +1,18 @@
|
|||||||
#!/usr/bin/env python3
|
# Copyright © 2023 Vulcanize
|
||||||
|
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU Affero General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU Affero General Public License for more details.
|
||||||
|
|
||||||
|
# You should have received a copy of the GNU Affero General Public License
|
||||||
|
# along with this program. If not, see <http:#www.gnu.org/licenses/>.
|
||||||
|
|
||||||
import argparse
|
|
||||||
import hashlib
|
import hashlib
|
||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
@ -61,7 +73,7 @@ def config_changed(deploy_record, deployment_dir):
|
|||||||
return config_hash(deployment_dir) != old
|
return config_hash(deployment_dir) != old
|
||||||
|
|
||||||
|
|
||||||
def redeploy(app_record, deploy_record, deploy_crn, deployment_dir):
|
def redeploy(laconic_config, app_record, deploy_record, deploy_crn, deployment_dir):
|
||||||
print("Stopping deployment ...")
|
print("Stopping deployment ...")
|
||||||
result = subprocess.run(["laconic-so", "deployment", "--dir", deployment_dir, "stop"])
|
result = subprocess.run(["laconic-so", "deployment", "--dir", deployment_dir, "stop"])
|
||||||
result.check_returncode()
|
result.check_returncode()
|
||||||
@ -101,55 +113,52 @@ def redeploy(app_record, deploy_record, deploy_crn, deployment_dir):
|
|||||||
|
|
||||||
print("Updating deployment record ...")
|
print("Updating deployment record ...")
|
||||||
new_record_id = json.loads(
|
new_record_id = json.loads(
|
||||||
cmd("laconic", "-c", args.laconic_config, "cns", "record", "publish", "--filename", record_fname)
|
cmd("laconic", "-c", laconic_config, "cns", "record", "publish", "--filename", record_fname)
|
||||||
)["id"]
|
)["id"]
|
||||||
print("Updating deployment registered name ...")
|
print("Updating deployment registered name ...")
|
||||||
cmd("laconic", "-c", args.laconic_config, "cns", "name", "set", deploy_crn, new_record_id)
|
cmd("laconic", "-c", laconic_config, "cns", "name", "set", deploy_crn, new_record_id)
|
||||||
finally:
|
finally:
|
||||||
cmd("rm", "-rf", tmpdir)
|
cmd("rm", "-rf", tmpdir)
|
||||||
|
|
||||||
|
|
||||||
parser = argparse.ArgumentParser()
|
def update(ctx, deployment_dir, laconic_config, app_crn, deploy_crn, force=False):
|
||||||
parser.add_argument("--laconic-config", required=True)
|
'''update the specified webapp deployment'''
|
||||||
parser.add_argument("--app-crn", required=True)
|
|
||||||
parser.add_argument("--deploy-crn", required=True)
|
|
||||||
parser.add_argument("--deployment-dir", required=True)
|
|
||||||
parser.add_argument("--force", action="store_true")
|
|
||||||
args = parser.parse_args()
|
|
||||||
|
|
||||||
# The deployment must already exist
|
# The deployment must already exist
|
||||||
if not os.path.exists(args.deployment_dir):
|
if not os.path.exists(deployment_dir):
|
||||||
print("Deployment does not exist:", args.deployment_dir, file=sys.stderr)
|
print("Deployment does not exist:", deployment_dir, file=sys.stderr)
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
# resolve name
|
# resolve name
|
||||||
app_record = json.loads(cmd("laconic", "-c", args.laconic_config, "cns", "name", "resolve", args.app_crn))[0]
|
app_record = json.loads(cmd("laconic", "-c", laconic_config, "cns", "name", "resolve", app_crn))[0]
|
||||||
|
|
||||||
# compare
|
# compare
|
||||||
try:
|
try:
|
||||||
deploy_record = json.loads(cmd("laconic", "-c", args.laconic_config, "cns", "name", "resolve", args.deploy_crn))[0]
|
deploy_record = json.loads(cmd("laconic", "-c", laconic_config, "cns", "name", "resolve", deploy_crn))[0]
|
||||||
except: # noqa: E722
|
except: # noqa: E722
|
||||||
deploy_record = {}
|
deploy_record = {}
|
||||||
|
|
||||||
needs_update = False
|
needs_update = False
|
||||||
|
|
||||||
if app_record["id"] == deploy_record.get("attributes", {}).get("application"):
|
if app_record["id"] == deploy_record.get("attributes", {}).get("application"):
|
||||||
print("Deployment %s already has latest application: %s" % (args.deploy_crn, app_record["id"]))
|
print("Deployment %s has latest application: %s" % (deploy_crn, app_record["id"]))
|
||||||
else:
|
else:
|
||||||
print("Found updated application record eligible for deployment %s (old: %s, new: %s)" % (
|
print("Found updated application record eligible for deployment %s (old: %s, new: %s)" % (
|
||||||
args.deploy_crn, deploy_record.get("id"), app_record["id"]))
|
deploy_crn, deploy_record.get("id"), app_record["id"]))
|
||||||
build_image(app_record, args.deployment_dir)
|
build_image(app_record, deployment_dir)
|
||||||
needs_update = True
|
needs_update = True
|
||||||
|
|
||||||
# check config
|
# check config
|
||||||
if config_changed(deploy_record, args.deployment_dir):
|
if config_changed(deploy_record, deployment_dir):
|
||||||
old = json.loads(deploy_record["attributes"]["meta"])["config"]
|
old = None
|
||||||
print("Deployment %s has updated config: (old: %s, new: %s)" % (
|
if deploy_record:
|
||||||
args.deploy_crn, old, config_hash(args.deployment_dir)))
|
old = json.loads(deploy_record["attributes"]["meta"]["config"])
|
||||||
needs_update = True
|
print("Deployment %s has changed config: (old: %s, new: %s)" % (
|
||||||
else:
|
deploy_crn, old, config_hash(deployment_dir)))
|
||||||
print("Deployment %s already has latest config: %s" % (
|
needs_update = True
|
||||||
args.deploy_crn, json.loads(deploy_record["attributes"]["meta"])["config"]))
|
else:
|
||||||
|
print("Deployment %s has latest config: %s" % (
|
||||||
|
deploy_crn, json.loads(deploy_record["attributes"]["meta"])["config"]))
|
||||||
|
|
||||||
if needs_update or args.force:
|
if needs_update or force:
|
||||||
redeploy(app_record, deploy_record, args.deploy_crn, args.deployment_dir)
|
redeploy(laconic_config, app_record, deploy_record, deploy_crn, deployment_dir)
|
Loading…
Reference in New Issue
Block a user