Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert changes (return DOCKER_IMAGE_YDBD_PACKAGE_SPEC as default) #3753

Merged
merged 1 commit into from
Apr 15, 2024
Merged

Revert changes (return DOCKER_IMAGE_YDBD_PACKAGE_SPEC as default) #3753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 5 additions & 22 deletions ydb/tools/ydbd_slice/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,6 @@
'''


KIKIMR_EXECUTABLE = 'kikimr/driver/kikimr'
YDBD_EXECUTABLE = 'ydb/apps/ydbd/ydbd'


Expand Down Expand Up @@ -383,12 +382,9 @@ def arcadia_root(begin_path='.'):
def deduce_kikimr_bin_from_args(args):
if args.kikimr is not None:
path = os.path.abspath(args.kikimr)
elif args.ydbd:
root = arcadia_root()
path = ya_build(root, YDBD_EXECUTABLE, args.build_args, args.dry_run)
elif args.arcadia:
root = arcadia_root()
path = ya_build(root, KIKIMR_EXECUTABLE, args.build_args, args.dry_run)
path = ya_build(root, YDBD_EXECUTABLE, args.build_args, args.dry_run)
else:
sys.exit("unable to deduce kikimr bin")

Expand Down Expand Up @@ -465,11 +461,6 @@ def binaries_args():
metavar="PATH",
help="explicit path to compressed kikimr binary file used for transfer acceleration"
)
args.add_argument(
"--ydbd",
action='store_true',
help="build ydb/apps/ydbd/ydbd binary from arcadia, figure out root by finding .arcadia.root upstairs"
)
args.add_argument(
"--arcadia",
action='store_true',
Expand Down Expand Up @@ -684,10 +675,7 @@ def _run(args):
# docker and kube scenarios
def build_and_push_docker_image(build_args, docker_package, build_ydbd, image, force_rebuild):
if docker_package is None:
if build_ydbd:
docker_package = docker.DOCKER_IMAGE_YDBD_PACKAGE_SPEC
else:
docker_package = docker.DOCKER_IMAGE_KIKIMR_PACKAGE_SPEC
docker_package = docker.DOCKER_IMAGE_YDBD_PACKAGE_SPEC

logger.debug(f'using docker package spec: {docker_package}')

Expand Down Expand Up @@ -715,11 +703,6 @@ def add_arguments_docker_build_with_remainder(mode, add_force_rebuild=False):
help='Force rebuild docker image even if it is already present on host.',
action='store_true',
)
group.add_argument(
"--ydbd",
action='store_true',
help="build docker image with ydb/apps/ydbd/ydbd binary from arcadia, figure out root by finding .arcadia.root upstairs"
)
group.add_argument(
'-d', '--docker-package',
help='Optional: path to docker package description file relative from ARCADIA_ROOT.',
Expand All @@ -746,7 +729,7 @@ def _run(args):
logger.debug("starting docker-build cmd with args '%s'", args)
try:
image = docker.get_image_from_args(args)
build_and_push_docker_image(args.build_args, args.docker_package, args.ydbd, image, force_rebuild=True)
build_and_push_docker_image(args.build_args, args.docker_package, False, image, force_rebuild=True)

logger.info('docker-build finished')
except RuntimeError as e:
Expand Down Expand Up @@ -822,7 +805,7 @@ def _run(args):
try:
image = docker.get_image_from_args(args)
if not args.use_prebuilt_image:
build_and_push_docker_image(args.build_args, args.docker_package, args.ydbd, image, force_rebuild=args.force_rebuild)
build_and_push_docker_image(args.build_args, args.docker_package, False, image, force_rebuild=args.force_rebuild)

manifests = kube_handlers.get_all_manifests(args.path)
kube_handlers.manifests_ydb_set_image(args.path, manifests, image)
Expand Down Expand Up @@ -869,7 +852,7 @@ def _run(args):
try:
image = docker.get_image_from_args(args)
if not args.use_prebuilt_image:
build_and_push_docker_image(args.build_args, args.docker_package, args.ydbd, image, force_rebuild=args.force_rebuild)
build_and_push_docker_image(args.build_args, args.docker_package, False, image, force_rebuild=args.force_rebuild)

manifests = kube_handlers.get_all_manifests(args.path)
manifests = kube_handlers.manifests_ydb_filter_components(args.path, manifests, args.components)
Expand Down
1 change: 0 additions & 1 deletion ydb/tools/ydbd_slice/kube/docker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@


DOCKER_IMAGE_YDBD_PACKAGE_SPEC = 'ydb/tools/ydbd_slice/image/pkg.json'
DOCKER_IMAGE_KIKIMR_PACKAGE_SPEC = None # it is set up on runtime from arcadia source code
DOCKER_IMAGE_REGISTRY = 'cr.yandex'
DOCKER_IMAGE_REPOSITORY = 'crpbo4q9lbgkn85vr1rm'
DOCKER_IMAGE_NAME = 'ydb'
Expand Down
Loading