KO-473 Add PSP feature gate (#206)

mage/ginkgo/lib.go

@@ -368,6 +368,15 @@ func (ns NsWrapper) HelmInstall(chartPath string) {
 	mageutil.PanicOnError(err)
 }
 
+func (ns NsWrapper) HelmInstallWithPSPEnabled(chartPath string) {
+	var overrides = map[string]string{
+		"image": cfgutil.GetOperatorImage(),
+		"vmwarePSPEnabled": "true",
+	}
+	err := helm_util.Install(chartPath, "cass-operator", ns.Namespace, overrides)
+	mageutil.PanicOnError(err)
+}
+
 // Note that the actual value will be cast to a string before the comparison with the expectedValue
 func (ns NsWrapper) ExpectKeyValue(m map[string]interface{}, key string, expectedValue string) {
 	actualValue, ok := m[key].(string)

operator/pkg/controller/cassandradatacenter/cassandradatacenter_controller.go

@@ -9,6 +9,7 @@ import (
 	api "github.com/datastax/cass-operator/operator/pkg/apis/cassandra/v1beta1"
 
 	"github.com/datastax/cass-operator/operator/pkg/oplabels"
+	"github.com/datastax/cass-operator/operator/pkg/utils"
 
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
@@ -142,14 +143,16 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
 			return requests
 		})
 
-	err = c.Watch(
-		&source.Kind{Type: &corev1.Node{}},
-		&handler.EnqueueRequestsFromMapFunc{
-			ToRequests: mapFn,
-		},
-	)
-	if err != nil {
-		return err
+	if utils.IsPSPEnabled() {
+		err = c.Watch(
+			&source.Kind{Type: &corev1.Node{}},
+			&handler.EnqueueRequestsFromMapFunc{
+				ToRequests: mapFn,
+			},
+		)
+		if err != nil {
+			return err
+		}
 	}
 
 	// Setup watches for Secrets. These secrets are often not owned by or created by

operator/pkg/reconciliation/handler.go

@@ -27,6 +27,7 @@ import (
 	api "github.com/datastax/cass-operator/operator/pkg/apis/cassandra/v1beta1"
 	"github.com/datastax/cass-operator/operator/pkg/dynamicwatch"
 	"github.com/datastax/cass-operator/operator/pkg/httphelper"
+	"github.com/datastax/cass-operator/operator/pkg/utils"
 )
 
 // Use a var so we can mock this function
@@ -124,10 +125,11 @@ func (rc *ReconciliationContext) updateNodeToDcMap() error {
 func (rc *ReconciliationContext) calculateReconciliationActions() (reconcile.Result, error) {
 
 	rc.ReqLogger.Info("handler::calculateReconciliationActions")
-
-	if err := rc.updateNodeToDcMap(); err != nil {
-		// We will not skip reconciliation if the map update failed
-		// return result.Error(err).Output()
+	if utils.IsPSPEnabled() {
+		if err := rc.updateNodeToDcMap(); err != nil {
+			// We will not skip reconciliation if the map update failed
+			// return result.Error(err).Output()
+		}
 	}
 
 	// Check if the CassandraDatacenter was marked to be deleted

operator/pkg/reconciliation/handler_test.go

@@ -55,7 +55,6 @@ func TestCalculateReconciliationActions_GetServiceError(t *testing.T) {
 
 	k8sMockClientGet(mockClient, fmt.Errorf(""))
 	k8sMockClientUpdate(mockClient, nil).Times(1)
-	k8sMockClientList(mockClient, nil).Times(1)
 	// k8sMockClientCreate(mockClient, nil)
 
 	_, err := rc.calculateReconciliationActions()
@@ -72,7 +71,6 @@ func TestCalculateReconciliationActions_FailedUpdate(t *testing.T) {
 	rc.Client = mockClient
 
 	k8sMockClientUpdate(mockClient, fmt.Errorf("failed to update CassandraDatacenter with removed finalizers"))
-	k8sMockClientList(mockClient, nil).Times(1)
 
 	_, err := rc.calculateReconciliationActions()
 	assert.Errorf(t, err, "Should have returned an error while calculating reconciliation actions")

operator/pkg/reconciliation/reconcile_datacenter.go

@@ -13,6 +13,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	api "github.com/datastax/cass-operator/operator/pkg/apis/cassandra/v1beta1"
+	"github.com/datastax/cass-operator/operator/pkg/utils"
 )
 
 // ProcessDeletion ...
@@ -39,9 +40,11 @@ func (rc *ReconciliationContext) ProcessDeletion() result.ReconcileResult {
 		return result.Error(err)
 	}
 
-	rc.RemoveDcFromNodeToDcMap(types.NamespacedName{
-		Name:      rc.Datacenter.GetName(),
-		Namespace: rc.Datacenter.GetNamespace()})
+	if utils.IsPSPEnabled() {
+		rc.RemoveDcFromNodeToDcMap(types.NamespacedName{
+			Name:      rc.Datacenter.GetName(),
+			Namespace: rc.Datacenter.GetNamespace()})
+	}
 
 	// Update finalizer to allow delete of CassandraDatacenter
 	rc.Datacenter.SetFinalizers(nil)

operator/pkg/reconciliation/reconcile_racks.go

@@ -1103,7 +1103,7 @@ func (rc *ReconciliationContext) deleteStuckNodes() (bool, error) {
 		} else if isNodeStuckAfterLosingReadiness(pod) {
 			reason = "Pod got stuck after losing readiness"
 			shouldDelete = true
-		} else if rc.isNodeStuckWithoutPVC(pod) {
+		} else if utils.IsPSPEnabled() && rc.isNodeStuckWithoutPVC(pod) {
 			reason = "Pod got stuck waiting for PersistentValueClaim"
 			shouldDelete = true
 		}
@@ -2106,8 +2106,10 @@ func (rc *ReconciliationContext) ReconcileAllRacks() (reconcile.Result, error) {
 
 	// We do the node taint check here, with the assumption that the cluster is "healthy"
 
-	if err := rc.checkNodeTaints(); err != nil {
-		return result.Error(err).Output()
+	if utils.IsPSPEnabled() {
+		if err := rc.checkNodeTaints(); err != nil {
+			return result.Error(err).Output()
+		}
 	}
 
 	// TODO until we ignore status updates as it pertains to reconcile

operator/pkg/utils/utilities.go

@@ -3,6 +3,16 @@
 
 package utils
 
+import (
+	"os"
+	"strings"
+)
+
+func IsPSPEnabled() bool {
+	value, exists := os.LookupEnv("ENABLE_VMWARE_PSP")
+	return exists && "true" == strings.TrimSpace(value)
+}
+
 // MergeMap will take two maps, merging the entries of the source map into destination map. If both maps share the same key
 // then destination's value for that key will be overwritten with what's in source.
 func MergeMap(destination map[string]string, sources ...map[string]string) map[string]string {

tests/tolerations/tolerations_suite_test.go

@@ -51,7 +51,7 @@ var _ = Describe(testName, func() {
 			Expect(err).ToNot(HaveOccurred())
 
 			step := "setting up cass-operator resources via helm chart"
-			ns.HelmInstall("../../charts/cass-operator-chart")
+			ns.HelmInstallWithPSPEnabled("../../charts/cass-operator-chart")
 
 			ns.WaitForOperatorReady()