Merge pull request #274 from briandowns/issue-269

Update Directory Manifest Directory Exists Logic and Network Policy Existence Checks

pkg/bootstrap/stage.go → pkg/bootstrap/bootstrap.go

@@ -11,16 +11,15 @@ import (
 	"regexp"
 	"strings"
 
-	errors2 "github.com/pkg/errors"
-	"github.com/rancher/wrangler/pkg/merr"
-
 	"github.com/google/go-containerregistry/pkg/authn"
 	"github.com/google/go-containerregistry/pkg/name"
 	v1 "github.com/google/go-containerregistry/pkg/v1"
 	"github.com/google/go-containerregistry/pkg/v1/mutate"
 	"github.com/google/go-containerregistry/pkg/v1/remote"
 	"github.com/google/go-containerregistry/pkg/v1/tarball"
+	errors2 "github.com/pkg/errors"
 	"github.com/rancher/rke2/pkg/images"
+	"github.com/rancher/wrangler/pkg/merr"
 	"github.com/sirupsen/logrus"
 )
 
@@ -161,23 +160,29 @@ func extractFromDir(dir, prefix string, img v1.Image, imgName string) error {
 		return err
 	}
 	defer os.RemoveAll(tempDir)
+
 	r := mutate.Extract(img)
 	defer r.Close()
 
 	// extracting manifests
 	if err := extract(imgName, tempDir, prefix, r); err != nil {
 		return err
 	}
-	if err := os.Rename(tempDir, dir); err != nil && err != os.ErrExist {
-		return err
-	} else if err == nil {
+
+	// we're ignoring any returned errors since the likelihood is that
+	// the error is that the new path already exists. That's indicative of a
+	// previously bootstrapped system. If it's a different error, it's indicative
+	// of an operating system or filesystem issue.
+	if err := os.Rename(tempDir, dir); err == nil {
 		return nil
 	}
-	//manifests dir exists:
+
+	// manifests dir exists
 	files, err := ioutil.ReadDir(tempDir)
 	if err != nil {
 		return err
 	}
+
 	var errs []error
 	for _, file := range files {
 		src := filepath.Join(tempDir, file.Name())

pkg/rke2/np.go

@@ -55,16 +55,17 @@ func setNetworkPolicy(ctx context.Context, namespace string, cs *kubernetes.Clie
 		ns.Annotations = make(map[string]string)
 	}
 	if _, ok := ns.Annotations[namespaceAnnotationNetworkPolicy]; !ok {
-		if _, err := cs.NetworkingV1().NetworkPolicies(namespace).Get(ctx, defaultNetworkPolicyName, metav1.GetOptions{}); err != nil {
-			if !apierrors.IsNotFound(err) {
-				return err
+		if _, err := cs.NetworkingV1().NetworkPolicies(namespace).Get(ctx, defaultNetworkPolicyName, metav1.GetOptions{}); err == nil {
+			if err := cs.NetworkingV1().NetworkPolicies(namespace).Delete(ctx, defaultNetworkPolicyName, metav1.DeleteOptions{}); err != nil {
+				if !apierrors.IsNotFound(err) {
+					return err
+				}
 			}
 		}
-		if err := cs.NetworkingV1().NetworkPolicies(namespace).Delete(ctx, defaultNetworkPolicyName, metav1.DeleteOptions{}); err != nil {
-			return err
-		}
 		if _, err := cs.NetworkingV1().NetworkPolicies(namespace).Create(ctx, &networkPolicy, metav1.CreateOptions{}); err != nil {
-			return err
+			if !apierrors.IsAlreadyExists(err) {
+				return err
+			}
 		}
 		ns.Annotations[namespaceAnnotationNetworkPolicy] = cisAnnotationValue
 

scripts/validate

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -ex
 
-if [ -n "${SKIP_VALIDATE}" ]; then
+if [ -n ${SKIP_VALIDATE} ]; then
     echo "skipping validation. continuing..."
     exit 0
 fi