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.

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

add cloud-node-manager/credential provider v1.32.2 to vhd image #5907

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

MartinForReal
Copy link
Contributor

What type of PR is this?
/kind cleanup

What this PR does / why we need it:
add cloud-node-manager:v1.32.1 to vhd image
Which issue(s) this PR fixes:

Fixes #

Requirements:

Special notes for your reviewer:

Release note:

none

@@ -470,6 +470,10 @@
"renovateTag": "registry=https://mcr.microsoft.com, name=oss/kubernetes/azure-cloud-node-manager",
"latestVersion": "v1.31.2",
"previousLatestVersion": "v1.31.1"
},
Copy link
Member

Choose a reason for hiding this comment

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

Since renovate can only bump versions and cannot create new release, we don't have to rely on renovate to introduce this cache.

Copy link
Collaborator

Choose a reason for hiding this comment

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

You are right

@mainred
Copy link
Member

mainred commented Feb 25, 2025

I know @timmy-wright fixed the windows quota issue once, but sure if you can help fix it again and help review the PR.

@MartinForReal MartinForReal changed the title add cloud-node-manager/credential provider v1.32.1 to vhd image add cloud-node-manager/credential provider v1.32.2 to vhd image Feb 27, 2025
@MartinForReal
Copy link
Contributor Author

@Devinwong PTAL. Thanks!

@MartinForReal
Copy link
Contributor Author

@Devinwong I'm wondering if there is any workaround to fix disk full issue in windows VHD

@Devinwong
Copy link
Collaborator

Devinwong commented Mar 4, 2025

@Devinwong I'm wondering if there is any workaround to fix disk full issue in windows VHD

Sorry for late reply. I will defer to @timmy-wright for Windows question. 🙂

@Devinwong
Copy link
Collaborator

But you also need to resolve the conflict first.

@@ -1274,7 +1290,7 @@
{
"k8sVersion": "1.32",
"renovateTag": "OCI_registry=https://mcr.microsoft.com, name=oss/binaries/kubernetes/kubernetes-node",
"latestVersion": "v1.32.1",
"latestVersion": "v1.32.2",
Copy link
Contributor

Choose a reason for hiding this comment

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

This seems odd that we're updating latestVersion and not updateing previousLatestVersion - usually we'd change previousLatest to the previous latest rather than leave it the same.

Copy link
Collaborator

Choose a reason for hiding this comment

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

correct. The idea is lastest and latest-1

@@ -470,6 +470,10 @@
"renovateTag": "registry=https://mcr.microsoft.com, name=oss/kubernetes/azure-cloud-node-manager",
"latestVersion": "v1.31.2",
"previousLatestVersion": "v1.31.1"
},
Copy link
Contributor

Choose a reason for hiding this comment

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

This file should not need updating - it's just test data.

Copy link
Contributor

@timmy-wright timmy-wright left a comment

Choose a reason for hiding this comment

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

  • revert the changes to components-test.json. It's a test file and we shouldn't change it unless we're adding a new feature to the file.
  • This PR is likely to hit our VHD size issue, so we might need to remove some older versions of azure-cloud-node-manager
  • one change to the cached version doesn't seem to have updated the previousVersion that we cache on the VHD. This risks a mismatch between what RP wants and what the VHD provides. Which can create IcMs (I had a sev2 yesterday due to this!)

Copy link
Contributor

github-actions bot commented Mar 7, 2025

Changes cached containers or packages on windows VHDs

