Skip to content
This repository has been archived by the owner on May 30, 2023. It is now read-only.

Merge Pro features into the regular image #1679

Merged
merged 8 commits into from
Mar 2, 2022

Conversation

sayanchowdhury
Copy link
Contributor

@sayanchowdhury sayanchowdhury commented Feb 28, 2022

Merge the Pro features into the regular image

The Pro image contains a few enhancements which is not present in the regular Flatcar images. This PR brings all those enhancements into the regular image.

This PR also updates the NVIDIA drivers to 510.47.03

Testing done

Jenkins CI http://jenkins.infra.kinvolk.io:8080/job/os/job/manifest/4959/cldsv/

Feb 28 07:11:33 sayan-gpu-test-2 setup-nvidia[28825]: +-----------------------------------------------------------------------------+
Feb 28 07:11:33 sayan-gpu-test-2 setup-nvidia[28825]: | NVIDIA-SMI 510.47.03    Driver Version: 510.47.03    CUDA Version: 11.6     |
Feb 28 07:11:33 sayan-gpu-test-2 setup-nvidia[28825]: |-------------------------------+----------------------+----------------------+
Feb 28 07:11:33 sayan-gpu-test-2 setup-nvidia[28825]: | GPU  Name        Persistence-M| Bus-Id        Disp.A | Volatile Uncorr. ECC |
Feb 28 07:11:33 sayan-gpu-test-2 setup-nvidia[28825]: | Fan  Temp  Perf  Pwr:Usage/Cap|         Memory-Usage | GPU-Util  Compute M. |
Feb 28 07:11:33 sayan-gpu-test-2 setup-nvidia[28825]: |                               |                      |               MIG M. |
Feb 28 07:11:33 sayan-gpu-test-2 setup-nvidia[28825]: |===============================+======================+======================|
Feb 28 07:11:33 sayan-gpu-test-2 setup-nvidia[28825]: |   0  Tesla M60           Off  | 00000001:00:00.0 Off |                  Off |
Feb 28 07:11:33 sayan-gpu-test-2 setup-nvidia[28825]: | N/A   26C    P0    39W / 150W |      0MiB /  8192MiB |      0%      Default |
Feb 28 07:11:33 sayan-gpu-test-2 setup-nvidia[28825]: |                               |                      |                  N/A |
Feb 28 07:11:33 sayan-gpu-test-2 setup-nvidia[28825]: +-------------------------------+----------------------+----------------------+
Feb 28 07:11:33 sayan-gpu-test-2 setup-nvidia[28825]:                                                                                
Feb 28 07:11:33 sayan-gpu-test-2 setup-nvidia[28825]: +-----------------------------------------------------------------------------+
Feb 28 07:11:33 sayan-gpu-test-2 setup-nvidia[28825]: | Processes:                                                                  |
Feb 28 07:11:33 sayan-gpu-test-2 setup-nvidia[28825]: |  GPU   GI   CI        PID   Type   Process name                  GPU Memory |
Feb 28 07:11:33 sayan-gpu-test-2 setup-nvidia[28825]: |        ID   ID                                                   Usage      |
Feb 28 07:11:33 sayan-gpu-test-2 setup-nvidia[28825]: |=============================================================================|
Feb 28 07:11:33 sayan-gpu-test-2 setup-nvidia[28825]: |  No running processes found                                                 |
Feb 28 07:11:33 sayan-gpu-test-2 setup-nvidia[28825]: +-----------------------------------------------------------------------------+
  • Changelog entries added in the respective changelog/ directory (user-facing change, bug fix, security fix, update)

@sayanchowdhury sayanchowdhury requested a review from a team February 28, 2022 10:23
Copy link
Contributor

@krnowak krnowak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, but I think it also needs to companion PR to scripts, where we drop azure_pro, ami_vmdk_pro and maybe gce_pro from VALID_IMG_TYPES in build_library/vm_image_util.sh and from the list in jenkins/formats-amd64-usr.txt.

@sayanchowdhury sayanchowdhury marked this pull request as ready for review March 2, 2022 07:46
@sayanchowdhury
Copy link
Contributor Author

@krnowak We would continue to ship the Flatcar Pro images. I've done some changes so that it uses the params of the regular images - https://github.com/flatcar-linux/scripts/pull/241/files

Signed-off-by: Sayan Chowdhury <schowdhury@microsoft.com>
Signed-off-by: Sayan Chowdhury <schowdhury@microsoft.com>
Signed-off-by: Sayan Chowdhury <schowdhury@microsoft.com>
Signed-off-by: Sayan Chowdhury <schowdhury@microsoft.com>
Signed-off-by: Sayan Chowdhury <schowdhury@microsoft.com>
Signed-off-by: Sayan Chowdhury <schowdhury@microsoft.com>
Signed-off-by: Sayan Chowdhury <schowdhury@microsoft.com>
Signed-off-by: Sayan Chowdhury <schowdhury@microsoft.com>
@sayanchowdhury sayanchowdhury merged commit ab16e18 into main Mar 2, 2022
@sayanchowdhury sayanchowdhury deleted the sayan/merge-pro-in-regular branch March 2, 2022 15:14
@sayanchowdhury sayanchowdhury moved this from Ready to Review to Ready to Release - 2022-03-21 in Flatcar Container Linux Releases Planning Mar 3, 2022
pothos added a commit that referenced this pull request Apr 28, 2022
Merge Pro features into the regular image
pothos added a commit that referenced this pull request Apr 28, 2022
Merge Pro features into the regular image
@pothos
Copy link
Contributor

pothos commented Apr 28, 2022

Cherry-picking this for flatcar-3033 and flatcar-3139

@t-lo t-lo removed this from Ready to Release - 2022-03-21 in Flatcar Container Linux Releases Planning Jan 17, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
3 participants