Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-08-12 16:55:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

bootstrapper: remove unnecessary stat (#3202)

Browse source
This commit is contained in:
Moritz Sanft 2024-06-25 11:51:23 +02:00 • committed by GitHub
parent dcb8cca268
commit 50dcfd7905
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

26
bootstrapper/internal/kubernetes/k8sapi/k8sutil.go
View file

@ -137,14 +137,11 @@ func (k *KubernetesUtil) InitCluster(
} }
// Create static pods directory for all nodes (the Kubelets on the worker nodes also expect the path to exist) // Create static pods directory for all nodes (the Kubelets on the worker nodes also expect the path to exist)
if _, err := os.Stat("/etc/kubernetes/manifests"); err == nil { // If the node rebooted after the static pod directory was created,
// If the node rebooted after the static pod directory was created, // the existing directory needs to be removed before we can
// the existing directory needs to be removed before we can // try to init the cluster again.
// try to init the cluster again. if err := os.RemoveAll("/etc/kubernetes/manifests"); err != nil {
log.Info("Removing existing static Pod directory /etc/kubernetes/manifests") return nil, fmt.Errorf("removing static pods directory: %w", err)
if err := os.RemoveAll("/etc/kubernetes/manifests"); err != nil {
return nil, fmt.Errorf("removing static pods directory: %w", err)
}
} }
log.Info("Creating static Pod directory /etc/kubernetes/manifests") log.Info("Creating static Pod directory /etc/kubernetes/manifests")
if err := os.MkdirAll("/etc/kubernetes/manifests", os.ModePerm); err != nil { if err := os.MkdirAll("/etc/kubernetes/manifests", os.ModePerm); err != nil {
@ -209,14 +206,11 @@ func (k *KubernetesUtil) JoinCluster(ctx context.Context, joinConfig []byte, log
} }
// Create static pods directory for all nodes (the Kubelets on the worker nodes also expect the path to exist) // Create static pods directory for all nodes (the Kubelets on the worker nodes also expect the path to exist)
if _, err := os.Stat("/etc/kubernetes/manifests"); err == nil { // If the node rebooted after the static pod directory was created, for example
// If the node rebooted after the static pod directory was created, for example // if a failure during an upgrade occurred, the existing directory needs to be
// if a failure during an upgrade occurred, the existing directory needs to be // removed before we can try to join the cluster again.
// removed before we can try to join the cluster again. if err := os.RemoveAll("/etc/kubernetes/manifests"); err != nil {
log.Info("Removing existing static Pod directory /etc/kubernetes/manifests") return fmt.Errorf("removing static pods directory: %w", err)
if err := os.RemoveAll("/etc/kubernetes/manifests"); err != nil {
return fmt.Errorf("removing static pods directory: %w", err)
}
} }
log.Info("Creating static Pod directory /etc/kubernetes/manifests") log.Info("Creating static Pod directory /etc/kubernetes/manifests")
if err := os.MkdirAll("/etc/kubernetes/manifests", os.ModePerm); err != nil { if err := os.MkdirAll("/etc/kubernetes/manifests", os.ModePerm); err != nil {