Skip to content

Commit

Permalink
ARTESCA-10079 test - this commit will be revert
Browse files Browse the repository at this point in the history
  • Loading branch information
aprucolimartins committed Nov 10, 2023
1 parent 606eb97 commit 714bb14
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion salt/_pillar/metalk8s_nodes.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def node_info(node, ca_minion, pillar):
# The `is_bootstrap` flag is set in pillar only when run the
# `metalk8s.orchestrate.bootstrap` state.
if pillar.get("is_bootstrap", False):
log.debug(
log.info(
"Workaround: Adding bootstrap roles to pillar for node %s",
node["metadata"]["name"],
)
Expand Down
7 changes: 7 additions & 0 deletions salt/metalk8s/orchestrate/bootstrap/init.sls
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ Get metalk8s:control_plane_ip grain:
}
%}

{%- for i in range(2) %}

Sync all custom types:
salt.runner:
- name: saltutil.sync_all
Expand Down Expand Up @@ -109,6 +111,8 @@ Bring bootstrap minion to highstate:
- salt: Sync bootstrap minion
- salt: Deploy CA role on bootstrap minion

{%- if i > 0 %}

Wait for API server to be available:
http.wait_for_successful_query:
- name: https://127.0.0.1:7443/healthz
Expand Down Expand Up @@ -199,3 +203,6 @@ Reconfigure control plane Ingress:
- saltenv: {{ saltenv }}
- require:
- salt: Deploy Kubernetes objects

{%- endif %}
{%- endfor %}

0 comments on commit 714bb14

Please sign in to comment.