Skip to content

Commit

Permalink
refactor: removing kubenet referencess
Browse files Browse the repository at this point in the history
  • Loading branch information
Bryce-Soghigian committed Jun 12, 2024
1 parent 887064b commit 36cc5a2
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 30 deletions.
6 changes: 1 addition & 5 deletions pkg/providers/imagefamily/bootstrap/aksbootstrap.go
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,6 @@ type NodeBootstrapVariables struct {
KubeletNodeLabels string // pk node-pool specific. user-specified.
AzureEnvironmentFilepath string // s can be made static [usually "/etc/kubernetes/azure.json", but my examples use ""?]
KubeCACrt string // x unique per cluster
KubenetTemplate string // s static
ContainerdConfigContent string // k determined by GPU VM size, WASM support, Kata support
IsKata bool // n user-specified
}
Expand All @@ -232,8 +231,6 @@ var (

//go:embed sysctl.conf
sysctlContent []byte
//go:embed kubenet-cni.json.gtpl
kubenetTemplate []byte

// source note: unique per nodepool. partially user-specified, static, and RP-generated
// removed --image-pull-progress-deadline=30m (not in 1.24?)
Expand Down Expand Up @@ -381,10 +378,10 @@ var (
SysctlContent: base64.StdEncoding.EncodeToString(sysctlContent), // td
KubeletFlags: "", // psX
AzureEnvironmentFilepath: "", // s
KubenetTemplate: base64.StdEncoding.EncodeToString(kubenetTemplate), // s
ContainerdConfigContent: "", // kd
IsKata: false, // n
NeedsCgroupV2: true, // s only static for karpenter
EnsureNoDupePromiscuousBridge: false, // We never use kubenet

}
)
Expand Down Expand Up @@ -439,7 +436,6 @@ func (a AKS) applyOptions(nbv *NodeBootstrapVariables) {
nbv.CNIPluginsURL = fmt.Sprintf("%s/cni-plugins/v1.1.1/binaries/cni-plugins-linux-%s-v1.1.1.tgz", globalAKSMirror, a.Arch)

// calculated values
nbv.EnsureNoDupePromiscuousBridge = nbv.NeedsContainerd && nbv.NetworkPlugin == "kubenet" && nbv.NetworkPolicy != "calico"
nbv.NetworkSecurityGroup = fmt.Sprintf("aks-agentpool-%s-nsg", a.ClusterID)
nbv.RouteTable = fmt.Sprintf("aks-agentpool-%s-routetable", a.ClusterID)

Expand Down
1 change: 0 additions & 1 deletion pkg/providers/imagefamily/bootstrap/cse_cmd.sh.gtpl
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ KUBELET_FLAGS="{{.KubeletFlags}}"
KUBELET_NODE_LABELS="{{.KubeletNodeLabels}}"
AZURE_ENVIRONMENT_FILEPATH="{{.AzureEnvironmentFilepath}}"
KUBE_CA_CRT="{{.KubeCACrt}}"
KUBENET_TEMPLATE="{{.KubenetTemplate}}"
CONTAINERD_CONFIG_CONTENT="{{.ContainerdConfigContent}}"
IS_KATA="{{.IsKata}}"
/usr/bin/nohup /bin/bash -c "/bin/bash /opt/azure/containers/provision_start.sh"
24 changes: 0 additions & 24 deletions pkg/providers/imagefamily/bootstrap/kubenet-cni.json.gtpl

This file was deleted.

0 comments on commit 36cc5a2

Please sign in to comment.