Skip to content

Support node-specific extension images in DaemonSet mode #1485

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

Open
Pacho20 wants to merge 4 commits into
base: devel
Choose a base branch
from
Open

Support node-specific extension images in DaemonSet mode #1485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4108826
Move GetImageForComponent into its own file
Pacho20 Dec 16, 2025
367477e
Add optional version param to GetImageForComponent
Pacho20 Dec 16, 2025
2dbd2b6
Add provider-specific logic for component images
Pacho20 Dec 18, 2025
a66dac8
Use new image component logic for DaemonSet mode
Pacho20 Dec 18, 2025
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
77 changes: 50 additions & 27 deletions controllers/daemonset_reconcile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ package controllers

import (
"context"
"slices"
"sort"
"strings"
"time"

appsv1 "k8s.io/api/apps/v1"
Expand Down Expand Up @@ -460,7 +462,7 @@ func (r *KataConfigOpenShiftReconciler) addPeerPodsConfigDaemonSet() error {
// daemonSetForPeerPodsConfig creates a DaemonSet for peer-pods configuration.
// The Daemonset will copy or remove the peer-pods configuration files based on the given action.
func (r *KataConfigOpenShiftReconciler) daemonSetForPeerPodsConfig(action KataDaemonSetAction) (*appsv1.DaemonSet, error) {
cliImageString, err := GetImageForComponent(cliImageName, r.Client)
cliImages, err := r.GetNodeImages(cliImageName, "CLI_IMAGE")
if err != nil {
r.Log.Info("couldn't get image", "err", err)
return nil, err
Expand All @@ -480,6 +482,29 @@ func (r *KataConfigOpenShiftReconciler) daemonSetForPeerPodsConfig(action KataDa
volumeMounts := r.volumeMountsForRegistries()
volumes := r.volumesForRegistries()

envVars := []corev1.EnvVar{
{
Name: "NODE_NAME",
ValueFrom: &corev1.EnvVarSource{
FieldRef: &corev1.ObjectFieldSelector{
FieldPath: "spec.nodeName",
},
},
},
}

for name, value := range cliImages {
envVars = append(envVars, corev1.EnvVar{
Name: name,
Value: value,
})
}

// Sort the envvars, so the order is always the same, otherwise kubernetes thinks the DaemonSet changed and rollout new Pods
slices.SortStableFunc[[]corev1.EnvVar, corev1.EnvVar](envVars, func(a corev1.EnvVar, b corev1.EnvVar) int {
return strings.Compare(a.Name, b.Name)
})

return &appsv1.DaemonSet{
TypeMeta: metav1.TypeMeta{
APIVersion: "apps/v1",
Expand Down Expand Up @@ -519,22 +544,9 @@ func (r *KataConfigOpenShiftReconciler) daemonSetForPeerPodsConfig(action KataDa
Privileged: &runPrivileged,
RunAsUser: &runAsUser,
},
Command: []string{"/bin/bash", "/scripts/osc-configs-script.sh"},
Args: []string{string(action)},
Env: []corev1.EnvVar{
{
Name: "NODE_NAME",
ValueFrom: &corev1.EnvVarSource{
FieldRef: &corev1.ObjectFieldSelector{
FieldPath: "spec.nodeName",
},
},
},
{
Name: "CLI_IMAGE",
Value: cliImageString,
},
},
Command: []string{"/bin/bash", "/scripts/osc-configs-script.sh"},
Args: []string{string(action)},
Env: envVars,
VolumeMounts: volumeMounts,
},
},
Expand All @@ -550,14 +562,14 @@ func (r *KataConfigOpenShiftReconciler) daemonSetForPeerPodsConfig(action KataDa
// The DaemonSet's Pod contains three containers: one installs the binaries, one modifies the node labels, and one sets the runtime log level.
func (r *KataConfigOpenShiftReconciler) daemonSetForKataInstall(action KataDaemonSetAction) (*appsv1.DaemonSet, error) {
// This image contains the binaries for kata-containers
extensionImageString, err := GetImageForComponent(rhelCoreOsExtensionsImageName, r.Client)
extensionImages, err := r.GetNodeImages(rhelCoreOsExtensionsImageName, "EXTENSION_IMAGE")
if err != nil {
r.Log.Error(err, "couldn't get extension image")
return nil, err
}

// This image contains kubectl and makes changing the node labels easier
cliImageString, err := GetImageForComponent(cliImageName, r.Client)
cliImages, err := r.GetNodeImages(cliImageName, "CLI_IMAGE")
if err != nil {
r.Log.Error(err, "couldn't get cli image")
return nil, err
Expand Down Expand Up @@ -592,26 +604,37 @@ func (r *KataConfigOpenShiftReconciler) daemonSetForKataInstall(action KataDaemo
},
},
},
{
Name: "EXTENSION_IMAGE",
Value: extensionImageString,
},
{
Name: "CLI_IMAGE",
Value: cliImageString,
},
{
Name: "NODE_LABEL",
Value: kataInstallationDaemonSetLabel,
},
}

for name, value := range extensionImages {
kataInstallEnv = append(kataInstallEnv, corev1.EnvVar{
Name: name,
Value: value,
})
}

for name, value := range cliImages {
kataInstallEnv = append(kataInstallEnv, corev1.EnvVar{
Name: name,
Value: value,
})
}

// Add addon environment variables if ConfigMap exists
addonEnvVars := r.getAddonEnvVars()
if addonEnvVars != nil {
kataInstallEnv = append(kataInstallEnv, addonEnvVars...)
}

// Sort the envvars, so the order is always the same, otherwise kubernetes thinks the DaemonSet changed and rollout new Pods
slices.SortStableFunc[[]corev1.EnvVar, corev1.EnvVar](kataInstallEnv, func(a corev1.EnvVar, b corev1.EnvVar) int {
return strings.Compare(a.Name, b.Name)
})

return &appsv1.DaemonSet{
TypeMeta: metav1.TypeMeta{
APIVersion: "apps/v1",
Expand Down
Loading