Skip to content
This repository has been archived by the owner on Feb 25, 2024. It is now read-only.

fix: create_repository should returns repository_url instead of registry info #129

Merged
merged 2 commits into from
Apr 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 10 additions & 7 deletions bentoctl/cli/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import click

from bentoctl import __version__
from bentoctl.terraform import terraform_apply, terraform_destroy, is_terraform_applied
from bentoctl.cli.interactive import deployment_config_builder
from bentoctl.cli.operator_management import get_operator_management_subcommands
from bentoctl.cli.utils import BentoctlCommandGroup, handle_bentoctl_exceptions
Expand All @@ -18,6 +17,7 @@
push_docker_image_to_repository,
tag_docker_image,
)
from bentoctl.terraform import is_terraform_applied, terraform_apply, terraform_destroy
from bentoctl.utils import TempDirectory, get_debug_mode

CONTEXT_SETTINGS = dict(help_option_names=["-h", "--help"])
Expand Down Expand Up @@ -152,17 +152,20 @@ def build(
)
if not dry_run:
(
registry_url,
registry_username,
registry_password,
repository_url,
username,
password,
) = deployment_config.create_repository()

console.print(f"Created the repository {deployment_config.repository_name}")
repository_image_tag = deployment_config.generate_docker_image_tag(registry_url)
repository_image_tag = deployment_config.generate_docker_image_tag(
repository_url
)
tag_docker_image(local_docker_tag, repository_image_tag)
push_docker_image_to_repository(
repository=repository_image_tag,
username=registry_username,
password=registry_password,
username=username,
password=password,
)
generated_files = deployment_config.generate(values_only=True)
print_generated_files_list(generated_files)
Expand Down
11 changes: 4 additions & 7 deletions bentoctl/deployment_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -213,20 +213,17 @@ def create_deployable(self, destination_dir=os.curdir):
return dockerfile_path, docker_context_path, build_args

def create_repository(self):
(registry_url, username, password,) = self.operator.create_repository(
(repository_url, username, password,) = self.operator.create_repository(
repository_name=self.repository_name,
operator_spec=self.operator_spec,
)
return registry_url, username, password
return repository_url, username, password

def delete_repository(self):
return self.operator.delete_repository(self.repository_name, self.operator_spec)

def generate_docker_image_tag(self, registry_url: str) -> str:
image_tag = (
f"{registry_url.replace('https://', '')}/"
f"{self.repository_name}:{self.bento.tag.version}"
)
def generate_docker_image_tag(self, repository_url: str) -> str:
image_tag = f"{repository_url.replace('https://', '')}:{self.bento.tag.version}"
self.operator_spec["image_tag"] = image_tag
return image_tag

Expand Down