From c6f87bdf12b5e59c41bbb81ec8c304d72acdb796 Mon Sep 17 00:00:00 2001 From: fischor <21199007+fischor@users.noreply.github.com> Date: Sat, 5 Nov 2022 18:49:01 +0100 Subject: [PATCH] More container fields for SuggestionConfig --- pkg/controller.v1beta1/suggestion/composer/composer.go | 5 +++++ pkg/util/v1beta1/katibconfig/config.go | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/pkg/controller.v1beta1/suggestion/composer/composer.go b/pkg/controller.v1beta1/suggestion/composer/composer.go index 756b3f94610..f0d091c653c 100644 --- a/pkg/controller.v1beta1/suggestion/composer/composer.go +++ b/pkg/controller.v1beta1/suggestion/composer/composer.go @@ -186,6 +186,11 @@ func (g *General) desiredContainers(s *suggestionsv1beta1.Suggestion, Name: consts.ContainerSuggestion, Image: suggestionConfigData.Image, ImagePullPolicy: suggestionConfigData.ImagePullPolicy, + Command: suggestionConfigData.Command, + Args: suggestionConfigData.Args, + WorkingDir: suggestionConfigData.WorkingDir, + EnvFrom: suggestionConfigData.EnvFrom, + Env: suggestionConfigData.Env, Ports: []corev1.ContainerPort{ { Name: consts.DefaultSuggestionPortName, diff --git a/pkg/util/v1beta1/katibconfig/config.go b/pkg/util/v1beta1/katibconfig/config.go index cb61494e300..e5f560e3982 100644 --- a/pkg/util/v1beta1/katibconfig/config.go +++ b/pkg/util/v1beta1/katibconfig/config.go @@ -36,6 +36,11 @@ import ( type SuggestionConfig struct { Image string `json:"image"` ImagePullPolicy corev1.PullPolicy `json:"imagePullPolicy,omitempty"` + Command []string `json:"command,omitempty"` + Args []string `json:"args,omitempty"` + WorkingDir string `json:"workingDir,omitempty"` + EnvFrom []corev1.EnvFromSource `json:"envFrom,omitempty"` + Env []corev1.EnvVar `json:"env,omitempty"` Resource corev1.ResourceRequirements `json:"resources,omitempty"` ServiceAccountName string `json:"serviceAccountName,omitempty"` VolumeMountPath string `json:"volumeMountPath,omitempty"`