github/intel-device-plugins-for-kubernetes
7
0
Fork 0
mirror of https://github.com/intel/intel-device-plugins-for-kubernetes.git synced 2025-06-03 03:59:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

operator: add ctx to func UpgradeImages and logger for env vars of images

Browse Source 
Signed-off-by: Hyeongju Johannes Lee <hyeongju.lee@intel.com>
This commit is contained in:
Hyeongju Johannes Lee 2023-09-18 11:56:18 -07:00
parent 6a60c745d2
commit 20caa42e7a
9 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controllers/dlb/controller.go
View File

@ -68,7 +68,7 @@ func (c *controller) CreateEmptyObject() client.Object {
func (c *controller) Upgrade(ctx context.Context, obj client.Object) bool {
dp := obj.(*devicepluginv1.DlbDevicePlugin)
return controllers.UpgradeImages(&dp.Spec.Image, &dp.Spec.InitImage)
return controllers.UpgradeImages(ctx, &dp.Spec.Image, &dp.Spec.InitImage)
}
func (c *controller) GetTotalObjectCount(ctx context.Context, clnt client.Client) (int, error) {

2
pkg/controllers/dsa/controller.go
View File

@ -71,7 +71,7 @@ func (c *controller) CreateEmptyObject() client.Object {
func (c *controller) Upgrade(ctx context.Context, obj client.Object) bool {
dp := obj.(*devicepluginv1.DsaDevicePlugin)
return controllers.UpgradeImages(&dp.Spec.Image, &dp.Spec.InitImage)
return controllers.UpgradeImages(ctx, &dp.Spec.Image, &dp.Spec.InitImage)
}
func (c *controller) GetTotalObjectCount(ctx context.Context, clnt client.Client) (int, error) {

2
pkg/controllers/fpga/controller.go
View File

@ -67,7 +67,7 @@ func (c *controller) CreateEmptyObject() client.Object {
func (c *controller) Upgrade(ctx context.Context, obj client.Object) bool {
dp := obj.(*devicepluginv1.FpgaDevicePlugin)
return controllers.UpgradeImages(&dp.Spec.Image, &dp.Spec.InitImage)
return controllers.UpgradeImages(ctx, &dp.Spec.Image, &dp.Spec.InitImage)
}
func (c *controller) GetTotalObjectCount(ctx context.Context, clnt client.Client) (int, error) {

2
pkg/controllers/gpu/controller.go
View File

@ -72,7 +72,7 @@ func (c *controller) CreateEmptyObject() client.Object {
func (c *controller) Upgrade(ctx context.Context, obj client.Object) bool {
dp := obj.(*devicepluginv1.GpuDevicePlugin)
return controllers.UpgradeImages(&dp.Spec.Image, &dp.Spec.InitImage)
return controllers.UpgradeImages(ctx, &dp.Spec.Image, &dp.Spec.InitImage)
}
func (c *controller) GetTotalObjectCount(ctx context.Context, clnt client.Client) (int, error) {

2
pkg/controllers/iaa/controller.go
View File

@ -69,7 +69,7 @@ func (c *controller) CreateEmptyObject() client.Object {
func (c *controller) Upgrade(ctx context.Context, obj client.Object) bool {
dp := obj.(*devicepluginv1.IaaDevicePlugin)
return controllers.UpgradeImages(&dp.Spec.Image, &dp.Spec.InitImage)
return controllers.UpgradeImages(ctx, &dp.Spec.Image, &dp.Spec.InitImage)
}
func (c *controller) GetTotalObjectCount(ctx context.Context, clnt client.Client) (int, error) {

2
pkg/controllers/qat/controller.go
View File

@ -72,7 +72,7 @@ func (c *controller) CreateEmptyObject() client.Object {
func (c *controller) Upgrade(ctx context.Context, obj client.Object) bool {
dp := obj.(*devicepluginv1.QatDevicePlugin)
return controllers.UpgradeImages(&dp.Spec.Image, &dp.Spec.InitImage)
return controllers.UpgradeImages(ctx, &dp.Spec.Image, &dp.Spec.InitImage)
}
func (c *controller) GetTotalObjectCount(ctx context.Context, clnt client.Client) (int, error) {

4
pkg/controllers/reconciler.go
View File

@ -169,7 +169,7 @@ func (r *reconciler) createObjects(ctx context.Context,
return result, nil
}
func UpgradeImages(image *string, initimage *string) (upgrade bool) {
func UpgradeImages(ctx context.Context, image *string, initimage *string) (upgrade bool) {
for _, s := range []*string{image, initimage} {
if s == nil {
continue
@ -181,6 +181,8 @@ func UpgradeImages(image *string, initimage *string) (upgrade bool) {
envVarValue := os.Getenv(strings.ReplaceAll(strings.ToUpper(filepath.Base(name)), "-", "_") + "_SHA")
if envVarValue != "" && *s != envVarValue {
log.FromContext(ctx).Info("env var for the image: " + name + " is already set; user input of the image is ignored")
*s = envVarValue
upgrade = true

3
pkg/controllers/reconciler_test.go
View File

@ -15,6 +15,7 @@
package controllers
import (
"context"
"testing"
)
@ -63,7 +64,7 @@ func TestUpgrade(test *testing.T) {
for i := range tests {
t := tests[i]
upgrade := UpgradeImages(&t.image, &t.initimage)
upgrade := UpgradeImages(context.Background(), &t.image, &t.initimage)
if !(upgrade == t.upgrade && t.image == t.expectedImage && t.initimage == t.expectedInitimage) {
test.Errorf("expectedUpgrade: %v, received: %v", t.upgrade, upgrade)

2
pkg/controllers/sgx/controller.go
View File

@ -64,7 +64,7 @@ type controller struct {
func (c *controller) Upgrade(ctx context.Context, obj client.Object) bool {
dp := obj.(*devicepluginv1.SgxDevicePlugin)
return controllers.UpgradeImages(&dp.Spec.Image, &dp.Spec.InitImage)
return controllers.UpgradeImages(ctx, &dp.Spec.Image, &dp.Spec.InitImage)
}
func (c *controller) CreateEmptyObject() client.Object {