diff --git a/config/crd/bases/server-manager.acooldomain.co_images.yaml b/config/crd/bases/server-manager.acooldomain.co_images.yaml index b2a9157..474a8a3 100644 --- a/config/crd/bases/server-manager.acooldomain.co_images.yaml +++ b/config/crd/bases/server-manager.acooldomain.co_images.yaml @@ -85,6 +85,8 @@ spec: type: array tag: type: string + volume: + type: string working_dir: type: string required: diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index a8feb8b..ed308ec 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -55,7 +55,7 @@ spec: containers: - command: - /manager - image: git.acooldomain.co/server-manager/kubernetes-operator:v0.0.5 + image: git.acooldomain.co/server-manager/kubernetes-operator:v0.0.8 env: - name: CONFIG_PATH value: /etc/server-manager/config.yaml diff --git a/internal/controller/servermanager_controller.go b/internal/controller/servermanager_controller.go index 9585789..663330c 100644 --- a/internal/controller/servermanager_controller.go +++ b/internal/controller/servermanager_controller.go @@ -668,7 +668,7 @@ func (r *ServerManagerReconciler) ServerPod(s *servermanagerv1alpha1.ServerManag Name: "init", Image: image.Spec.InitScript.Image, ImagePullPolicy: corev1.PullIfNotPresent, - Command: image.Spec.Command, + Command: image.Spec.InitScript.Command, Args: image.Spec.InitScript.Args, VolumeMounts: []corev1.VolumeMount{ {