Add RuntimeClassName as parameter to Tenant creation

Increase test coverage of tenant code with RuntimeClassName
minio · Jan 11, 2023 · 1e3b48c · 1e3b48c
1 parent d1aee5d
commit 1e3b48c
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 15 deletions.
diff --git a/models/pool.go b/models/pool.go
diff --git a/operatorapi/embedded_spec.go b/operatorapi/embedded_spec.go
diff --git a/operatorapi/tenants.go b/operatorapi/tenants.go
@@ -2270,9 +2270,10 @@ func parseTenantPoolRequest(poolParams *models.Pool) (*miniov2.Pool, error) {
 			Requests: resourcesRequests,
 			Limits:   resourcesLimits,
 		},
-		NodeSelector: poolParams.NodeSelector,
-		Affinity:     affinity,
-		Tolerations:  tolerations,
+		NodeSelector:     poolParams.NodeSelector,
+		Affinity:         affinity,
+		Tolerations:      tolerations,
+		RuntimeClassName: &poolParams.RuntimeClassName,
 	}
 	// if security context for Tenant is present, configure it.
 	if poolParams.SecurityContext != nil {
@@ -2493,6 +2494,13 @@ func parseTenantPool(pool *miniov2.Pool) *models.Pool {
 		}
 	}
 
+	runtimeClassNameValue := ""
+	runtimeClassName := &runtimeClassNameValue
+
+	if pool.RuntimeClassName != nil {
+		runtimeClassName = pool.RuntimeClassName
+	}
+
 	poolModel := &models.Pool{
 		Name:             pool.Name,
 		Servers:          swag.Int64(int64(pool.Servers)),
@@ -2501,11 +2509,12 @@ func parseTenantPool(pool *miniov2.Pool) *models.Pool {
 			Size:             size,
 			StorageClassName: storageClassName,
 		},
-		NodeSelector:    pool.NodeSelector,
-		Resources:       resources,
-		Affinity:        affinity,
-		Tolerations:     tolerations,
-		SecurityContext: &securityContext,
+		NodeSelector:     pool.NodeSelector,
+		Resources:        resources,
+		Affinity:         affinity,
+		Tolerations:      tolerations,
+		SecurityContext:  &securityContext,
+		RuntimeClassName: *runtimeClassName,
 	}
 	return poolModel
 }

diff --git a/operatorapi/tenants_test.go b/operatorapi/tenants_test.go
@@ -383,7 +383,7 @@ export MINIO_SECRET_KEY=minio123
 	}
 }
 
-func NoTestTenantInfo(t *testing.T) {
+func Test_TenantInfo(t *testing.T) {
 	testTimeStamp := metav1.Now()
 	type args struct {
 		minioTenant *miniov2.Tenant
@@ -418,6 +418,7 @@ func NoTestTenantInfo(t *testing.T) {
 										StorageClassName: swag.String("standard"),
 									},
 								},
+								RuntimeClassName: swag.String(""),
 							},
 						},
 
@@ -435,7 +436,12 @@ func NoTestTenantInfo(t *testing.T) {
 				CurrentState: "ready",
 				Pools: []*models.Pool{
 					{
-						Name:             "pool1",
+						Name: "pool1",
+						SecurityContext: &models.SecurityContext{
+							RunAsGroup:   nil,
+							RunAsNonRoot: nil,
+							RunAsUser:    nil,
+						},
 						Servers:          swag.Int64(int64(2)),
 						VolumesPerServer: swag.Int32(4),
 						VolumeConfiguration: &models.PoolVolumeConfiguration{
@@ -483,6 +489,7 @@ func NoTestTenantInfo(t *testing.T) {
 										StorageClassName: swag.String("standard"),
 									},
 								},
+								RuntimeClassName: swag.String(""),
 							},
 						},
 						Image: "minio/minio:RELEASE.2020-06-14T18-32-17Z",
@@ -500,7 +507,12 @@ func NoTestTenantInfo(t *testing.T) {
 				CurrentState: "ready",
 				Pools: []*models.Pool{
 					{
-						Name:             "pool1",
+						Name: "pool1",
+						SecurityContext: &models.SecurityContext{
+							RunAsGroup:   nil,
+							RunAsNonRoot: nil,
+							RunAsUser:    nil,
+						},
 						Servers:          swag.Int64(int64(2)),
 						VolumesPerServer: swag.Int32(4),
 						VolumeConfiguration: &models.PoolVolumeConfiguration{
@@ -1025,7 +1037,7 @@ func Test_UpdateTenantAction(t *testing.T) {
 				},
 				params: operator_api.UpdateTenantParams{
 					Body: &models.UpdateTenantRequest{
-						Image: "minio/minio:RELEASE.2020-06-03T22-13-49Z",
+						Image: "minio/minio:RELEASE.2023-01-06T18-11-18Z",
 					},
 				},
 			},
@@ -1050,7 +1062,7 @@ func Test_UpdateTenantAction(t *testing.T) {
 				},
 				params: operator_api.UpdateTenantParams{
 					Body: &models.UpdateTenantRequest{
-						Image: "minio/minio:RELEASE.2020-06-03T22-13-49Z",
+						Image: "minio/minio:RELEASE.2023-01-06T18-11-18Z",
 					},
 				},
 			},
@@ -1076,7 +1088,7 @@ func Test_UpdateTenantAction(t *testing.T) {
 				params: operator_api.UpdateTenantParams{
 					Tenant: "minio-tenant",
 					Body: &models.UpdateTenantRequest{
-						Image: "minio/minio:RELEASE.2020-06-03T22-13-49Z",
+						Image: "minio/minio:RELEASE.2023-01-06T18-11-18Z",
 					},
 				},
 			},

diff --git a/swagger-operator.yml b/swagger-operator.yml
@@ -2610,6 +2610,8 @@ definitions:
           https://kubernetes.io/docs/concepts/configuration/assign-pod-node/"
       affinity:
         $ref: "#/definitions/poolAffinity"
+      runtimeClassName:
+        type: string
       tolerations:
         $ref: "#/definitions/poolTolerations"
       securityContext:
@@ -3750,4 +3752,4 @@ definitions:
       redirect:
         type: string
       displayName:
-        type: string
+        type: string