Merge pull request openshift#25 from alexander-demichev/command

✨ Add command field to container spec
RadekManak · Feb 11, 2022 · e07b1fe · e07b1fe
2 parents 2f79f1c + cc57dfe
commit e07b1fe
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 0 deletions.
diff --git a/api/v1alpha1/provider_types.go b/api/v1alpha1/provider_types.go
@@ -151,6 +151,9 @@ type ContainerSpec struct {
 	// Compute resources required by this container.
 	// +optional
 	Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
+
+	// Command allows override container's entrypoint array.
+	Command []string `json:"command,omitempty"`
 }
 
 // ImageMeta allows to customize the image used.

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/operator.cluster.x-k8s.io_bootstrapproviders.yaml b/config/crd/bases/operator.cluster.x-k8s.io_bootstrapproviders.yaml
@@ -929,6 +929,12 @@ spec:
                             of the container arg `--sync-period` if both are defined.
                             The same holds for `ManagerSpec.FeatureGates` and `--feature-gates`.
                           type: object
+                        command:
+                          description: Command allows override container's entrypoint
+                            array.
+                          items:
+                            type: string
+                          type: array
                         env:
                           description: List of environment variables to set in the
                             container.

diff --git a/config/crd/bases/operator.cluster.x-k8s.io_controlplaneproviders.yaml b/config/crd/bases/operator.cluster.x-k8s.io_controlplaneproviders.yaml
@@ -930,6 +930,12 @@ spec:
                             of the container arg `--sync-period` if both are defined.
                             The same holds for `ManagerSpec.FeatureGates` and `--feature-gates`.
                           type: object
+                        command:
+                          description: Command allows override container's entrypoint
+                            array.
+                          items:
+                            type: string
+                          type: array
                         env:
                           description: List of environment variables to set in the
                             container.

diff --git a/config/crd/bases/operator.cluster.x-k8s.io_coreproviders.yaml b/config/crd/bases/operator.cluster.x-k8s.io_coreproviders.yaml
@@ -929,6 +929,12 @@ spec:
                             of the container arg `--sync-period` if both are defined.
                             The same holds for `ManagerSpec.FeatureGates` and `--feature-gates`.
                           type: object
+                        command:
+                          description: Command allows override container's entrypoint
+                            array.
+                          items:
+                            type: string
+                          type: array
                         env:
                           description: List of environment variables to set in the
                             container.

diff --git a/config/crd/bases/operator.cluster.x-k8s.io_infrastructureproviders.yaml b/config/crd/bases/operator.cluster.x-k8s.io_infrastructureproviders.yaml
@@ -930,6 +930,12 @@ spec:
                             of the container arg `--sync-period` if both are defined.
                             The same holds for `ManagerSpec.FeatureGates` and `--feature-gates`.
                           type: object
+                        command:
+                          description: Command allows override container's entrypoint
+                            array.
+                          items:
+                            type: string
+                          type: array
                         env:
                           description: List of environment variables to set in the
                             container.

diff --git a/controllers/component_customizer.go b/controllers/component_customizer.go
@@ -226,6 +226,9 @@ func customizeContainer(cSpec operatorv1.ContainerSpec, d *appsv1.Deployment) {
 			if cSpec.Image != nil && cSpec.Image.Name != nil && cSpec.Image.Repository != nil {
 				c.Image = imageMetaToURL(cSpec.Image)
 			}
+			if cSpec.Command != nil {
+				c.Command = cSpec.Command
+			}
 		}
 		d.Spec.Template.Spec.Containers[j] = c
 	}

diff --git a/controllers/component_customizer_test.go b/controllers/component_customizer_test.go
@@ -323,6 +323,7 @@ func TestCustomizeDeployment(t *testing.T) {
 						Resources: &corev1.ResourceRequirements{
 							Requests: corev1.ResourceList{corev1.ResourceMemory: memTestQuantity},
 						},
+						Command: []string{"/expected"},
 					},
 				},
 			},
@@ -370,6 +371,7 @@ func TestCustomizeDeployment(t *testing.T) {
 									Resources: corev1.ResourceRequirements{
 										Requests: corev1.ResourceList{corev1.ResourceMemory: memTestQuantity},
 									},
+									Command: []string{"/expected"},
 								},
 							},
 						},
@@ -403,6 +405,9 @@ func TestCustomizeDeployment(t *testing.T) {
 				if !reflect.DeepEqual(inputDS.Template.Spec.Containers[0].Resources, expectedDS.Template.Spec.Containers[0].Resources) {
 					return expectedDS, false
 				}
+				if !reflect.DeepEqual(inputDS.Template.Spec.Containers[0].Command, expectedDS.Template.Spec.Containers[0].Command) {
+					return expectedDS, false
+				}
 				return expectedDS, true
 			},
 		},