Merge pull request #9502 from cybozu-go/core-support-priority-class-for-crashcollector

core: support priority class for crashcollector

Documentation/ceph-cluster-crd.md

@@ -603,10 +603,11 @@ Priority class names can be specified so that the Rook components will have thos
 
 You can set priority class names for Rook components for the list of key value pairs:
 
-* `all`: Set priority class names for MGRs, Mons, OSDs.
+* `all`: Set priority class names for MGRs, Mons, OSDs, and crashcollectors.
 * `mgr`: Set priority class names for MGRs.
 * `mon`: Set priority class names for Mons.
 * `osd`: Set priority class names for OSDs.
+* `crashcollector`: Set priority class names for crashcollectors.
 
 The specific component keys will act as overrides to `all`.
 

deploy/charts/rook-ceph-cluster/values.yaml

@@ -238,6 +238,7 @@ cephClusterSpec:
   #   mon: rook-ceph-mon-priority-class
   #   osd: rook-ceph-osd-priority-class
   #   mgr: rook-ceph-mgr-priority-class
+  #   crashcollector: rook-ceph-crashcollector-priority-class
 
   storage: # cluster level storage configuration and selection
     useAllNodes: true

deploy/examples/cluster.yaml

@@ -211,6 +211,7 @@ spec:
 #    mon: rook-ceph-mon-priority-class
 #    osd: rook-ceph-osd-priority-class
 #    mgr: rook-ceph-mgr-priority-class
+#    crashcollector: rook-ceph-crashcollector-priority-class
   storage: # cluster level storage configuration and selection
     useAllNodes: true
     useAllDevices: true

pkg/apis/ceph.rook.io/v1/priorityclasses.go

@@ -55,3 +55,11 @@ func GetCleanupPriorityClassName(p PriorityClassNamesSpec) string {
 	}
 	return p[KeyCleanup]
 }
+
+// GetCrashCollectorPriorityClassName returns the priority class name for the crashcollector
+func GetCrashCollectorPriorityClassName(p PriorityClassNamesSpec) string {
+	if _, ok := p[KeyCrashCollector]; !ok {
+		return p.All()
+	}
+	return p[KeyCrashCollector]
+}

pkg/apis/ceph.rook.io/v1/priorityclasses_test.go

@@ -30,6 +30,7 @@ all: all-class
 mgr: mgr-class
 mon: mon-class
 osd: osd-class
