Skip to content

Commit 94d0bcc

Browse files
committed
fix cilium cluster creation
1 parent 7f5baaf commit 94d0bcc

File tree

1 file changed

+2
-15
lines changed

1 file changed

+2
-15
lines changed

test/e2e/framework/azure/create-cilium-cluster.go

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -83,21 +83,8 @@ func (c *CreateBYOCiliumCluster) Run() error {
8383
subnetkey := fmt.Sprintf("/subscriptions/%s/resourceGroups/%s/providers/Microsoft.Network/virtualNetworks/%s/subnets/%s", c.SubscriptionID, c.ResourceGroupName, c.VnetName, c.SubnetName)
8484
ciliumCluster.Properties.AgentPoolProfiles[0].VnetSubnetID = to.Ptr(subnetkey)
8585

86-
// Set the kubeproxy config
87-
kubeProxyConfig := armcontainerservice.NetworkProfileKubeProxyConfig{
88-
Mode: to.Ptr(armcontainerservice.ModeIPVS),
89-
Enabled: to.Ptr(false),
90-
IpvsConfig: to.Ptr(armcontainerservice.NetworkProfileKubeProxyConfigIpvsConfig{
91-
Scheduler: to.Ptr(armcontainerservice.IpvsSchedulerLeastConnection),
92-
TCPTimeoutSeconds: to.Ptr(int32(900)), //nolint:gomnd // set by existing kube-proxy in hack/aks/kube-proxy.json
93-
TCPFinTimeoutSeconds: to.Ptr(int32(120)), //nolint:gomnd // set by existing kube-proxy in hack/aks/kube-proxy.json
94-
UDPTimeoutSeconds: to.Ptr(int32(300)), //nolint:gomnd // set by existing kube-proxy in hack/aks/kube-proxy.json
95-
}),
96-
}
97-
98-
log.Printf("using kube-proxy config:\n")
99-
printjson(kubeProxyConfig)
100-
ciliumCluster.Properties.NetworkProfile.KubeProxyConfig = to.Ptr(kubeProxyConfig)
86+
// NOTE: In armcontainerservice/v4, KubeProxyConfig and related enums are not available.
87+
// For BYO Cilium, rely on Cilium’s kube-proxy replacement; no kube-proxy block is set here.
10188

10289
// Deploy cluster
10390
cred, err := azidentity.NewAzureCLICredential(nil)

0 commit comments

Comments
 (0)