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

chore: remove azure-vnet binaries which are installed from container #4295

Merged
merged 1 commit into from
May 28, 2024

Conversation

rbtr
Copy link
Contributor

@rbtr rbtr commented Apr 15, 2024

What type of PR is this?
/kind cleanup

What this PR does / why we need it:
Remove azure-vnet-cni-swift and azure-vnet-cni-overlay tarballs which have been superseded by dropgz images.

Which issue(s) this PR fixes:

Fixes #

Requirements:

Special notes for your reviewer:

Release note:

none

@coveralls
Copy link

coveralls commented Apr 15, 2024

Pull Request Test Coverage Report for Build 9274280896

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage remained the same at 75.969%

Totals Coverage Status
Change from base Build 9273907364: 0.0%
Covered Lines: 2627
Relevant Lines: 3458

💛 - Coveralls

@rbtr rbtr force-pushed the chore/cleanup-azure-vnet branch from a52ab47 to e7da447 Compare April 15, 2024 21:46
@rbtr rbtr requested a review from wedaly April 15, 2024 21:49
AbelHu
AbelHu previously requested changes Apr 16, 2024
Copy link
Member

@AbelHu AbelHu left a comment

Choose a reason for hiding this comment

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

Should we always not install cni for swift and overlay cni on WIndows nodes?
Currently we always call Install-VnetPlugins to install azurecni set in VNetCNIPluginsURL.
If we do not need to install swift and overlay cni, I think that rp can set it to empty and we can ignore it in Windows CSE.
Same question for Set-AzureCNIConfig
https://github.com/Azure/AgentBaker/blob/master/staging/cse/windows/azurecnifunc.ps1

@rbtr
Copy link
Contributor Author

rbtr commented Apr 16, 2024

Should we always not install cni for swift and overlay cni on WIndows nodes?

The CNI binary is being installed via init-container in swift and overlay, on Linux and Windows, and we don't need to bake it in to the Nodes anymore. It will also be installed via init-container in node-subnet/legacy for k8s 1.30+, so I left it there for now to keep supporting <=1.29.

However, I forgot that these tarballs also have the CNI conflist. We still need the conflist baked in for Windows nodes, so I am reverting what I changed on Windows for now. If we can move the conflist responsibility to CNS like we have done on Linux then we can remove them in the future.

@rbtr rbtr force-pushed the chore/cleanup-azure-vnet branch from e7da447 to 2d02129 Compare April 23, 2024 17:10
@rbtr rbtr force-pushed the chore/cleanup-azure-vnet branch from 2d02129 to 12f0d72 Compare April 23, 2024 17:14
@rbtr rbtr requested review from AbelHu and wedaly April 23, 2024 17:15
@rbtr rbtr force-pushed the chore/cleanup-azure-vnet branch 2 times, most recently from 62797dd to 199e6ea Compare May 6, 2024 21:01
@rbtr rbtr force-pushed the chore/cleanup-azure-vnet branch from 199e6ea to 4225c64 Compare May 6, 2024 21:03
@rbtr rbtr enabled auto-merge (squash) May 6, 2024 21:04
@rbtr
Copy link
Contributor Author

rbtr commented May 6, 2024

@AbelHu can you remove the block, I have reverted any change to Windows VHD for now.

Copy link
Contributor

@anujmaheshwari1 anujmaheshwari1 left a comment

Choose a reason for hiding this comment

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

lgtm, thanks!

Copy link
Member

@paulgmiller paulgmiller left a comment

Choose a reason for hiding this comment

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

Need to follow rp release with best effort.

Copy link
Member

@paulgmiller paulgmiller left a comment

Choose a reason for hiding this comment

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

but yes lets go!

@rbtr rbtr force-pushed the chore/cleanup-azure-vnet branch from 4225c64 to 4ccf0f5 Compare May 14, 2024 23:11
@rbtr rbtr requested a review from djsly as a code owner May 14, 2024 23:11
@rbtr rbtr force-pushed the chore/cleanup-azure-vnet branch from 4ccf0f5 to d28f538 Compare May 20, 2024 19:36
@rbtr rbtr force-pushed the chore/cleanup-azure-vnet branch from d28f538 to 353169d Compare May 28, 2024 18:09
@rbtr rbtr merged commit 4834afa into master May 28, 2024
25 of 26 checks passed
@rbtr rbtr deleted the chore/cleanup-azure-vnet branch May 28, 2024 19:45
@james-bjss
Copy link

james-bjss commented Jun 11, 2024

We have noticed after updating our nodes that the /etc/cni/net.d/10-azure.conflist file (CNI Config) is no longer present on the system. The daemonset config for the dropz init container is also missing the argument to generate this file. This breaks chaining CNI plugins like Kuma.

Example of our Daemonset:

   initContainers:
      - args:
        - deploy
        - --skip-verify
        - azure-vnet
        - -o
        - /opt/cni/bin/azure-vnet
        - azure-vnet-telemetry
        - -o
        - /opt/cni/bin/azure-vnet-telemetry
        - azure-swift.conflist
        - -o
        - /etc/cni/net.d/15-azure-swift.conflist

Elsewhere we can see in the azure-container-networking repositories that this is created by dropz where it has the following args to generate 10-azure.conflist. See: https://github.com/Azure/azure-container-networking/blob/de225e4d34f824c641a7cce906039addf8f64d49/.pipelines/mdnc/azure-cns-cni-1.5.4.yaml#L102C10-L102C208

Is this intentional or a regression? Newer nodes don't seem to have the 10-azure.conflist file and it looks like this may have started happening since the change on this PR or similar.

@wedaly
Copy link
Member

wedaly commented Jun 11, 2024

Is this intentional or a regression? Newer nodes don't seem to have the 10-azure.conflist file and it looks like this may have started happening since the change on this PR or similar.

hi @james-bjss I don't think the issue you described is related to this PR. Could you please create a new GitHub issue in https://github.com/Azure/AKS and tag me?

It would be helpful to include this information about your cluster (which you can get from az aks show)

  • k8s version
  • networkPlugin
  • networkPluginMode
  • podSubnetId (if any)

Thanks!

@james-bjss
Copy link

james-bjss commented Jun 11, 2024

Is this intentional or a regression? Newer nodes don't seem to have the 10-azure.conflist file and it looks like this may have started happening since the change on this PR or similar.

hi @james-bjss I don't think the issue you described is related to this PR. Could you please create a new GitHub issue in https://github.com/Azure/AKS and tag me?

It would be helpful to include this information about your cluster (which you can get from az aks show)

  • k8s version
  • networkPlugin
  • networkPluginMode
  • podSubnetId (if any)

Thanks!

Sure my colleague @fozturner is going to pick this up and raise a new issue. Agreed, we did some further testing and it seems unlikely its related to the above.

Done: Azure/AKS#4349

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.

7 participants