core: set resources on the cmd reporter jobs
If the cmd-reporter key is set under the resources element in the CephCluster CR, the memory and cpu request and limits will be set on the ceph detect version job and network job accordingly. Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
This commit is contained in:
7 files changed
+30
-13
No files matched your search
@@ -252,6 +252,7 @@ func discoverAddressRanges(
|
||||
rookImage,
|
||||
rookImage,
|
||||
clusterSpec.CephVersion.ImagePullPolicy,
|
||||
clusterSpec.Resources,
|
||||
)
|
||||
if err != nil {
|
||||
return ranges, errors.Wrapf(err, "failed to set up ceph %q network canary", cephNetwork)
|
||||
|
||||
@@ -54,9 +54,9 @@ func (m *mockCmdReporter) Run(ctx context.Context, timeout time.Duration) (stdou
|
||||
}
|
||||
|
||||
// returns a newCmdReporter function that returns the given mockCmdReporter and error
|
||||
func mockNewCmdReporter(m *mockCmdReporter, err error) func(clientset kubernetes.Interface, ownerInfo *k8sutil.OwnerInfo, appName string, jobName string, jobNamespace string, cmd []string, args []string, rookImage string, runImage string, imagePullPolicy v1.PullPolicy) (cmdreporter.CmdReporterInterface, error) {
|
||||
return func(clientset kubernetes.Interface, ownerInfo *k8sutil.OwnerInfo, appName, jobName, jobNamespace string, cmd, args []string, rookImage, runImage string, imagePullPolicy v1.PullPolicy) (cmdreporter.CmdReporterInterface, error) {
|
||||
job, err := cmdreporter.MockCmdReporterJob(clientset, ownerInfo, appName, jobName, jobNamespace, cmd, args, rookImage, runImage, imagePullPolicy)
|
||||
func mockNewCmdReporter(m *mockCmdReporter, err error) func(clientset kubernetes.Interface, ownerInfo *k8sutil.OwnerInfo, appName string, jobName string, jobNamespace string, cmd []string, args []string, rookImage string, runImage string, imagePullPolicy v1.PullPolicy, resources cephv1.ResourceSpec) (cmdreporter.CmdReporterInterface, error) {
|
||||
return func(clientset kubernetes.Interface, ownerInfo *k8sutil.OwnerInfo, appName, jobName, jobNamespace string, cmd, args []string, rookImage, runImage string, imagePullPolicy v1.PullPolicy, resources cephv1.ResourceSpec) (cmdreporter.CmdReporterInterface, error) {
|
||||
job, err := cmdreporter.MockCmdReporterJob(clientset, ownerInfo, appName, jobName, jobNamespace, cmd, args, rookImage, runImage, imagePullPolicy, resources)
|
||||
if err != nil {
|
||||
// okay to panic here because this is a unit test setup failure, not part of code testing
|
||||
panic(fmt.Sprintf("error setting up mock CmdReporter job: %v", err))
|
||||
@@ -82,7 +82,6 @@ func newTestConfigsWithNetworkSpec(n cephv1.NetworkSpec) (*clusterd.Context, *ce
|
||||
func Test_discoverAddressRanges(t *testing.T) {
|
||||
oldNewCmdReporter := newCmdReporter
|
||||
defer func() { newCmdReporter = oldNewCmdReporter }()
|
||||
|
||||
t.Run("public network selected", func(t *testing.T) {
|
||||
clusterdCtx, clusterSpec, clusterInfo := newTestConfigsWithNetworkSpec(
|
||||
cephv1.NetworkSpec{
|
||||
|
||||
@@ -74,6 +74,7 @@ func DetectCephVersion(ctx context.Context, rookImage, namespace, jobName string
|
||||
rookImage,
|
||||
cephImage,
|
||||
cephClusterSpec.CephVersion.ImagePullPolicy,
|
||||
cephClusterSpec.Resources,
|
||||
)
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "failed to set up ceph version job")
|
||||
|
||||
Reference in new issue
Block a user