diff --git a/vhd_files/2019-containerd.txt b/vhd_files/2019-containerd.txt
index 6bb701f..7ae2d0c 100644
--- a/vhd_files/2019-containerd.txt
+++ b/vhd_files/2019-containerd.txt
@@ -11,0 +12 @@
+  "c:\\akse-cache\\credential-provider\\: https://acs-mirror.azureedge.net/cloud-provider-azure/v1.32.3/binaries/azure-acr-credential-provider-windows-amd64-v1.32.3.tar.gz",
@@ -83,0 +85,2 @@
+  "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.32.3",
+  "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.32.3-windows-hpc",
diff --git a/vhd_files/2022-containerd-gen2.txt b/vhd_files/2022-containerd-gen2.txt
index 78ffba2..525c8d1 100644
--- a/vhd_files/2022-containerd-gen2.txt
+++ b/vhd_files/2022-containerd-gen2.txt
@@ -11,0 +12 @@
+  "c:\\akse-cache\\credential-provider\\: https://acs-mirror.azureedge.net/cloud-provider-azure/v1.32.3/binaries/azure-acr-credential-provider-windows-amd64-v1.32.3.tar.gz",
@@ -122,0 +124,2 @@
+  "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.32.3",
+  "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.32.3-windows-hpc",
diff --git a/vhd_files/2022-containerd.txt b/vhd_files/2022-containerd.txt
index 64af0c8..5ba31f3 100644
--- a/vhd_files/2022-containerd.txt
+++ b/vhd_files/2022-containerd.txt
@@ -11,0 +12 @@
+  "c:\\akse-cache\\credential-provider\\: https://acs-mirror.azureedge.net/cloud-provider-azure/v1.32.3/binaries/azure-acr-credential-provider-windows-amd64-v1.32.3.tar.gz",
@@ -122,0 +124,2 @@
+  "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.32.3",
+  "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.32.3-windows-hpc",
diff --git a/vhd_files/2025-gen2.txt b/vhd_files/2025-gen2.txt
index d81cabf..0137be4 100644
--- a/vhd_files/2025-gen2.txt
+++ b/vhd_files/2025-gen2.txt
@@ -10,0 +11 @@
+  "c:\\akse-cache\\credential-provider\\: https://acs-mirror.azureedge.net/cloud-provider-azure/v1.32.3/binaries/azure-acr-credential-provider-windows-amd64-v1.32.3.tar.gz",
@@ -63,0 +65,2 @@
+  "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.32.3",
+  "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.32.3-windows-hpc",
diff --git a/vhd_files/2025.txt b/vhd_files/2025.txt
index 7f05175..b35596f 100644
--- a/vhd_files/2025.txt
+++ b/vhd_files/2025.txt
@@ -10,0 +11 @@
+  "c:\\akse-cache\\credential-provider\\: https://acs-mirror.azureedge.net/cloud-provider-azure/v1.32.3/binaries/azure-acr-credential-provider-windows-amd64-v1.32.3.tar.gz",
@@ -63,0 +65,2 @@
+  "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.32.3",
+  "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.32.3-windows-hpc",
diff --git a/vhd_files/23H2-gen2.txt b/vhd_files/23H2-gen2.txt
index df56e04..36ba3b4 100644
--- a/vhd_files/23H2-gen2.txt
+++ b/vhd_files/23H2-gen2.txt
@@ -10,0 +11 @@
+  "c:\\akse-cache\\credential-provider\\: https://acs-mirror.azureedge.net/cloud-provider-azure/v1.32.3/binaries/azure-acr-credential-provider-windows-amd64-v1.32.3.tar.gz",
@@ -69,0 +71,2 @@
+  "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.32.3",
+  "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.32.3-windows-hpc",
diff --git a/vhd_files/23H2.txt b/vhd_files/23H2.txt
index 7b8f61f..7c0ab8e 100644
--- a/vhd_files/23H2.txt
+++ b/vhd_files/23H2.txt
@@ -10,0 +11 @@
+  "c:\\akse-cache\\credential-provider\\: https://acs-mirror.azureedge.net/cloud-provider-azure/v1.32.3/binaries/azure-acr-credential-provider-windows-amd64-v1.32.3.tar.gz",
@@ -69,0 +71,2 @@
+  "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.32.3",
+  "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.32.3-windows-hpc",

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants