Skip to content

Commit

Permalink
Expose ANP priority in test templates for Agented VMs (#316)
Browse files Browse the repository at this point in the history
* Expose ANP priority in test templates for Agented VMs

Signed-off-by: Anand Kumar <kumaranand@vmware.com>

* Use ubuntu Vms for Azure agented tests

On Azure RHEL VM, when ExternalNode is added and deleted
repeatedly, antrea-agent goes into a weired state where
ExternalNode add event is ignored, as agent things there
is no change in the ExternalNode interface.

Tracking issue on antrea:

antrea-io/antrea#5192
antrea-io/antrea#5111
Signed-off-by: Anand Kumar <kumaranand@vmware.com>

---------

Signed-off-by: Anand Kumar <kumaranand@vmware.com>
  • Loading branch information
Anandkumar26 authored Nov 15, 2023
1 parent df221b8 commit 07ffbf7
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
12 changes: 6 additions & 6 deletions hack/terraform/azure/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,12 @@ variable "azure_vm_os_types_agented" {
init = "init_script_ubuntu.sh"
},
{
name = "rhel-host3"
offer = "RHEL-SAP-HA"
publisher = "RedHat"
sku = "8_4"
init = "init_script_rhel.sh"
}
name = "ubuntu-host3"
offer = "0001-com-ubuntu-server-focal"
publisher = "Canonical"
sku = "20_04-lts-gen2"
init = "init_script_ubuntu.sh"
},
]
}

Expand Down
1 change: 1 addition & 0 deletions test/integration/networkpolicy_e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ var _ = Describe(fmt.Sprintf("%s,%s: NetworkPolicy On Cloud Resources", focusAws
defaultANPParameters = k8stemplates.DefaultANPParameters{
Namespace: staticVMNS.Name,
Name: "deny-8080",
Priority: defaultAnpPriority,
Entity: &k8stemplates.EntitySelectorParameters{
Kind: labels.ExternalEntityLabelKeyKind + ": " + strings.ToLower(reflect.TypeOf(runtimev1alpha1.VirtualMachine{}).Name()),
},
Expand Down
2 changes: 1 addition & 1 deletion test/templates/default_anp.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ metadata:
name: {{.Name}}
namespace: {{.Namespace}}
spec:
priority: 2
priority: {{.Priority}}
appliedTo:
- externalEntitySelector:
matchLabels:
Expand Down

0 comments on commit 07ffbf7

Please sign in to comment.