Skip to content

Commit

Permalink
templates: Bind units to kubelet-dependencies.target
Browse files Browse the repository at this point in the history
This is aiming to fix
https://issues.redhat.com/browse/OCPBUGS-15087

The previous change introduced the target; now we wire up two
critical services to target it.
  • Loading branch information
cgwalters committed Sep 26, 2023
1 parent 9390c1d commit 1ca451f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
6 changes: 2 additions & 4 deletions templates/common/_base/units/node-valid-hostname.service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ enabled: true
contents: |
[Unit]
Description=Wait for a non-localhost hostname
Before=network-online.target
Before=kubelet-dependencies.target
[Service]
Type=oneshot
Expand All @@ -15,7 +15,5 @@ contents: |
TimeoutSec=300
[Install]
WantedBy=multi-user.target
# Ensure that network-online.target will not complete until the node has a non-localhost hostname.
RequiredBy=network-online.target
RequiredBy=kubelet-dependencies.target
4 changes: 2 additions & 2 deletions templates/common/_base/units/ovs-configuration.service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ contents: |
Requires=openvswitch.service
Wants=NetworkManager-wait-online.service
After=NetworkManager-wait-online.service openvswitch.service network.service nodeip-configuration.service
Before=network-online.target kubelet.service crio.service node-valid-hostname.service
Before=kubelet-dependencies.target node-valid-hostname.service
[Service]
# Need oneshot to delay kubelet
Expand All @@ -19,4 +19,4 @@ contents: |
StandardError=journal+console
[Install]
WantedBy=network-online.target
RequiredBy=kubelet-dependencies.target

0 comments on commit 1ca451f

Please sign in to comment.