Skip to content
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

Remove deprecated pool.UserData usage #657

Merged
merged 1 commit into from
Nov 13, 2024
Merged

Remove deprecated pool.UserData usage #657

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
11 changes: 8 additions & 3 deletions pkg/controller/worker/machines.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (

// DeployMachineClasses generates and creates the ironcore specific machine classes.
func (w *workerDelegate) DeployMachineClasses(ctx context.Context) error {
machineClasses, machineClassSecrets, err := w.generateMachineClassAndSecrets()
machineClasses, machineClassSecrets, err := w.generateMachineClassAndSecrets(ctx)
if err != nil {
return fmt.Errorf("failed to generate machine classes and machine class secrets: %w", err)
}
Expand Down Expand Up @@ -85,7 +85,7 @@ func (w *workerDelegate) GenerateMachineDeployments(ctx context.Context) (worker
return machineDeployments, nil
}

func (w *workerDelegate) generateMachineClassAndSecrets() ([]*machinecontrollerv1alpha1.MachineClass, []*corev1.Secret, error) {
func (w *workerDelegate) generateMachineClassAndSecrets(ctx context.Context) ([]*machinecontrollerv1alpha1.MachineClass, []*corev1.Secret, error) {
var (
machineClasses []*machinecontrollerv1alpha1.MachineClass
machineClassSecrets []*corev1.Secret
Expand Down Expand Up @@ -150,6 +150,11 @@ func (w *workerDelegate) generateMachineClassAndSecrets() ([]*machinecontrollerv
return nil, nil, fmt.Errorf("failed to marshal machine class for machine pool %s: %w", pool.Name, err)
}

userData, err := worker.FetchUserData(ctx, w.client, w.worker.Namespace, pool)
if err != nil {
return nil, nil, fmt.Errorf("failed to fetch user data for machine pool %s: %w", pool.Name, err)
}

machineClass := &machinecontrollerv1alpha1.MachineClass{
ObjectMeta: metav1.ObjectMeta{
Name: className,
Expand Down Expand Up @@ -177,7 +182,7 @@ func (w *workerDelegate) generateMachineClassAndSecrets() ([]*machinecontrollerv
Labels: map[string]string{v1beta1constants.GardenerPurpose: v1beta1constants.GardenPurposeMachineClass},
},
Data: map[string][]byte{
ironcore.UserDataFieldName: pool.UserData,
ironcore.UserDataFieldName: userData,
},
}

Expand Down
33 changes: 25 additions & 8 deletions pkg/controller/worker/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,13 @@ var _ = BeforeSuite(func() {
})

var (
volumeName = "test-volume"
volumeSize = "10Gi"
volumeType = "fast"
volumeEncrypted = true
datVolumeName = "volume-1"
volumeName = "test-volume"
volumeSize = "10Gi"
volumeType = "fast"
volumeEncrypted = true
datVolumeName = "volume-1"
userDataSecretName = "userdata-secret-name"
userDataSecretDataKey = "userdata-secret-key"
)

func SetupTest() (*corev1.Namespace, *gardener.ChartApplier) {
Expand All @@ -147,6 +149,18 @@ func SetupTest() (*corev1.Namespace, *gardener.ChartApplier) {
chartApplier, err = gardener.NewChartApplierForConfig(cfg)
Expect(err).NotTo(HaveOccurred())

userDataSecret := &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Namespace: ns.Name,
Name: userDataSecretName,
},
Data: map[string][]byte{
userDataSecretDataKey: []byte("some-data"),
},
}
Expect(k8sClient.Create(ctx, userDataSecret)).To(Succeed())
DeferCleanup(k8sClient.Delete, userDataSecret)

// define test resources
pool = gardenerextensionv1alpha1.WorkerPool{
MachineType: "foo",
Expand All @@ -159,9 +173,12 @@ func SetupTest() (*corev1.Namespace, *gardener.ChartApplier) {
Name: "my-os",
Version: "1.0",
},
Minimum: 0,
Name: "pool",
UserData: []byte("some-data"),
Minimum: 0,
Name: "pool",
UserDataSecretRef: &corev1.SecretKeySelector{
LocalObjectReference: corev1.LocalObjectReference{Name: userDataSecretName},
Key: userDataSecretDataKey,
},
Volume: &gardenerextensionv1alpha1.Volume{
Name: &volumeName,
Type: &volumeType,
Expand Down