Merge pull request #445 from raptorsun/single-instance

OLS-466: make console UI deployment replica configurable
openshift · Oct 9, 2024 · f16a432 · f16a432
2 parents 6131f37 + 6671964
commit f16a432
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 4 deletions.
diff --git a/api/v1alpha1/olsconfig_types.go b/api/v1alpha1/olsconfig_types.go
@@ -124,6 +124,12 @@ type ConsoleContainerConfig struct {
 	Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Node Selector",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:nodeSelector"}
 	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
+	// Defines the number of desired Console pods. Default: "1"
+	// +kubebuilder:default=1
+	// +kubebuilder:validation:Minimum=0
+	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Number of replicas",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:podCount"}
+	// +optional
+	Replicas *int32 `json:"replicas,omitempty"`
 }
 
 // +kubebuilder:validation:Enum=redis

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/bundle/manifests/lightspeed-operator.clusterserviceversion.yaml b/bundle/manifests/lightspeed-operator.clusterserviceversion.yaml
@@ -38,7 +38,7 @@ metadata:
       ]
     capabilities: Basic Install
     console.openshift.io/operator-monitoring-default: "true"
-    createdAt: "2024-08-30T09:59:16Z"
+    createdAt: "2024-10-03T09:25:52Z"
     features.operators.openshift.io/cnf: "false"
     features.operators.openshift.io/cni: "false"
     features.operators.openshift.io/csi: "false"
@@ -165,6 +165,11 @@ spec:
             path: ols.deployment.console.nodeSelector
             x-descriptors:
               - urn:alm:descriptor:com.tectonic.ui:nodeSelector
+          - description: 'Defines the number of desired Console pods. Default: "1"'
+            displayName: Number of replicas
+            path: ols.deployment.console.replicas
+            x-descriptors:
+              - urn:alm:descriptor:com.tectonic.ui:podCount
           - displayName: Resource Requirements
             path: ols.deployment.console.resources
             x-descriptors:

diff --git a/bundle/manifests/ols.openshift.io_olsconfigs.yaml b/bundle/manifests/ols.openshift.io_olsconfigs.yaml
@@ -291,6 +291,13 @@ spec:
                             additionalProperties:
                               type: string
                             type: object
+                          replicas:
+                            default: 1
+                            description: 'Defines the number of desired Console pods.
+                              Default: "1"'
+                            format: int32
+                            minimum: 0
+                            type: integer
                           resources:
                             description: ResourceRequirements describes the compute
                               resource requirements.

diff --git a/config/crd/bases/ols.openshift.io_olsconfigs.yaml b/config/crd/bases/ols.openshift.io_olsconfigs.yaml
@@ -291,6 +291,13 @@ spec:
                             additionalProperties:
                               type: string
                             type: object
+                          replicas:
+                            default: 1
+                            description: 'Defines the number of desired Console pods.
+                              Default: "1"'
+                            format: int32
+                            minimum: 0
+                            type: integer
                           resources:
                             description: ResourceRequirements describes the compute
                               resource requirements.

diff --git a/config/manifests/bases/lightspeed-operator.clusterserviceversion.yaml b/config/manifests/bases/lightspeed-operator.clusterserviceversion.yaml
@@ -133,6 +133,11 @@ spec:
         path: ols.deployment.console.nodeSelector
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:nodeSelector
+      - description: 'Defines the number of desired Console pods. Default: "1"'
+        displayName: Number of replicas
+        path: ols.deployment.console.replicas
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:podCount
       - displayName: Resource Requirements
         path: ols.deployment.console.resources
         x-descriptors:

diff --git a/internal/controller/ols_console_ui_assets.go b/internal/controller/ols_console_ui_assets.go
@@ -101,7 +101,6 @@ func (r *OLSConfigReconciler) generateConsoleUIService(cr *olsv1alpha1.OLSConfig
 }
 
 func (r *OLSConfigReconciler) generateConsoleUIDeployment(cr *olsv1alpha1.OLSConfig) (*appsv1.Deployment, error) {
-	replicas := int32(2)
 	val_true := true
 	volumeDefaultMode := int32(420)
 	resources := getConsoleUIResources(cr)
@@ -112,7 +111,7 @@ func (r *OLSConfigReconciler) generateConsoleUIDeployment(cr *olsv1alpha1.OLSCon
 			Labels:    generateConsoleUILabels(),
 		},
 		Spec: appsv1.DeploymentSpec{
-			Replicas: &replicas,
+			Replicas: cr.Spec.OLSConfig.DeploymentConfig.ConsoleContainer.Replicas,
 			Selector: &metav1.LabelSelector{
 				MatchLabels: generateConsoleUILabels(),
 			},

diff --git a/internal/controller/ols_console_ui_assets_test.go b/internal/controller/ols_console_ui_assets_test.go
@@ -61,6 +61,8 @@ var _ = Describe("Console UI assets", func() {
 		})
 
 		It("should generate the console UI deployment", func() {
+			var replicas int32 = 2
+			cr.Spec.OLSConfig.DeploymentConfig.ConsoleContainer.Replicas = &replicas
 			dep, err := r.generateConsoleUIDeployment(cr)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(dep.Name).To(Equal(ConsoleUIDeploymentName))
@@ -79,7 +81,7 @@ var _ = Describe("Console UI assets", func() {
 			}))
 			Expect(dep.Spec.Template.Spec.Tolerations).To(BeNil())
 			Expect(dep.Spec.Template.Spec.NodeSelector).To(BeNil())
-
+			Expect(dep.Spec.Replicas).To(Equal(cr.Spec.OLSConfig.DeploymentConfig.ConsoleContainer.Replicas))
 		})
 
 		It("should generate the console UI plugin", func() {