Merge pull request #165 from 0xFelix/drop-image-labels

cleanup: Drop labels from images
kubevirt · Mar 25, 2024 · e132ab7 · e132ab7
2 parents 56d5665 + ddadf36
commit e132ab7
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/image/build_windows_containerdisk.sh b/image/build_windows_containerdisk.sh
@@ -101,11 +101,6 @@ podman build -t "${WINDOWS_VERSION}-container-disk:latest" -f - . << EOF
 FROM scratch
 ADD --chown=107:107 ${WINDOWS_VERSION}.qcow2 /disk/
 
-LABEL instancetype.kubevirt.io/default-instancetype ${DEFAULT_INSTANCETYPE}
-LABEL instancetype.kubevirt.io/default-preference ${DEFAULT_PREFERENCE}
-LABEL instancetype.kubevirt.io/display-needed true
-
-# Set ENVs for compatibility with crun-vm
 ENV INSTANCETYPE_KUBEVIRT_IO_DEFAULT_INSTANCETYPE ${DEFAULT_INSTANCETYPE}
 ENV INSTANCETYPE_KUBEVIRT_IO_DEFAULT_PREFERENCE ${DEFAULT_PREFERENCE}
 ENV INSTANCETYPE_KUBEVIRT_IO_DISPLAY_NEEDED true

diff --git a/image/validationos.Dockerfile b/image/validationos.Dockerfile
@@ -56,11 +56,6 @@ FROM scratch
 
 COPY --from=builder --chown=107:107 /disk.img /disk/
 
-LABEL instancetype.kubevirt.io/default-instancetype u1.large
-LABEL instancetype.kubevirt.io/default-preference windows.11
-LABEL instancetype.kubevirt.io/display-needed true
-
-# Set ENVs for compatibility with crun-vm
 ENV INSTANCETYPE_KUBEVIRT_IO_DEFAULT_INSTANCETYPE u1.large
 ENV INSTANCETYPE_KUBEVIRT_IO_DEFAULT_PREFERENCE windows.11
 ENV INSTANCETYPE_KUBEVIRT_IO_DISPLAY_NEEDED true