Support for Azure CNI Overlay #354
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zioproto
force-pushed
the
feature/azure-cni-overlay
branch
from
79a22fd
to
057c708
Compare
|
The feature is GA: What is in preview is the upgrade of a cluster from Azure CNI to Azure CNI Overlay |
zioproto
commented
May 23, 2023
main.tf
Outdated
| } | ||
|
|
||
| precondition { | ||
| condition = (var.network_plugin_mode == "overlay" && !regex("^Standard_DC[0-9]+s?_v2$", each.value.vm_size)) || (var.network_plugin_mode != "overlay") |
There was a problem hiding this comment.
I made a mistake here.
https://developer.hashicorp.com/terraform/language/functions/regex
I assumed regex would return false if it did not find a match, but instead regex returns an error.
@lonegunmanb do you think I can fix this using can() ?
https://developer.hashicorp.com/terraform/language/functions/can
There was a problem hiding this comment.
Yes, can() function is designed for such scenarios.
zioproto
force-pushed
the
feature/azure-cni-overlay
branch
from
057c708
to
1577495
Compare
|
Updating provider docs here: |
zioproto
force-pushed
the
feature/azure-cni-overlay
branch
from
1577495
to
23d1621
Compare
lonegunmanb
requested changes
May 24, 2023
variables.tf
Outdated
| @@ -678,6 +678,12 @@ variable "network_plugin" { | |||
| nullable = false | |||
| } | |||
|
|
|||
| variable "network_plugin_mode" { | |||
| type = string | |||
| description = "(Optional) Specifies the network plugin mode used for building the Kubernetes network. Possible value is Overlay. Changing this forces a new resource to be created." | |||
There was a problem hiding this comment.
Could be:
description = "(Optional) Specifies the network plugin mode used for building the Kubernetes network. Possible value is `Overlay`. Changing this forces a new resource to be created."
zioproto
force-pushed
the
feature/azure-cni-overlay
branch
from
23d1621
to
e9b80e7
Compare
|
I pushed I new commit. I also corrected |
lonegunmanb
requested changes
May 25, 2023
There was a problem hiding this comment.
We've got the following error in e2e test:
TestExamplesNamedCluster 2023-05-25T02:01:28Z command.go:185: │ Error: creating/updating "Resource: (ResourceId \"/subscriptions/xxx/resourceGroups/c91104ca6615093b-rg/providers/Microsoft.ContainerService/managedClusters/test-cluster\" / Api Version \"2023-01-02-preview\")": PUT https://management.azure.com/subscriptions/xxx/resourceGroups/c91104ca6615093b-rg/providers/Microsoft.ContainerService/managedClusters/test-cluster
TestExamplesNamedCluster 2023-05-25T02:01:28Z command.go:185: │ --------------------------------------------------------------------------------
TestExamplesNamedCluster 2023-05-25T02:01:28Z command.go:185: │ RESPONSE 409: 409 Conflict
TestExamplesNamedCluster 2023-05-25T02:01:28Z command.go:185: │ ERROR CODE: EtagMismatch
TestExamplesNamedCluster 2023-05-25T02:01:28Z command.go:185: │ --------------------------------------------------------------------------------
TestExamplesNamedCluster 2023-05-25T02:01:28Z command.go:185: │ {
TestExamplesNamedCluster 2023-05-25T02:01:28Z command.go:185: │ "code": "EtagMismatch",
TestExamplesNamedCluster 2023-05-25T02:01:28Z command.go:185: │ "details": [
TestExamplesNamedCluster 2023-05-25T02:01:28Z command.go:185: │ {
TestExamplesNamedCluster 2023-05-25T02:01:28Z command.go:185: │ "code": "Unspecified",
TestExamplesNamedCluster 2023-05-25T02:01:28Z command.go:185: │ "message": "rpc error: code = FailedPrecondition desc = Etag mismatched"
TestExamplesNamedCluster 2023-05-25T02:01:28Z command.go:185: │ }
TestExamplesNamedCluster 2023-05-25T02:01:28Z command.go:185: │ ],
TestExamplesNamedCluster 2023-05-25T02:01:28Z command.go:185: │ "message": "Failed to save managed cluster test-cluster in subscription xxx, resource group c91104ca6615093b-rg. Operation is not allowed: Another operation is in progress",
TestExamplesNamedCluster 2023-05-25T02:01:28Z command.go:185: │ "subcode": "PutManagedClusterAndAgentPools_FailedPrecondition"
TestExamplesNamedCluster 2023-05-25T02:01:28Z command.go:185: │ }
TestExamplesNamedCluster 2023-05-25T02:01:28Z command.go:185: │ --------------------------------------------------------------------------------
TestExamplesNamedCluster 2023-05-25T02:01:28Z command.go:185: │
TestExamplesNamedCluster 2023-05-25T02:01:28Z command.go:185: │
TestExamplesNamedCluster 2023-05-25T02:01:28Z command.go:185: │ with module.aks_cluster_name.azapi_update_resource.aks_cluster_post_create,
TestExamplesNamedCluster 2023-05-25T02:01:28Z command.go:185: │ on ../../main.tf line 468, in resource "azapi_update_resource" "aks_cluster_post_create":
TestExamplesNamedCluster 2023-05-25T02:01:28Z command.go:185: │ 468: resource "azapi_update_resource" "aks_cluster_post_create" {
TestExamplesNamedCluster 2023-05-25T02:01:28Z command.go:185: │
TestExamplesNamedCluster 2023-05-25T02:01:28Z command.go:185: ╵
Need further investigation.
|
@lonegunmanb can we run the e2e tests again please ? |
|
Hi @zioproto the pr failed version upgrade test, would you please merge your branch with the latest |
zioproto
force-pushed
the
feature/azure-cni-overlay
branch
from
e9b80e7
to
5248635
Compare
lonegunmanb
approved these changes
Jun 1, 2023
skolobov
pushed a commit
to skolobov/terraform-azurerm-aks
that referenced
this pull request
Oct 29, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Describe your changes
Support for Azure CNI Overlay
https://learn.microsoft.com/en-us/azure/aks/azure-cni-overlay
The product is now GA for Linux nodes only. The terraform preconditions take care of preventing invalid or preview configurations.
Issue number
Closes #319
Checklist before requesting a review
CHANGELOG.mdfile