+crashcollector: crashcollector-class
 `)
 
 	// convert the raw spec yaml into JSON
@@ -43,10 +44,11 @@ osd: osd-class
 
 	// the unmarshalled priority class names spec should equal the expected spec below
 	expected := PriorityClassNamesSpec{
-		"all": "all-class",
-		"mgr": "mgr-class",
-		"mon": "mon-class",
-		"osd": "osd-class",
+		"all":            "all-class",
+		"mgr":            "mgr-class",
+		"mon":            "mon-class",
+		"osd":            "osd-class",
+		"crashcollector": "crashcollector-class",
 	}
 	assert.Equal(t, expected, priorityClassNames)
 }

pkg/operator/ceph/cluster/crash/crash.go

@@ -113,10 +113,11 @@ func (r *ReconcileNode) createOrUpdateCephCrash(node corev1.Node, tolerations []
 				Containers: []corev1.Container{
 					getCrashDaemonContainer(cephCluster, *cephVersion),
 				},
-				Tolerations:   tolerations,
-				RestartPolicy: corev1.RestartPolicyAlways,
-				HostNetwork:   cephCluster.Spec.Network.IsHost(),
-				Volumes:       volumes,
+				Tolerations:       tolerations,
+				RestartPolicy:     corev1.RestartPolicyAlways,
+				HostNetwork:       cephCluster.Spec.Network.IsHost(),
+				Volumes:           volumes,
+				PriorityClassName: cephv1.GetCrashCollectorPriorityClassName(cephCluster.Spec.PriorityClassNames),
 			},
 		}
 

pkg/operator/ceph/cluster/crash/crash_test.go

@@ -18,6 +18,7 @@ package crash
 
 import (
 	"context"
+	"fmt"
 	"testing"
 
 	cephv1 "github.com/rook/rook/pkg/apis/ceph.rook.io/v1"
@@ -25,14 +26,18 @@ import (
 	"github.com/rook/rook/pkg/client/clientset/versioned/scheme"
 	"github.com/rook/rook/pkg/clusterd"
 	cephver "github.com/rook/rook/pkg/operator/ceph/version"
+	"github.com/rook/rook/pkg/operator/k8sutil"
 	"github.com/rook/rook/pkg/operator/test"
 	"github.com/stretchr/testify/assert"
+	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/batch/v1"
 	"k8s.io/api/batch/v1beta1"
+	corev1 "k8s.io/api/core/v1"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	cntrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 )
 
@@ -105,3 +110,61 @@ func TestCreateOrUpdateCephCron(t *testing.T) {
 	assert.Error(t, err)
 	assert.True(t, kerrors.IsNotFound(err))
 }
+
+func TestCreateOrUpdateCephCrash(t *testing.T) {
+	cephCluster := cephv1.CephCluster{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "rook-ceph"},
+	}
+	cephCluster.Spec.Labels = cephv1.LabelsSpec{}
+	cephCluster.Spec.PriorityClassNames = cephv1.PriorityClassNamesSpec{}
+	cephVersion := &cephver.CephVersion{Major: 16, Minor: 2, Extra: 0}
+	ctx := context.TODO()
+	context := &clusterd.Context{
+		Clientset:     test.New(t, 1),
+		RookClientset: rookclient.NewSimpleClientset(),
+	}
+
+	s := scheme.Scheme
+	err := appsv1.AddToScheme(s)
+	if err != nil {
+		assert.Fail(t, "failed to build scheme")
+	}
+	r := &ReconcileNode{
+		scheme:  s,
+		client:  fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects().Build(),
+		context: context,
+	}
+
+	node := corev1.Node{}
+	nodeSelector := map[string]string{corev1.LabelHostname: "testnode"}
+	node.SetLabels(nodeSelector)
+	tolerations := []corev1.Toleration{{}}
+	res, err := r.createOrUpdateCephCrash(node, tolerations, cephCluster, cephVersion)
+	assert.NoError(t, err)
+	assert.Equal(t, controllerutil.OperationResult("created"), res)
+	name := k8sutil.TruncateNodeName(fmt.Sprintf("%s-%%s", AppName), "testnode")
+	deploy := appsv1.Deployment{}
+	err = r.client.Get(ctx, types.NamespacedName{Namespace: "rook-ceph", Name: name}, &deploy)
+	assert.NoError(t, err)
+	podSpec := deploy.Spec.Template
+	assert.Equal(t, nodeSelector, podSpec.Spec.NodeSelector)
+	assert.Equal(t, "", podSpec.ObjectMeta.Labels["foo"])
+	assert.Equal(t, tolerations, podSpec.Spec.Tolerations)
+	assert.Equal(t, false, podSpec.Spec.HostNetwork)
+	assert.Equal(t, "", podSpec.Spec.PriorityClassName)
+
+	cephCluster.Spec.Labels[cephv1.KeyCrashCollector] = map[string]string{"foo": "bar"}
+	cephCluster.Spec.Network.HostNetwork = true
+	cephCluster.Spec.PriorityClassNames[cephv1.KeyCrashCollector] = "test-priority-class"
+	tolerations = []corev1.Toleration{{Key: "key", Operator: "Equal", Value: "value", Effect: "NoSchedule"}}
+	res, err = r.createOrUpdateCephCrash(node, tolerations, cephCluster, cephVersion)
+	assert.NoError(t, err)
+	assert.Equal(t, controllerutil.OperationResult("updated"), res)
+	err = r.client.Get(ctx, types.NamespacedName{Namespace: "rook-ceph", Name: name}, &deploy)
+	assert.NoError(t, err)
+	podSpec = deploy.Spec.Template
+	assert.Equal(t, "bar", podSpec.ObjectMeta.Labels["foo"])
+	assert.Equal(t, tolerations, podSpec.Spec.Tolerations)
+	assert.Equal(t, true, podSpec.Spec.HostNetwork)
+	assert.Equal(t, "test-priority-class", podSpec.Spec.PriorityClassName)
+}