Use Subresource to mutate NamespacedCloudProfile status (gardener#11036)

Author: LucaBernstein

pkg/provider-local/admission/mutator/webhook.go

@@ -6,6 +6,7 @@ package mutator
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 
@@ -31,7 +32,7 @@ func New(mgr manager.Manager) (*extensionswebhook.Webhook, error) {
 		Path:     "/webhooks/mutate",
 		Mutators: map[extensionswebhook.Mutator][]extensionswebhook.Type{
 			NewShootMutator(mgr):                  {{Obj: &gardencorev1beta1.Shoot{}}},
-			NewNamespacedCloudProfileMutator(mgr): {{Obj: &gardencorev1beta1.NamespacedCloudProfile{}}},
+			NewNamespacedCloudProfileMutator(mgr): {{Obj: &gardencorev1beta1.NamespacedCloudProfile{}, Subresource: ptr.To("status")}},
 		},
 		Target: extensionswebhook.TargetSeed,
 		ObjectSelector: &metav1.LabelSelector{

test/e2e/gardener/shoot/create_hibernate_wakeup_delete.go

@@ -11,10 +11,18 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	. "github.com/onsi/gomega/gstruct"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/serializer"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	"k8s.io/utils/ptr"
 	k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/gardener/gardener/extensions/pkg/util"
 	gardencorev1beta1 "github.com/gardener/gardener/pkg/apis/core/v1beta1"
 	v1beta1helper "github.com/gardener/gardener/pkg/apis/core/v1beta1/helper"
+	api "github.com/gardener/gardener/pkg/provider-local/apis/local"
+	"github.com/gardener/gardener/pkg/provider-local/apis/local/install"
 	"github.com/gardener/gardener/pkg/utils/retry"
 	. "github.com/gardener/gardener/pkg/utils/test/matchers"
 	e2e "github.com/gardener/gardener/test/e2e/gardener"
@@ -32,12 +40,18 @@ var _ = Describe("Shoot Tests", Label("Shoot", "default"), func() {
 
 			if shoot.Spec.CloudProfileName == nil && shoot.Spec.CloudProfile != nil && shoot.Spec.CloudProfile.Kind == "NamespacedCloudProfile" {
 				By("Create NamespacedCloudProfile")
-				Expect(f.GardenClient.Client().Create(ctx, e2e.DefaultNamespacedCloudProfile())).To(Or(Succeed(), BeAlreadyExistsError()))
+				namespacedCloudProfile := addCustomMachineImage(e2e.DefaultNamespacedCloudProfile())
+				Expect(f.GardenClient.Client().Create(ctx, namespacedCloudProfile)).To(Or(Succeed()))
+				DeferCleanup(func() {
+					By("Delete NamespacedCloudProfile")
+					ctx, cancel = context.WithTimeout(parentCtx, 15*time.Minute)
+					defer cancel()
+					Expect(f.GardenClient.Client().Delete(ctx, namespacedCloudProfile)).To(Or(Succeed(), BeNotFoundError()))
+				})
 
 				By("Wait for new NamespacedCloudProfile to be reconciled")
 				Expect(retry.UntilTimeout(ctx, 10*time.Second, 60*time.Second, func(ctx context.Context) (done bool, err error) {
-					namespacedCloudProfile := &gardencorev1beta1.NamespacedCloudProfile{}
-					err = f.GardenClient.Client().Get(ctx, k8sclient.ObjectKeyFromObject(e2e.DefaultNamespacedCloudProfile()), namespacedCloudProfile)
+					err = f.GardenClient.Client().Get(ctx, k8sclient.ObjectKeyFromObject(namespacedCloudProfile), namespacedCloudProfile)
 					if err != nil {
 						return retry.SevereError(err)
 					}
@@ -47,12 +61,20 @@ var _ = Describe("Shoot Tests", Label("Shoot", "default"), func() {
 					return retry.Ok()
 				})).To(Succeed())
 
-				DeferCleanup(func() {
-					By("Delete NamespacedCloudProfile")
-					ctx, cancel = context.WithTimeout(parentCtx, 15*time.Minute)
-					defer cancel()
-					Expect(f.GardenClient.Client().Delete(ctx, e2e.DefaultNamespacedCloudProfile())).To(Or(Succeed(), BeNotFoundError()))
-				})
+				By("Check for correct mutation of the status provider config")
+				scheme := f.GardenClient.Client().Scheme()
+				utilruntime.Must(install.AddToScheme(scheme))
+
+				cloudProfileConfig := &api.CloudProfileConfig{}
+				decoder := serializer.NewCodecFactory(scheme, serializer.EnableStrict).UniversalDecoder()
+				Expect(namespacedCloudProfile.Status.CloudProfileSpec.ProviderConfig).To(Not(BeNil()))
+				Expect(util.Decode(decoder, namespacedCloudProfile.Status.CloudProfileSpec.ProviderConfig.Raw, cloudProfileConfig)).To(Succeed())
+				Expect(cloudProfileConfig.MachineImages).To(ContainElement(MatchFields(IgnoreExtras, Fields{
+					"Name": Equal("nscpfl-machine-image-1"),
+					"Versions": ContainElements(
+						api.MachineImageVersion{Version: "1.1", Image: "local/image:1.1"},
+					),
+				})))
 			}
 
 			By("Create Shoot")
@@ -103,3 +125,24 @@ var _ = Describe("Shoot Tests", Label("Shoot", "default"), func() {
 		test(shoot)
 	})
 })
+
+func addCustomMachineImage(namespacedCloudProfile *gardencorev1beta1.NamespacedCloudProfile) *gardencorev1beta1.NamespacedCloudProfile {
+	namespacedCloudProfile.Spec.MachineImages = []gardencorev1beta1.MachineImage{
+		{
+			Name:           "nscpfl-machine-image-1",
+			UpdateStrategy: ptr.To(gardencorev1beta1.UpdateStrategyMinor),
+			Versions: []gardencorev1beta1.MachineImageVersion{
+				{ExpirableVersion: gardencorev1beta1.ExpirableVersion{Version: "1.1"}, Architectures: []string{"amd64"}, CRI: []gardencorev1beta1.CRI{{Name: "containerd"}}},
+			},
+		},
+	}
+	namespacedCloudProfile.Spec.ProviderConfig = &runtime.RawExtension{
+		Raw: []byte(`{
+			"apiVersion":"local.provider.extensions.gardener.cloud/v1alpha1",
+			"kind":"CloudProfileConfig",
+			"machineImages":[
+			 {"name":"nscpfl-machine-image-1","versions":[{"version":"1.1","image":"local/image:1.1"}]}
+			]}`),
+	}
+	return namespacedCloudProfile
+}