feat(controller): allow specific front image

Signed-off-by: Joshua Su <[email protected]>
CQUPTMirror · Apr 8, 2024 · 33381f3 · 33381f3
1 parent 2f4b8e9
commit 33381f3
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 10 deletions.
diff --git a/api/v1beta1/job_types.go b/api/v1beta1/job_types.go
@@ -62,6 +62,7 @@ type JobDeploy struct {
 	DeployConfig `json:",inline"`
 
 	DisableFront string `json:"disableFront,omitempty"`
+	FrontMode    string `json:"frontMode,omitempty"`
 	FrontImage   string `json:"frontImage,omitempty"`
 	FrontCmd     string `json:"frontCmd,omitempty"`
 	DisableRsync string `json:"disableRsync,omitempty"`

diff --git a/cmd/main.go b/cmd/main.go
@@ -109,6 +109,7 @@ func main() {
 		PullSecret:   os.Getenv("PULL_SECRET"),
 		StorageClass: os.Getenv("STORAGE_CLASS"),
 		AccessMode:   os.Getenv("ACCESS_MODE"),
+		FrontMode:    os.Getenv("FRONT_MODE"),
 		FrontImage:   os.Getenv("FRONT_IMAGE"),
 		RsyncImage:   os.Getenv("RSYNC_IMAGE"),
 		FrontCmd:     os.Getenv("FRONT_CMD"),

diff --git a/config/controller/controller.yaml b/config/controller/controller.yaml
@@ -64,8 +64,10 @@ spec:
 #          value:  # Default storageClass of worker pvc
 #        - name: ACCESS_MODE
 #          value: ReadWriteOnce  # Default accessMode of worker pvc
-#        - name: FRONT_IMAGE  # Default image used to deploy the directory service
-#          value: nginx / caddy
+#        - name: FRONT_MODE  # Default server to be used as Front Server, if this is not set, disable front server
+#          value: nginx / caddy / ''
+#        - name: FRONT_IMAGE  # Default images used to deploy front server. Be careful, this value is related with FRONT_MODE, if you use nginx, you must specify a nginx image. If this is not set, both nginx and caddy mode pull from dockerhub.
+#          value: ''
 #        - name: RSYNC_IMAGE  # Default image used to deploy the rsync service
 #          value: rsync
 #        - name: FRONT_CMD  # Default command used to deploy the directory service

diff --git a/config/crd/bases/mirror.redrock.team_jobs.yaml b/config/crd/bases/mirror.redrock.team_jobs.yaml
@@ -1221,6 +1221,8 @@ spec:
                     type: string
                   frontImage:
                     type: string
+                  frontMode:
+                    type: string
                   image:
                     type: string
                   imagePullPolicy:

diff --git a/internal/controller/job_controller.go b/internal/controller/job_controller.go
@@ -89,7 +89,7 @@ func (r *JobReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.R
 	}
 
 	var ig *v1.Ingress
-	disableFront, _, _, _, _, _ := r.checkRsyncFront(&job)
+	disableFront, _, _, _, _, _, _ := r.checkRsyncFront(&job)
 	if !disableFront {
 		ig, err = r.desiredIngress(&job)
 		if err != nil {

diff --git a/internal/controller/job_helper.go b/internal/controller/job_helper.go
@@ -38,17 +38,19 @@ const (
 	RsyncPort = 873
 )
 
-func (r *JobReconciler) checkRsyncFront(job *v1beta1.Job) (disableFront, disableRsync bool, frontCmd, rsyncCmd []string, frontImage, rsyncImage string) {
-	frontImage, rsyncImage = r.Config.FrontImage, r.Config.RsyncImage
+func (r *JobReconciler) checkRsyncFront(job *v1beta1.Job) (disableFront, disableRsync bool, frontCmd, rsyncCmd []string, frontMode, frontImage, rsyncImage string) {
+	frontMode, frontImage, rsyncImage = r.Config.FrontMode, r.Config.FrontImage, r.Config.RsyncImage
 	frontCmd, rsyncCmd = strings.Split(r.Config.FrontCmd, " "), strings.Split(r.Config.RsyncCmd, " ")
 	if s, err := strconv.ParseBool(job.Spec.Deploy.DisableFront); err == nil {
 		disableFront = s
 	}
-	if job.Spec.Deploy.FrontImage != "" {
-		frontImage = job.Spec.Deploy.FrontImage
+	if job.Spec.Deploy.FrontMode != "" {
+		frontMode = job.Spec.Deploy.FrontMode
 	}
-	if frontImage == "" {
+	if frontMode == "" {
 		disableFront = true
+	} else if frontImage == "" {
+		frontImage = frontMode + ":latest"
 	}
 	if job.Spec.Deploy.FrontCmd != "" {
 		frontCmd = strings.Split(job.Spec.Deploy.FrontCmd, " ")
@@ -245,7 +247,7 @@ func (r *JobReconciler) desiredDeployment(job *v1beta1.Job, manager string) (*ap
 		}
 	}
 
-	disableFront, disableRsync, frontCmd, rsyncCmd, frontImage, rsyncImage := r.checkRsyncFront(job)
+	disableFront, disableRsync, frontCmd, rsyncCmd, _, frontImage, rsyncImage := r.checkRsyncFront(job)
 	if !disableFront {
 		frontProbe := &corev1.Probe{
 			ProbeHandler: corev1.ProbeHandler{
@@ -337,7 +339,7 @@ func (r *JobReconciler) desiredService(job *v1beta1.Job) (*corev1.Service, error
 			Type:     corev1.ServiceTypeClusterIP,
 		},
 	}
-	disableFront, disableRsync, _, _, _, _ := r.checkRsyncFront(job)
+	disableFront, disableRsync, _, _, _, _, _ := r.checkRsyncFront(job)
 	if !disableFront {
 		svc.Spec.Ports = append(svc.Spec.Ports, corev1.ServicePort{Name: "front", Port: FrontPort, Protocol: "TCP", TargetPort: intstr.FromString("front")})
 	}

diff --git a/internal/controller/manager_controller.go b/internal/controller/manager_controller.go
@@ -40,6 +40,7 @@ type Config struct {
 	PullSecret   string
 	StorageClass string
 	AccessMode   string
+	FrontMode    string
 	FrontImage   string
 	RsyncImage   string
 	FrontCmd     string