Skip to content

Conversation

@pjohnst5
Copy link
Contributor

@pjohnst5 pjohnst5 commented Jun 8, 2023

Here's the general idea:

  • We change the conflists to 'overlay' for both dualstack and v4overlay, as well as make CNI capable of handling this 'overlay' option
  • We release this CNI and conflist change to AKS together (as always, since it's in a .tar file)
  • Update AKS to use this new CNI (dropgz) version
  • Roll that out to all of AKS
    ---- This is where all AKS clusters, have the same conflist now (basically) ----
    • The only clusters with different conflists, would be v4overlay linux using generator: true, but that would work the same as now

Final cleanup stage

  • In CNS, add a third 'overlay' generator, which generates 'overlay' conflist (without v4swift execution mode)
  • Release it in AKS
  • Change CNS configmap in AKS to use 'overlay' conflist generation
  • Remove 'dualstack' and 'v4overlay' options completely in CNS and CNI (generators, conflists, if statements, all of it)

…nd adding 'overlay' in same 'if' checks as 'v4' and 'dualstack', also removing v4swift from overlay conflists (isnt used)
@rbtr rbtr added enhancement cni Related to CNI. labels Jun 9, 2023
@rbtr rbtr requested a review from thatmattlong June 9, 2023 00:59
@rbtr
Copy link
Collaborator

rbtr commented Jun 9, 2023

/cc @thatmattlong for awareness

@pjohnst5
Copy link
Contributor Author

pjohnst5 commented Jun 9, 2023

  • Will also add CNS generator in this PR (even thoug it won't be used yet in AKS, until CNI is updated)
    Edit: Nvm, will make CNS generator it's own PR, to keep things scoped to 1 component only per PR

@pjohnst5 pjohnst5 marked this pull request as ready for review June 9, 2023 19:00
@pjohnst5 pjohnst5 requested a review from a team as a code owner June 9, 2023 19:00
@pjohnst5
Copy link
Contributor Author

pjohnst5 commented Jun 9, 2023

Tested this on a v4overlay cluster and pod to pod connectivity worked for both linux and windows
overlay-notes-and-testing.zip

Copy link
Collaborator

@rbtr rbtr left a comment

Choose a reason for hiding this comment

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

lgtm but I will defer to @tamilmani1989 to approve

Copy link
Member

@tamilmani1989 tamilmani1989 left a comment

Choose a reason for hiding this comment

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

lgtm

@pjohnst5 pjohnst5 enabled auto-merge (squash) June 12, 2023 16:34
@pjohnst5 pjohnst5 merged commit 0bc72e4 into Azure:master Jun 12, 2023
@pjohnst5 pjohnst5 deleted the paujohns/cni-overlay-consolidation-alternate branch June 12, 2023 17:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cni Related to CNI. enhancement

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants