Skip to content

feat: operator auto-detects version for controller/router image defaults #844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mangelajo wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −2
Draft

feat: operator auto-detects version for controller/router image defaults #844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions controller/deploy/operator/cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ func main() {
Scheme: mgr.GetScheme(),
EndpointReconciler: endpoints.NewReconciler(mgr.GetClient(), mgr.GetScheme(), mgr.GetConfig()),
Recorder: mgr.GetEventRecorderFor("jumpstarter-operator"),
Version: version,
}).SetupWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "Jumpstarter")
os.Exit(1)
Expand Down
19 changes: 17 additions & 2 deletions controller/deploy/operator/internal/controller/jumpstarter/jumpstarter_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,21 @@ type JumpstarterReconciler struct {
Scheme *runtime.Scheme
EndpointReconciler *endpoints.Reconciler
Recorder record.EventRecorder
Version string
}

// resolveImage replaces the :latest tag with the operator's own version tag.
// If the operator version is unknown ("dev") or the image uses a non-latest tag
// (admin override), the image is returned unchanged.
func (r *JumpstarterReconciler) resolveImage(image string) string {
if r.Version == "" || r.Version == "dev" {
return image
}
version := strings.TrimPrefix(r.Version, "v")
if base, ok := strings.CutSuffix(image, ":latest"); ok {
return base + ":" + version
}
return image
}

// +kubebuilder:rbac:groups=operator.jumpstarter.dev,resources=jumpstarters,verbs=get;list;watch;create;update;patch;delete
Expand Down Expand Up @@ -816,7 +831,7 @@ func (r *JumpstarterReconciler) createControllerDeployment(jumpstarter *operator
Containers: []corev1.Container{
{
Name: "manager",
Image: jumpstarter.Spec.Controller.Image,
Image: r.resolveImage(jumpstarter.Spec.Controller.Image),
ImagePullPolicy: jumpstarter.Spec.Controller.ImagePullPolicy,
Args: []string{
"--leader-elect",
Expand Down Expand Up @@ -1013,7 +1028,7 @@ func (r *JumpstarterReconciler) createRouterDeployment(jumpstarter *operatorv1al
Containers: []corev1.Container{
{
Name: "router",
Image: jumpstarter.Spec.Routers.Image,
Image: r.resolveImage(jumpstarter.Spec.Routers.Image),
ImagePullPolicy: jumpstarter.Spec.Routers.ImagePullPolicy,
Command: []string{"/router"},
Env: envVars,
Expand Down
Loading