Merge pull request red-hat-storage#1304 from umangachapagain/rook-update

Update Rook to v1.7.0 and K8s to v0.21.3

Author: jarrpa

api/v1/storagecluster_types.go

@@ -20,7 +20,6 @@ import (
 	nbv1 "github.com/noobaa/noobaa-operator/v2/pkg/apis/noobaa/v1alpha1"
 	conditionsv1 "github.com/openshift/custom-resource-status/conditions/v1"
 	rookCephv1 "github.com/rook/rook/pkg/apis/ceph.rook.io/v1"
-	rook "github.com/rook/rook/pkg/apis/rook.io/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -37,7 +36,7 @@ type StorageClusterSpec struct {
 	// HostNetwork defaults to false
 	HostNetwork bool `json:"hostNetwork,omitempty"`
 	// Placement is optional and used to specify placements of OCS components explicitly
-	Placement rook.PlacementSpec `json:"placement,omitempty"`
+	Placement rookCephv1.PlacementSpec `json:"placement,omitempty"`
 	// Resources follows the conventions of and is mapped to CephCluster.Spec.Resources
 	Resources          map[string]corev1.ResourceRequirements `json:"resources,omitempty"`
 	Encryption         EncryptionSpec                         `json:"encryption,omitempty"`
@@ -189,8 +188,8 @@ type StorageDeviceSet struct {
 
 	Name                string                        `json:"name"`
 	Resources           corev1.ResourceRequirements   `json:"resources,omitempty"`
-	PreparePlacement    rook.Placement                `json:"preparePlacement,omitempty"`
-	Placement           rook.Placement                `json:"placement,omitempty"`
+	PreparePlacement    rookCephv1.Placement          `json:"preparePlacement,omitempty"`
+	Placement           rookCephv1.Placement          `json:"placement,omitempty"`
 	Config              StorageDeviceSetConfig        `json:"config,omitempty"`
 	DataPVCTemplate     corev1.PersistentVolumeClaim  `json:"dataPVCTemplate"`
 	MetadataPVCTemplate *corev1.PersistentVolumeClaim `json:"metadataPVCTemplate,omitempty"`

api/v1/zz_generated.deepcopy.go

@@ -1,7 +1,7 @@
 package defaults
 
 import (
-	rook "github.com/rook/rook/pkg/apis/rook.io/v1"
+	rookCephv1 "github.com/rook/rook/pkg/apis/ceph.rook.io/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -18,7 +18,7 @@ var (
 	}
 	// DaemonPlacements map contains the default placement configs for the
 	// various OCS daemons
-	DaemonPlacements = map[string]rook.Placement{
+	DaemonPlacements = map[string]rookCephv1.Placement{
 		"all": {
 			Tolerations: []corev1.Toleration{
 				getOcsToleration(),

config/crd/bases/ocs.openshift.io_storageclusters.yaml

@@ -15,7 +15,6 @@ import (
 	"github.com/openshift/ocs-operator/controllers/defaults"
 	statusutil "github.com/openshift/ocs-operator/controllers/util"
 	rookCephv1 "github.com/rook/rook/pkg/apis/ceph.rook.io/v1"
-	rook "github.com/rook/rook/pkg/apis/rook.io/v1"
 	corev1 "k8s.io/api/core/v1"
 	storagev1 "k8s.io/api/storage/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -319,15 +318,15 @@ func newCephCluster(sc *ocsv1.StorageCluster, cephImage string, nodeCount int, s
 				Enabled:        true,
 				RulesNamespace: "openshift-storage",
 			},
-			Storage: rook.StorageScopeSpec{
+			Storage: rookCephv1.StorageScopeSpec{
 				StorageClassDeviceSets: newStorageClassDeviceSets(sc, serverVersion),
 			},
-			Placement: rook.PlacementSpec{
+			Placement: rookCephv1.PlacementSpec{
 				"all":     getPlacement(sc, "all"),
 				"mon":     getPlacement(sc, "mon"),
 				"arbiter": getPlacement(sc, "arbiter"),
 			},
-			PriorityClassNames: rook.PriorityClassNamesSpec{
+			PriorityClassNames: rookCephv1.PriorityClassNamesSpec{
 				rookCephv1.KeyMgr: systemNodeCritical,
 				rookCephv1.KeyMon: systemNodeCritical,
 				rookCephv1.KeyOSD: systemNodeCritical,
@@ -338,7 +337,7 @@ func newCephCluster(sc *ocsv1.StorageCluster, cephImage string, nodeCount int, s
 				Enabled:     true,
 				Periodicity: "24h",
 			},
-			Labels: rook.LabelsSpec{
+			Labels: rookCephv1.LabelsSpec{
 				rookCephv1.KeyMonitoring: getCephClusterMonitoringLabels(*sc),
 			},
 		},
@@ -452,7 +451,7 @@ func newExternalCephCluster(sc *ocsv1.StorageCluster, cephImage, monitoringIP, m
 				ManageMachineDisruptionBudgets: false,
 			},
 			Monitoring: monitoringSpec,
-			Labels: rook.LabelsSpec{
+			Labels: rookCephv1.LabelsSpec{
 				rookCephv1.KeyMonitoring: getCephClusterMonitoringLabels(*sc),
 			},
 		},
@@ -536,11 +535,11 @@ func getMonCount(nodeCount int, arbiter bool) int {
 }
 
 // newStorageClassDeviceSets converts a list of StorageDeviceSets into a list of Rook StorageClassDeviceSets
-func newStorageClassDeviceSets(sc *ocsv1.StorageCluster, serverVersion *version.Info) []rook.StorageClassDeviceSet {
+func newStorageClassDeviceSets(sc *ocsv1.StorageCluster, serverVersion *version.Info) []rookCephv1.StorageClassDeviceSet {
 	storageDeviceSets := sc.Spec.StorageDeviceSets
 	topologyMap := sc.Status.NodeTopologies
 
-	var storageClassDeviceSets []rook.StorageClassDeviceSet
+	var storageClassDeviceSets []rookCephv1.StorageClassDeviceSet
 
 	// For kube server version 1.19 and above, topology spread constraints are used for OSD placements.
 	// For kube server version below 1.19, NodeAffinity and PodAntiAffinity are used for OSD placements.
@@ -597,8 +596,8 @@ func newStorageClassDeviceSets(sc *ocsv1.StorageCluster, serverVersion *version.
 		}
 
 		for i := 0; i < replica; i++ {
-			placement := rook.Placement{}
-			preparePlacement := rook.Placement{}
+			placement := rookCephv1.Placement{}
+			preparePlacement := rookCephv1.Placement{}
 
 			if noPlacement {
 				if supportTSC {
@@ -679,7 +678,7 @@ func newStorageClassDeviceSets(sc *ocsv1.StorageCluster, serverVersion *version.
 			}
 			ds.DataPVCTemplate.Annotations = annotations
 
-			set := rook.StorageClassDeviceSet{
+			set := rookCephv1.StorageClassDeviceSet{
 				Name:                 fmt.Sprintf("%s-%d", ds.Name, i),
 				Count:                count,
 				Resources:            resources,
@@ -846,7 +845,7 @@ func getCephObjectStoreGatewayInstances(sc *ocsv1.StorageCluster) int32 {
 
 // addStrictFailureDomainTSC adds hard topology constraints at failure domain level
 // and uses soft topology constraints within falure domain (across host).
-func addStrictFailureDomainTSC(placement *rook.Placement, topologyKey string) {
+func addStrictFailureDomainTSC(placement *rookCephv1.Placement, topologyKey string) {
 	newTSC := placement.TopologySpreadConstraints[0]
 	newTSC.TopologyKey = topologyKey
 	newTSC.WhenUnsatisfiable = "DoNotSchedule"

controllers/defaults/placements.go

@@ -3,16 +3,18 @@ package storagecluster
 import (
 	ocsv1 "github.com/openshift/ocs-operator/api/v1"
 	"github.com/openshift/ocs-operator/controllers/defaults"
-	rookv1 "github.com/rook/rook/pkg/apis/rook.io/v1"
+	rookCephv1 "github.com/rook/rook/pkg/apis/ceph.rook.io/v1"
+	rookv1 "github.com/rook/rook/pkg/apis/rook.io"
+
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 // getPlacement returns placement configuration for ceph components with appropriate topology
-func getPlacement(sc *ocsv1.StorageCluster, component string) rookv1.Placement {
-	placement := rookv1.Placement{}
+func getPlacement(sc *ocsv1.StorageCluster, component string) rookCephv1.Placement {
+	placement := rookCephv1.Placement{}
 	in, ok := sc.Spec.Placement[rookv1.KeyType(component)]
 	if ok {
 		(&in).DeepCopyInto(&placement)
@@ -97,7 +99,7 @@ func convertLabelToNodeSelectorRequirements(labelSelector metav1.LabelSelector)
 	return reqs
 }
 
-func appendNodeRequirements(placement *rookv1.Placement, reqs ...corev1.NodeSelectorRequirement) {
+func appendNodeRequirements(placement *rookCephv1.Placement, reqs ...corev1.NodeSelectorRequirement) {
 	if placement.NodeAffinity == nil {
 		placement.NodeAffinity = &corev1.NodeAffinity{}
 	}
@@ -125,7 +127,7 @@ func (m MatchingLabelsSelector) ApplyToList(opts *client.ListOptions) {
 }
 
 // setTopologyForAffinity assigns topology related values to the affinity placements
-func setTopologyForAffinity(placement *rookv1.Placement, selectorValue string, topologyKey string) {
+func setTopologyForAffinity(placement *rookCephv1.Placement, selectorValue string, topologyKey string) {
 	placement.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution[0].PodAffinityTerm.TopologyKey = topologyKey
 
 	nodeZoneSelector := corev1.NodeSelectorRequirement{

controllers/storagecluster/cephcluster.go

@@ -6,7 +6,9 @@ import (
 	api "github.com/openshift/ocs-operator/api/v1"
 	ocsv1 "github.com/openshift/ocs-operator/api/v1"
 	"github.com/openshift/ocs-operator/controllers/defaults"
-	rookv1 "github.com/rook/rook/pkg/apis/rook.io/v1"
+	rookCephv1 "github.com/rook/rook/pkg/apis/ceph.rook.io/v1"
+	rookCore "github.com/rook/rook/pkg/apis/rook.io"
+
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -54,7 +56,7 @@ var workerNodeSelector = corev1.NodeSelector{
 var workerNodeAffinity = corev1.NodeAffinity{
 	RequiredDuringSchedulingIgnoredDuringExecution: &workerNodeSelector,
 }
-var workerPlacements = map[rookv1.KeyType]rookv1.Placement{
+var workerPlacements = map[rookCore.KeyType]rookCephv1.Placement{
 	"all": {
 		NodeAffinity: &workerNodeAffinity,
 	},
@@ -63,11 +65,11 @@ var workerPlacements = map[rookv1.KeyType]rookv1.Placement{
 var emptyLabelSelector = metav1.LabelSelector{
 	MatchExpressions: []metav1.LabelSelectorRequirement{},
 }
-var emptyPlacements = map[rookv1.KeyType]rookv1.Placement{
+var emptyPlacements = map[rookCore.KeyType]rookCephv1.Placement{
 	"all": {},
 }
 
-var customPlacement = rookv1.Placement{
+var customPlacement = rookCephv1.Placement{
 	PodAntiAffinity: &corev1.PodAntiAffinity{
 		RequiredDuringSchedulingIgnoredDuringExecution: []corev1.PodAffinityTerm{
 			{
@@ -107,17 +109,17 @@ func TestGetPlacement(t *testing.T) {
 	cases := []struct {
 		label              string
 		storageCluster     *api.StorageCluster
-		placements         rookv1.PlacementSpec
+		placements         rookCephv1.PlacementSpec
 		labelSelector      *metav1.LabelSelector
-		expectedPlacements rookv1.PlacementSpec
+		expectedPlacements rookCephv1.PlacementSpec
 		topologyMap        *ocsv1.NodeTopologyMap
 	}{
 		{
 			label:          "Case 1: Defaults are preserved i.e no placement and no label selector",
 			storageCluster: mockStorageCluster,
-			placements:     rookv1.PlacementSpec{},
+			placements:     rookCephv1.PlacementSpec{},
 			labelSelector:  nil,
-			expectedPlacements: rookv1.PlacementSpec{
+			expectedPlacements: rookCephv1.PlacementSpec{
 				"all": {
 					NodeAffinity: defaults.DefaultNodeAffinity,
 					Tolerations:  defaults.DaemonPlacements["all"].Tolerations,
@@ -133,7 +135,7 @@ func TestGetPlacement(t *testing.T) {
 			storageCluster: mockStorageCluster,
 			placements:     emptyPlacements,
 			labelSelector:  nil,
-			expectedPlacements: rookv1.PlacementSpec{
+			expectedPlacements: rookCephv1.PlacementSpec{
 				"all": {
 					NodeAffinity: defaults.DefaultNodeAffinity,
 				},
@@ -146,9 +148,9 @@ func TestGetPlacement(t *testing.T) {
 		{
 			label:          "Case 3: LabelSelector to modify the default Placements correctly",
 			storageCluster: mockStorageCluster,
-			placements:     rookv1.PlacementSpec{},
+			placements:     rookCephv1.PlacementSpec{},
 			labelSelector:  &workerLabelSelector,
-			expectedPlacements: rookv1.PlacementSpec{
+			expectedPlacements: rookCephv1.PlacementSpec{
 				"all": {
 					NodeAffinity: &workerNodeAffinity,
 					Tolerations:  defaults.DaemonPlacements["all"].Tolerations,
@@ -164,7 +166,7 @@ func TestGetPlacement(t *testing.T) {
 			storageCluster: mockStorageCluster,
 			placements:     emptyPlacements,
 			labelSelector:  &workerLabelSelector,
-			expectedPlacements: rookv1.PlacementSpec{
+			expectedPlacements: rookCephv1.PlacementSpec{
 				"all": {
 					NodeAffinity: &workerNodeAffinity,
 				},
@@ -179,7 +181,7 @@ func TestGetPlacement(t *testing.T) {
 			storageCluster: mockStorageCluster,
 			placements:     workerPlacements,
 			labelSelector:  &masterLabelSelector,
-			expectedPlacements: rookv1.PlacementSpec{
+			expectedPlacements: rookCephv1.PlacementSpec{
 				"all": {
 					NodeAffinity: &corev1.NodeAffinity{
 						RequiredDuringSchedulingIgnoredDuringExecution: &corev1.NodeSelector{
@@ -219,9 +221,9 @@ func TestGetPlacement(t *testing.T) {
 		{
 			label:          "Case 6: Empty LabelSelector sets no NodeAffinity",
 			storageCluster: mockStorageCluster,
-			placements:     rookv1.PlacementSpec{},
+			placements:     rookCephv1.PlacementSpec{},
 			labelSelector:  &emptyLabelSelector,
-			expectedPlacements: rookv1.PlacementSpec{
+			expectedPlacements: rookCephv1.PlacementSpec{
 				"all": {
 					Tolerations: defaults.DaemonPlacements["all"].Tolerations,
 				},
@@ -233,10 +235,10 @@ func TestGetPlacement(t *testing.T) {
 		{
 			label:          "Case 7: Custom placement is applied without failure",
 			storageCluster: mockStorageCluster,
-			placements: rookv1.PlacementSpec{
+			placements: rookCephv1.PlacementSpec{
 				"mon": customPlacement,
 			},
-			expectedPlacements: rookv1.PlacementSpec{
+			expectedPlacements: rookCephv1.PlacementSpec{
 				"all": {
 					NodeAffinity: defaults.DefaultNodeAffinity,
 					Tolerations:  defaults.DaemonPlacements["all"].Tolerations,
@@ -250,11 +252,11 @@ func TestGetPlacement(t *testing.T) {
 		{
 			label:          "Case 8: Custom placement is modified by labelSelector",
 			storageCluster: mockStorageCluster,
-			placements: rookv1.PlacementSpec{
+			placements: rookCephv1.PlacementSpec{
 				"mon": customPlacement,
 			},
 			labelSelector: &workerLabelSelector,
-			expectedPlacements: rookv1.PlacementSpec{
+			expectedPlacements: rookCephv1.PlacementSpec{
 				"all": {
 					NodeAffinity: &workerNodeAffinity,
 					Tolerations:  defaults.DaemonPlacements["all"].Tolerations,
@@ -268,8 +270,8 @@ func TestGetPlacement(t *testing.T) {
 		{
 			label:          "Case 9: NodeTopologyMap modifies default mon placement",
 			storageCluster: mockStorageCluster,
-			placements:     rookv1.PlacementSpec{},
-			expectedPlacements: rookv1.PlacementSpec{
+			placements:     rookCephv1.PlacementSpec{},
+			expectedPlacements: rookCephv1.PlacementSpec{
 				"all": {
 					NodeAffinity: defaults.DefaultNodeAffinity,
 					Tolerations:  defaults.DaemonPlacements["all"].Tolerations,
@@ -307,9 +309,9 @@ func TestGetPlacement(t *testing.T) {
 		{
 			label:          "Case 10: skip podAntiAffinity in mon placement in case of stretched cluster",
 			storageCluster: mockStorageClusterWithArbiter,
-			placements:     rookv1.PlacementSpec{},
+			placements:     rookCephv1.PlacementSpec{},
 			labelSelector:  nil,
-			expectedPlacements: rookv1.PlacementSpec{
+			expectedPlacements: rookCephv1.PlacementSpec{
 				"all": {
 					NodeAffinity: defaults.DefaultNodeAffinity,
 					Tolerations:  defaults.DaemonPlacements["all"].Tolerations,
@@ -323,7 +325,7 @@ func TestGetPlacement(t *testing.T) {
 	}
 
 	for _, c := range cases {
-		var actualPlacement rookv1.Placement
+		var actualPlacement rookCephv1.Placement
 		sc := &ocsv1.StorageCluster{}
 		c.storageCluster.DeepCopyInto(sc)
 		sc.Spec.Placement = c.placements