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

Jump to bottom

drenv: Fix submariner for MacOS #1497

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

drenv: Fix submariner for MacOS #1497

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
1 change: 1 addition & 0 deletions test/addons/submariner/start
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ def join_cluster(cluster, broker_info):
clusterid=cluster,
cable_driver="vxlan",
version=VERSION,
check_broker_certificate=False,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to do this only on macOS? It would be nice to detect real issues with certificates when we can.

)


Expand Down
11 changes: 10 additions & 1 deletion test/drenv/subctl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,20 @@ def deploy_broker(context, globalnet=False, broker_info=None, version=None, log=
shutil.move(BROKER_INFO, broker_info)


def join(broker_info, context, clusterid, cable_driver=None, version=None, log=print):
def join(
broker_info,
context,
clusterid,
cable_driver=None,
version=None,
check_broker_certificate=True,
log=print,
):
"""
Run subctl join ... logging progress messages.
"""
args = ["join", broker_info, "--context", context, "--clusterid", clusterid]
args.append(f"--check-broker-certificate={check_broker_certificate}")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will add:

--check-broker-certificate=True

Which may not work since it should use "true|false".

Since by default subctl checks certs, we can do this:

if not check_broker_certificates:
    args.append("--check-broker-certificate=false")

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I included this change in #1536

f7bb75d

if cable_driver:
args.extend(("--cable-driver", cable_driver))
if version:
Expand Down
Loading