-
Notifications
You must be signed in to change notification settings - Fork 187
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.
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
AGENT-925: Block port 22624 when adding day 2 worker node #1671
Open
rwsu
wants to merge
1
commit into
openshift-metal3:master
Choose a base branch
from
rwsu:AGENT-925
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -476,6 +476,36 @@ function get_nodes_bmc_info() { | |
|
||
} | ||
|
||
function block_insecure_machine_config_server_port() { | ||
existing_filter=$(sudo virsh nwfilter-list) | ||
if [[ "$existing_filter" == *"block-insecure-machine-config-server"* ]]; then | ||
sudo virsh nwfilter-undefine block-insecure-machine-config-server | ||
fi | ||
tmpfilter=$(mktemp --tmpdir "block-insecure-mcs--XXXXXXXXXX") | ||
_tmpfiles="$_tmpfiles $tmpfilter" | ||
echo "<filter name='block-insecure-machine-config-server' chain='root'> | ||
<uuid>aaaaaaaa-aaaa-aaaa-aaaa-000000000001</uuid> | ||
<rule action='drop' direction='in' priority='500'> | ||
<tcp match='yes' dstportstart='22624' dstportend='22624'/> | ||
</rule> | ||
</filter>" > $tmpfilter | ||
sudo virsh nwfilter-define $tmpfilter | ||
|
||
for (( n=0; n<${2}; n++ )) | ||
do | ||
name=${CLUSTER_NAME}_${1}_${n} | ||
tmpdomain=$(mktemp --tmpdir "${name}--XXXXXXXXXX") | ||
_tmpfiles="$_tmpfiles $tmpdomain" | ||
sudo virsh dumpxml ${name} > ${tmpdomain} | ||
|
||
sed -i '/interface type=\([^>]*\)>/a\ | ||
<filterref filter="block-insecure-machine-config-server"/>\' ${tmpdomain} | ||
|
||
sudo virsh define ${tmpdomain} | ||
done | ||
} | ||
|
||
|
||
write_pull_secret | ||
|
||
# needed for assisted-service to run nmstatectl | ||
|
@@ -519,6 +549,8 @@ if [[ "${AGENT_PLATFORM_TYPE}" == "external" ]] || [[ "${AGENT_PLATFORM_TYPE}" = | |
set_device_mfg worker $NUM_WORKERS ${AGENT_PLATFORM_TYPE} ${AGENT_PLATFORM_NAME} | ||
fi | ||
|
||
block_insecure_machine_config_server_port extraworker $NUM_EXTRA_WORKERS | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. As mentioned before, I was expecting the port to be blocked on the control plane nodes, more than on the hosts to be added |
||
|
||
generate_cluster_manifests | ||
|
||
generate_extra_cluster_manifests |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe I'm oversimplifying it a little bit, but wouldn't be enough to execute a simple ansible playbook like the following (similar to the ones used in metal3-dev-env):
on each control plane (master) node? Given also that this is a specific requirement for the add nodes workflow, it could be probably a task executed only in the new step