Skip to content

Remove the deprecated image field #1498

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

Merged
lukasfrank merged 2 commits into from
Jul 13, 2026
Merged

Remove the deprecated image field #1498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3707975
Remove the deprecated image field
Rohit-0505 Jul 2, 2026
6ed6ace
address review comments
Jul 8, 2026
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
6 changes: 0 additions & 6 deletions api/compute/v1alpha1/machine_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,6 @@ type MachineSpec struct {
// Power is the desired machine power state.
// Defaults to PowerOn.
Power Power `json:"power,omitempty"`
// Deprecated: Use LocalDisk to provide a bootable disk
// Image is the optional URL providing the operating system image of the machine.
// +optional
Image string `json:"image,omitempty"`
// ImagePullSecretRef is an optional secret for pulling the image of a machine.
ImagePullSecretRef *corev1.LocalObjectReference `json:"imagePullSecret,omitempty"`
// NetworkInterfaces define a list of network interfaces present on the machine
// +optional
// +patchMergeKey=name
Expand Down
4 changes: 0 additions & 4 deletions api/compute/v1alpha1/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,6 @@ func MachineVolumeNames(machine *Machine) []string {
func MachineSecretNames(machine *Machine) []string {
var names []string

if imagePullSecretRef := machine.Spec.ImagePullSecretRef; imagePullSecretRef != nil {
names = append(names, imagePullSecretRef.Name)
}

if ignitionRef := machine.Spec.IgnitionRef; ignitionRef != nil {
names = append(names, ignitionRef.Name)
}
Expand Down
5 changes: 0 additions & 5 deletions api/compute/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions api/storage/v1alpha1/volume_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@ type VolumeSpec struct {
ClaimRef *commonv1alpha1.LocalUIDReference `json:"claimRef,omitempty"`
// Resources is a description of the volume's resources and capacity.
Resources corev1alpha1.ResourceList `json:"resources,omitempty"`
// Image is an optional image to bootstrap the volume with.
// To be deprecated
Image string `json:"image,omitempty"`
// ImagePullSecretRef is an optional secret for pulling the image of a volume.
ImagePullSecretRef *corev1.LocalObjectReference `json:"imagePullSecretRef,omitempty"`
// Unclaimable marks the volume as unclaimable.
Unclaimable bool `json:"unclaimable,omitempty"`
// Tolerations define tolerations the Volume has. Only any VolumePool whose taints
Expand All @@ -58,7 +53,6 @@ type VolumeDataSource struct {
type OSDataSource struct {
// Image is an optional image to bootstrap the volume with.
Image string `json:"image,omitempty"`

// Architecture defines the architecture of the OS which should be used
Architecture *string `json:"architecture,omitempty"`
}
Expand Down
5 changes: 0 additions & 5 deletions api/storage/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion broker/machinebroker/server/machine_create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,6 @@ func (s *Server) createIronCoreMachine(
MachinePoolSelector: s.cluster.MachinePoolSelector(),
MachinePoolRef: s.ironcoreMachinePoolRef(),
Power: cfg.Power,
ImagePullSecretRef: nil, // TODO: Specify as soon as available.
NetworkInterfaces: ironcoreMachineNics,
Volumes: ironcoreMachineVolumes,
IgnitionRef: ignitionRef,
Expand Down
1 change: 0 additions & 1 deletion broker/volumebroker/server/volume.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ func (s *Server) convertAggregateIronCoreVolume(volume *AggregateIronCoreVolume)
return &iri.Volume{
Metadata: metadata,
Spec: &iri.VolumeSpec{
Image: volume.Volume.Spec.Image,
Class: volume.Volume.Spec.VolumeClassRef.Name,
Resources: resources,
Encryption: s.convertIronCoreVolumeEncryption(volume),
Expand Down
8 changes: 1 addition & 7 deletions broker/volumebroker/server/volume_create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,13 @@ func (s *Server) getIronCoreVolumeConfig(_ context.Context, volume *iri.Volume)
)
labels[volumepoolletv1alpha1.VolumeUIDLabel] = volume.GetMetadata().GetLabels()[volumepoolletv1alpha1.VolumeUIDLabel]

var image string
var volumeSnapshotRef *corev1.LocalObjectReference
var osImageDataSource *storagev1alpha1.OSDataSource
image = volume.Spec.Image // TODO: Remove this once volume.Spec.Image is deprecated

if dataSource := volume.Spec.VolumeDataSource; dataSource != nil {
switch {
case dataSource.SnapshotDataSource != nil:
volumeSnapshotRef = &corev1.LocalObjectReference{Name: dataSource.SnapshotDataSource.SnapshotId}
image = "" // TODO: Remove this once volume.Spec.Image is deprecated
case dataSource.ImageDataSource != nil:
var architecture *string
if dataSource.ImageDataSource.Architecture != "" {
Expand All @@ -88,7 +85,6 @@ func (s *Server) getIronCoreVolumeConfig(_ context.Context, volume *iri.Volume)
Image: dataSource.ImageDataSource.Image,
Architecture: architecture,
}
image = dataSource.ImageDataSource.Image
}
}

Expand All @@ -107,9 +103,7 @@ func (s *Server) getIronCoreVolumeConfig(_ context.Context, volume *iri.Volume)
Resources: corev1alpha1.ResourceList{
corev1alpha1.ResourceStorage: *resource.NewQuantity(volume.Spec.Resources.StorageBytes, resource.DecimalSI),
},
Image: image, // TODO: Remove this once volume.Spec.Image is deprecated
ImagePullSecretRef: nil, // TODO: Fill if necessary
Encryption: encryption,
Encryption: encryption,
DataSource: storagev1alpha1.VolumeDataSource{
VolumeSnapshotRef: volumeSnapshotRef,
OSImage: osImageDataSource,
Expand Down
1 change: 0 additions & 1 deletion broker/volumebroker/server/volume_create_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ var _ = Describe("CreateVolume", func() {
Image: "test-image",
Architecture: ptr.To("amd64"),
}),
HaveField("Spec.Image", "test-image"),
HaveField("Spec.Resources", HaveLen(1)),
))
})
Expand Down
21 changes: 0 additions & 21 deletions client-go/applyconfigurations/compute/v1alpha1/machinespec.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 0 additions & 21 deletions client-go/applyconfigurations/storage/v1alpha1/volumespec.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion client-go/openapi/api_violations.report
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ API rule violation: list_type_missing,github.com/ironcore-dev/ironcore/api/stora
API rule violation: list_type_missing,github.com/ironcore-dev/ironcore/api/storage/v1alpha1,VolumePoolStatus,Conditions
API rule violation: list_type_missing,github.com/ironcore-dev/ironcore/api/storage/v1alpha1,VolumeSpec,Tolerations
API rule violation: list_type_missing,github.com/ironcore-dev/ironcore/api/storage/v1alpha1,VolumeStatus,Conditions
API rule violation: names_match,github.com/ironcore-dev/ironcore/api/compute/v1alpha1,MachineSpec,ImagePullSecretRef
API rule violation: names_match,github.com/ironcore-dev/ironcore/api/networking/v1alpha1,LoadBalancerSpec,IPs
API rule violation: names_match,github.com/ironcore-dev/ironcore/api/networking/v1alpha1,LoadBalancerStatus,IPs
API rule violation: names_match,github.com/ironcore-dev/ironcore/api/networking/v1alpha1,NATGatewayStatus,IPs
Expand Down
26 changes: 0 additions & 26 deletions client-go/openapi/zz_generated.openapi.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion config/samples/compute_v1alpha1_machine.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ spec:
name: machineclass-sample
# machinePoolRef:
# name: default
image: my-image
volumes:
- name: rootdisk # first disk is root disk
# priority: 0 # optional
Expand Down
6 changes: 4 additions & 2 deletions config/samples/e2e/bases/loadbalancer-public/machine1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ spec:
spec:
volumeClassRef:
name: volumeclass-sample
image: gardenlinux:rootfs-image
resources:
storage: 10Gi
storage: 10Gi
dataSource:
osImage:
image: gardenlinux:rootfs-image
6 changes: 4 additions & 2 deletions config/samples/e2e/bases/loadbalancer-public/machine2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ spec:
spec:
volumeClassRef:
name: volumeclass-sample
image: gardenlinux:rootfs-image
resources:
storage: 10Gi
storage: 10Gi
dataSource:
osImage:
image: gardenlinux:rootfs-image
6 changes: 4 additions & 2 deletions config/samples/e2e/bases/machine-with-ephemeral-resources/machine.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ spec:
spec:
volumeClassRef:
name: volumeclass-sample
image: gardenlinux:rootfs-image
resources:
storage: 10Gi
storage: 10Gi
dataSource:
osImage:
image: gardenlinux:rootfs-image
4 changes: 3 additions & 1 deletion config/samples/e2e/bases/machine-with-nonephemeral-resources/volume.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ metadata:
spec:
volumeClassRef:
name: volumeclass-sample
image: gardenlinux:rootfs-image
resources:
storage: 10Gi
dataSource:
osImage:
image: gardenlinux:rootfs-image
4 changes: 3 additions & 1 deletion config/samples/e2e/bases/network-peering/machine1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ spec:
spec:
volumeClassRef:
name: volumeclass-sample
image: gardenlinux:rootfs-image
resources:
storage: 10Gi
dataSource:
osImage:
image: gardenlinux:rootfs-image

4 changes: 3 additions & 1 deletion config/samples/e2e/bases/network-peering/machine2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ spec:
spec:
volumeClassRef:
name: volumeclass-sample
image: gardenlinux:rootfs-image
resources:
storage: 10Gi
dataSource:
osImage:
image: gardenlinux:rootfs-image

4 changes: 3 additions & 1 deletion config/samples/e2e/bases/network-policy/machine1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ spec:
spec:
volumeClassRef:
name: volumeclass-sample
image: gardenlinux:rootfs-image
resources:
storage: 10Gi
dataSource:
osImage:
image: gardenlinux:rootfs-image

4 changes: 3 additions & 1 deletion config/samples/e2e/bases/network-policy/machine2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ spec:
spec:
volumeClassRef:
name: volumeclass-sample
image: gardenlinux:rootfs-image
resources:
storage: 10Gi
dataSource:
osImage:
image: gardenlinux:rootfs-image

6 changes: 4 additions & 2 deletions config/samples/e2e/loadbalancer-public/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,11 @@ spec:
name: new-volumeClass
volumePoolRef:
name: new-volumePool
image: gardenlinux:rootfs-dev-20231025
resources:
storage: 15Gi
dataSource:
osImage:
image: gardenlinux:rootfs-dev-20231025
```

5. Update the `kustomization.yaml` with below content
Expand All @@ -49,4 +51,4 @@ patches:
- path: patch-machine.yaml
```

6. Run (`kubectl apply -k ./`)
6. Run (`kubectl apply -k ./`)
4 changes: 3 additions & 1 deletion config/samples/e2e/machine-with-ephemeral-resources/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,11 @@ spec:
name: new-volumeClass
volumePoolRef:
name: new-volumePool
image: gardenlinux:rootfs-dev-20231025
resources:
storage: 15Gi
dataSource:
osImage:
image: gardenlinux:rootfs-dev-20231025
```

5. Update the `kustomization.yaml` with below content
Expand Down
6 changes: 4 additions & 2 deletions config/samples/e2e/machine-with-non-ephemeral-resources/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,16 @@ metadata:
spec:
volumeClassRef:
name: new-volumeClass
image: new-image:rootfs
volumePoolRef:
name: new-volumePool
dataSource:
osImage:
image: gardenlinux:rootfs-dev-20231025
```
6. Update the `kustomization.yaml` with below content
```
patches:
- path: patch-machine.yaml
- path: patch-volume.yaml
```
7. Run (`kubectl apply -k ./`)
7. Run (`kubectl apply -k ./`)
Comment thread
Rohit-0505 marked this conversation as resolved.
Loading