[ISSUE-417] Fix CSI deployment via Operator on Openshift

api/v1/components/scheduler.go

@@ -23,5 +23,6 @@ type Scheduler struct {
 	Log                *Log     `json:"log,omitempty"`
 	Metrics            *Metrics `json:"metrics,omitempty"`
 	Patcher            *Patcher `json:"patcher,omitempty"`
+	ExtenderPort       string   `json:"extenderPort,omitempty"`
 	StorageProvisioner string   `json:"storageProvisioner"`
 }

charts/csi-baremetal-deployment/templates/configmap/patcher-configmap.yaml

@@ -24,7 +24,7 @@ data:
     apiVersion: v1
     kind: Policy
     extenders:
-      - urlPrefix: "http://127.0.0.1:8889"
+      - urlPrefix: "http://127.0.0.1:{{ .Values.scheduler.patcher.extender_port }}"
         filterVerb: filter
         prioritizeVerb: prioritize
         weight: 1
@@ -38,7 +38,7 @@ data:
     apiVersion: kubescheduler.config.k8s.io/v1beta1
     kind: KubeSchedulerConfiguration
     extenders:
-      - urlPrefix: "http://127.0.0.1:8889"
+      - urlPrefix: "http://127.0.0.1:{{ .Values.scheduler.patcher.extender_port }}"
         filterVerb: filter
         prioritizeVerb: prioritize
         weight: 1

charts/csi-baremetal-deployment/templates/csi-baremetal_v1_deployment.yaml

@@ -83,6 +83,7 @@ spec:
     metrics:
       path: {{ .Values.scheduler.metrics.path }}
       port: {{ .Values.scheduler.metrics.port }}
+    extenderPort: {{ .Values.scheduler.extender.port | quote }}
     patcher:
       enable: {{ .Values.scheduler.patcher.enable }}
       image:

charts/csi-baremetal-deployment/values.yaml

@@ -117,6 +117,9 @@ scheduler:
     path: /metrics
     port: 8787
 
+  extender:
+    port: 8889
+
   # Patcher settings
   patcher:
     enable: false

charts/csi-baremetal-operator/templates/manager.yaml

@@ -27,9 +27,10 @@ spec:
         name: manager
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         resources:
+          # Memory limit is increased due to bug in OpenShift 4.6 - https://bugzilla.redhat.com/show_bug.cgi?id=1904558
           limits:
             cpu: 100m
-            memory: 30Mi
+            memory: 100Mi
           requests:
             cpu: 100m
             memory: 20Mi

charts/csi-baremetal-operator/templates/rbac.yaml

@@ -38,6 +38,13 @@ rules:
   - "*"
   verbs:
   - "*"
+# Required for Openshift only
+- apiGroups:
+  - config.openshift.io
+  resources:
+  - schedulers
+  verbs:
+  - "*"
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

pkg/csi_deployment.go

@@ -73,7 +73,7 @@ func (c *CSIDeployment) Update(ctx context.Context, csi *csibaremetalv1.Deployme
 	// Patching method for the scheduler depends on the platform
 	switch csi.Spec.Platform {
 	case platformOpenshift:
-		return c.patcher.PatchOpenShift(ctx, scheme)
+		return c.patcher.PatchOpenShift(ctx, csi)
 	default:
 		return c.patcher.Update(csi, scheme)
 

pkg/scheduler_patcher_openshift.go

@@ -2,36 +2,39 @@ package pkg
 
 import (
 	"context"
+	"fmt"
 
 	openshiftv1 "github.com/openshift/api/config/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	csibaremetalv1 "github.com/dell/csi-baremetal-operator/api/v1"
 )
 
 const (
 	openshiftNS     = "openshift-config"
 	openshiftConfig = "scheduler-policy"
 
-	oshiftpolicyFile = "policy.cfg"
-	oshiftpolicy     = `{
+	openshiftPolicyFile = "policy.cfg"
+)
+
+func (p *SchedulerPatcher) PatchOpenShift(ctx context.Context, csi *csibaremetalv1.Deployment) error {
+	openshiftPolicy := fmt.Sprintf(`{
    "kind" : "Policy",
    "apiVersion" : "v1",
    "extenders": [
         {
-            "urlPrefix": "http://127.0.0.1:$PORT",
+            "urlPrefix": "http://127.0.0.1:%s",
             "filterVerb": "filter",
             "enableHttps": false,
             "nodeCacheCapable": false,
             "ignorable": true
         }
     ]
-}`
-)
+}`, csi.Spec.Scheduler.ExtenderPort)
 
-func (p *SchedulerPatcher) PatchOpenShift(ctx context.Context, scheme *runtime.Scheme) error {
 	cfClient := p.CoreV1().ConfigMaps(openshiftNS)
 	oscf, err := cfClient.Get(p.ctx, openshiftConfig, metav1.GetOptions{})
 	if err != nil {
@@ -40,8 +43,8 @@ func (p *SchedulerPatcher) PatchOpenShift(ctx context.Context, scheme *runtime.S
 			return err
 		}
 	} else {
-		if v, ok := oscf.Data[oshiftpolicyFile]; ok {
-			if v == oshiftpolicy {
+		if v, ok := oscf.Data[openshiftPolicyFile]; ok {
+			if v == openshiftPolicy {
 				p.Logger.Info("Configmap is already patched")
 				return nil
 			}
@@ -54,7 +57,7 @@ func (p *SchedulerPatcher) PatchOpenShift(ctx context.Context, scheme *runtime.S
 		}
 	}
 
-	_, err = cfClient.Create(p.ctx, createOpenshiftConfig(), metav1.CreateOptions{})
+	_, err = cfClient.Create(p.ctx, createOpenshiftConfig(openshiftPolicy), metav1.CreateOptions{})
 	if err != nil {
 		p.Logger.Error(err, "Failed to create configmap")
 		return err
@@ -79,14 +82,14 @@ func (p *SchedulerPatcher) UnPatchOpenShift(ctx context.Context) error {
 	return p.unpatchSheduler(ctx)
 }
 
-func createOpenshiftConfig() *corev1.ConfigMap {
+func createOpenshiftConfig(policy string) *corev1.ConfigMap {
 	return &corev1.ConfigMap{
 		TypeMeta: metav1.TypeMeta{},
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      openshiftConfig,
 			Namespace: openshiftNS,
 		},
-		Data: map[string]string{oshiftpolicyFile: oshiftpolicy},
+		Data: map[string]string{openshiftPolicyFile: policy},
 	}
 }