fix: minor fixes to increase mem limits, ubuntu 18, kubernetes-cni 0.6.0 (#159)

Author: awesomenix

cmd/clusterctl/examples/azure/machines.yaml.template

@@ -23,7 +23,7 @@ items:
           image:
             publisher: "Canonical"
             offer: "UbuntuServer"
-            sku: "16.04-LTS"
+            sku: "18.04-LTS"
             version: "latest"
           osDisk:
             osType: "Linux"
@@ -53,7 +53,7 @@ items:
           image:
             publisher: "Canonical"
             offer: "UbuntuServer"
-            sku: "16.04-LTS"
+            sku: "18.04-LTS"
             version: "latest"
           osDisk:
             osType: "Linux"

config/manager/manager.yaml

@@ -61,8 +61,8 @@ spec:
             - "-stderrthreshold=INFO"
           resources:
             limits:
-              cpu: 100m
-              memory: 30Mi
+              cpu: 200m
+              memory: 300Mi
             requests:
               cpu: 100m
               memory: 20Mi

pkg/cloud/azure/actuators/cluster/reconciler.go

@@ -119,7 +119,7 @@ func (s *Reconciler) Reconcile() error {
 		Name:              azure.GenerateNodeSubnetName(s.scope.Cluster.Name),
 		CIDR:              azure.DefaultNodeSubnetCIDR,
 		VnetName:          azure.GenerateVnetName(s.scope.Cluster.Name),
-		SecurityGroupName: azure.GenerateControlPlaneSecurityGroupName(s.scope.Cluster.Name),
+		SecurityGroupName: azure.GenerateNodeSecurityGroupName(s.scope.Cluster.Name),
 		RouteTableName:    azure.GenerateNodeRouteTableName(s.scope.Cluster.Name),
 	}
 	if err := s.subnetsSvc.CreateOrUpdate(s.scope.Context, subnetSpec); err != nil {

pkg/cloud/azure/services/config/controlplane.go

@@ -140,6 +140,7 @@ cat <<EOF >/etc/apt/sources.list.d/kubernetes.list
 deb https://apt.kubernetes.io/ kubernetes-xenial main
 EOF
 apt-get update
+apt-get install -y kubernetes-cni=0.6.0-00
 apt-get install -y kubelet="{{.KubernetesVersion}}-00" kubeadm="{{.KubernetesVersion}}-00" kubectl="{{.KubernetesVersion}}-00"
 apt-mark hold kubelet kubeadm kubectl
 
@@ -231,6 +232,7 @@ cat <<EOF >/etc/apt/sources.list.d/kubernetes.list
 deb https://apt.kubernetes.io/ kubernetes-xenial main
 EOF
 apt-get update
+apt-get install -y kubernetes-cni=0.6.0-00
 apt-get install -y kubelet="{{.KubernetesVersion}}-00" kubeadm="{{.KubernetesVersion}}-00" kubectl="{{.KubernetesVersion}}-00"
 apt-mark hold kubelet kubeadm kubectl
 

pkg/cloud/azure/services/config/node.go

@@ -89,6 +89,7 @@ cat <<EOF >/etc/apt/sources.list.d/kubernetes.list
 deb https://apt.kubernetes.io/ kubernetes-xenial main
 EOF
 apt-get update
+apt-get install -y kubernetes-cni=0.6.0-00
 apt-get install -y kubelet="{{.KubernetesVersion}}-00" kubeadm="{{.KubernetesVersion}}-00" kubectl="{{.KubernetesVersion}}-00"
 apt-mark hold kubelet kubeadm kubectl