chore: simplify addons config for calico and flannel

parts/k8s/addons/1.15/calico.yaml

@@ -23,7 +23,12 @@ data:
           "datastore_type": "kubernetes",
           "nodename": "__KUBERNETES_NODE_NAME__",
           "mtu": 1500,
-          "ipam": <calicoIPAMConfig>,
+{{- if not IsAzureCNI}}
+          "ipam": {
+              "type": "host-local",
+              "subnet": "usePodCidr"
+          },
+{{- end}}
           "policy": {
               "type": "k8s"
           },
@@ -394,7 +399,7 @@ spec:
         - name: USE_POD_CIDR
           value: "true"
         - name: FELIX_INTERFACEPREFIX
-          value: "azv"
+          value: "{{if IsAzureCNI}}azv{{else}}cali{{end}}"
         # Uncomment these lines to enable prometheus metrics.  Since Typha is host-networked,
         # this opens a port on the host, which may need to be secured.
         #- name: TYPHA_PROMETHEUSMETRICSENABLED
@@ -464,8 +469,8 @@ spec:
       terminationGracePeriodSeconds: 0
       priorityClassName: system-node-critical
       initContainers:
-      {{- /* Start of install-cni initContainer
-      This container installs the CNI binaries
+{{- if not IsAzureCNI}}
+      {{- /* This container installs the CNI binaries
       and CNI network config file on each node. */}}
       - name: install-cni
         image: {{ContainerImage "calico-cni"}}
@@ -493,8 +498,8 @@ spec:
           name: cni-bin-dir
         - mountPath: /host/etc/cni/net.d
           name: cni-net-dir
-      {{- /* End of install-cni initContainer
-      Adds a Flex Volume Driver that creates a per-pod Unix Domain Socket to allow Dikastes
+{{- end}}
+      {{- /* Adds a Flex Volume Driver that creates a per-pod Unix Domain Socket to allow Dikastes
       to communicate with Felix over the Policy Sync API. */}}
       - name: flexvol-driver
         image: {{ContainerImage "calico-pod2daemon"}}
@@ -538,7 +543,7 @@ spec:
         chosen from this range. Changing this value after installation will have
         no effect. This should fall within `--cluster-cidr`. */}}
         - name: CALICO_IPV4POOL_CIDR
-          value: "<kubeClusterCidr>"
+          value: "{{GetClusterSubnet}}"
         {{- /* Disable file logging so `kubectl logs` works. */}}
         - name: CALICO_DISABLE_FILE_LOGGING
           value: "true"
@@ -556,7 +561,7 @@ spec:
         - name: CALICO_IPV4POOL_IPIP
           value: "off"
         - name: FELIX_INTERFACEPREFIX
-          value: "azv"
+          value: "{{if IsAzureCNI}}azv{{else}}cali{{end}}"
         securityContext:
           privileged: true
         resources:

parts/k8s/addons/calico.yaml

@@ -23,7 +23,12 @@ data:
           "datastore_type": "kubernetes",
           "nodename": "__KUBERNETES_NODE_NAME__",
           "mtu": 1500,
-          "ipam": <calicoIPAMConfig>,
+{{- if not IsAzureCNI}}
+          "ipam": {
+              "type": "host-local",
+              "subnet": "usePodCidr"
+          },
+{{- end}}
           "policy": {
               "type": "k8s"
           },
@@ -392,7 +397,7 @@ spec:
         - name: USE_POD_CIDR
           value: "true"
         - name: FELIX_INTERFACEPREFIX
-          value: "azv"
+          value: "{{if IsAzureCNI}}azv{{else}}cali{{end}}"
         # Uncomment these lines to enable prometheus metrics.  Since Typha is host-networked,
         # this opens a port on the host, which may need to be secured.
         #- name: TYPHA_PROMETHEUSMETRICSENABLED
@@ -525,7 +530,7 @@ spec:
         chosen from this range. Changing this value after installation will have
         no effect. This should fall within `--cluster-cidr`. */}}
         - name: CALICO_IPV4POOL_CIDR
-          value: "<kubeClusterCidr>"
+          value: "{{GetClusterSubnet}}"
         {{- /* Disable file logging so `kubectl logs` works. */}}
         - name: CALICO_DISABLE_FILE_LOGGING
           value: "true"
@@ -543,7 +548,7 @@ spec:
         - name: CALICO_IPV4POOL_IPIP
           value: "off"
         - name: FELIX_INTERFACEPREFIX
-          value: "azv"
+          value: "{{if IsAzureCNI}}azv{{else}}cali{{end}}"
         - name: FELIX_USAGEREPORTINGENABLED
           value: "{{ContainerConfig "usageReportingEnabled"}}"
         securityContext:

parts/k8s/addons/flannel.yaml

@@ -28,7 +28,7 @@ data:
     }
   net-conf.json: |
     {
-      "Network": "<kubeClusterCidr>",
+      "Network": "{{GetClusterSubnet}}",
       "Backend": {
         "Type": "vxlan"
       }

parts/k8s/cloud-init/masternodecustomdata.yml

@@ -466,18 +466,6 @@ MASTER_CONTAINER_ADDONS_PLACEHOLDER
     sed -i "s|<advertiseAddr>|$PRIVATE_IP|g" /etc/kubernetes/manifests/kube-apiserver.yaml
 {{- if EnableDataEncryptionAtRest }}
     sed -i "s|<etcdEncryptionSecret>|\"{{WrapAsParameter "etcdEncryptionKey"}}\"|g" /etc/kubernetes/encryption-config.yaml
-{{end}}
-{{- if eq .OrchestratorProfile.KubernetesConfig.NetworkPolicy "calico"}}
-    sed -i "s|<kubeClusterCidr>|{{WrapAsParameter "kubeClusterCidr"}}|g" /etc/kubernetes/addons/calico.yaml
-    {{- if eq .OrchestratorProfile.KubernetesConfig.NetworkPlugin "azure"}}
-    sed -i "/Start of install-cni initContainer/,/End of install-cni initContainer/d" /etc/kubernetes/addons/calico.yaml
-    {{else}}
-    sed -i "s|<calicoIPAMConfig>|{\"type\": \"host-local\", \"subnet\": \"usePodCidr\"}|g" /etc/kubernetes/addons/calico.yaml
-    sed -i "s|azv|cali|g" /etc/kubernetes/addons/calico.yaml
-    {{end}}
-{{end}}
-{{- if eq .OrchestratorProfile.KubernetesConfig.NetworkPlugin "flannel"}}
-    sed -i "s|<kubeClusterCidr>|{{WrapAsParameter "kubeClusterCidr"}}|g" /etc/kubernetes/addons/flannel.yaml
 {{end}}
     #EOF
 

pkg/engine/engine.go

@@ -814,6 +814,12 @@ func getAddonFuncMap(addon api.KubernetesAddon, cs *api.ContainerService) templa
 		"GetMode": func() string {
 			return addon.Mode
 		},
+		"GetClusterSubnet": func() string {
+			return cs.Properties.OrchestratorProfile.KubernetesConfig.ClusterSubnet
+		},
+		"IsAzureCNI": func() bool {
+			return cs.Properties.OrchestratorProfile.IsAzureCNI()
+		},
 	}
 }
 

pkg/engine/engine_test.go

@@ -2495,6 +2495,8 @@ func TestGetAddonFuncMap(t *testing.T) {
 		expectedShouldEnableAzureFileCSISnapshotFeature   bool
 		expectedIsKubernetesVersionGeOneDotSixteenDotZero bool
 		expectedMode                                      string
+		expectedGetClusterSubnet                          string
+		expectedIsAzureCNI                                bool
 	}{
 		{
 			name: "coredns as an example",
@@ -2542,6 +2544,7 @@ func TestGetAddonFuncMap(t *testing.T) {
 									},
 								},
 							},
+							ClusterSubnet: "10.239.0.0/16",
 						},
 					},
 					AgentPoolProfiles: []*api.AgentPoolProfile{
@@ -2573,7 +2576,9 @@ func TestGetAddonFuncMap(t *testing.T) {
 			expectedShouldEnableAzureDiskCSISnapshotFeature:   false,
 			expectedShouldEnableAzureFileCSISnapshotFeature:   true,
 			expectedIsKubernetesVersionGeOneDotSixteenDotZero: false,
-			expectedMode: api.AddonModeEnsureExists,
+			expectedMode:             api.AddonModeEnsureExists,
+			expectedGetClusterSubnet: "10.239.0.0/16",
+			expectedIsAzureCNI:       true,
 		},
 		{
 			name: "coredns as an example - Azure Stack",
@@ -2621,6 +2626,7 @@ func TestGetAddonFuncMap(t *testing.T) {
 									},
 								},
 							},
+							ClusterSubnet: "10.239.0.0/16",
 						},
 					},
 					AgentPoolProfiles: []*api.AgentPoolProfile{
@@ -2656,7 +2662,9 @@ func TestGetAddonFuncMap(t *testing.T) {
 			expectedShouldEnableAzureDiskCSISnapshotFeature:   false,
 			expectedShouldEnableAzureFileCSISnapshotFeature:   true,
 			expectedIsKubernetesVersionGeOneDotSixteenDotZero: false,
-			expectedMode: api.AddonModeEnsureExists,
+			expectedMode:             api.AddonModeEnsureExists,
+			expectedGetClusterSubnet: "10.239.0.0/16",
+			expectedIsAzureCNI:       true,
 		},
 		{
 			name: "coredns as an example - StorageAccount",
@@ -2704,6 +2712,7 @@ func TestGetAddonFuncMap(t *testing.T) {
 									},
 								},
 							},
+							ClusterSubnet: "10.239.0.0/16",
 						},
 					},
 					AgentPoolProfiles: []*api.AgentPoolProfile{
@@ -2735,7 +2744,9 @@ func TestGetAddonFuncMap(t *testing.T) {
 			expectedShouldEnableAzureDiskCSISnapshotFeature:   false,
 			expectedShouldEnableAzureFileCSISnapshotFeature:   true,
 			expectedIsKubernetesVersionGeOneDotSixteenDotZero: false,
-			expectedMode: api.AddonModeEnsureExists,
+			expectedMode:             api.AddonModeEnsureExists,
+			expectedGetClusterSubnet: "10.239.0.0/16",
+			expectedIsAzureCNI:       true,
 		},
 		{
 			name: "coredns as an example - CCM",
@@ -2784,6 +2795,7 @@ func TestGetAddonFuncMap(t *testing.T) {
 									},
 								},
 							},
+							ClusterSubnet: "10.239.0.0/16",
 						},
 					},
 					AgentPoolProfiles: []*api.AgentPoolProfile{
@@ -2815,7 +2827,9 @@ func TestGetAddonFuncMap(t *testing.T) {
 			expectedShouldEnableAzureDiskCSISnapshotFeature:   false,
 			expectedShouldEnableAzureFileCSISnapshotFeature:   true,
 			expectedIsKubernetesVersionGeOneDotSixteenDotZero: false,
-			expectedMode: api.AddonModeEnsureExists,
+			expectedMode:             api.AddonModeEnsureExists,
+			expectedGetClusterSubnet: "10.239.0.0/16",
+			expectedIsAzureCNI:       true,
 		},
 		{
 			name: "coredns as an example - Availability Zones",
@@ -2865,6 +2879,7 @@ func TestGetAddonFuncMap(t *testing.T) {
 									},
 								},
 							},
+							ClusterSubnet: "10.239.0.0/16",
 						},
 					},
 					AgentPoolProfiles: []*api.AgentPoolProfile{
@@ -2900,7 +2915,9 @@ func TestGetAddonFuncMap(t *testing.T) {
 			expectedShouldEnableAzureDiskCSISnapshotFeature:   true,
 			expectedShouldEnableAzureFileCSISnapshotFeature:   false,
 			expectedIsKubernetesVersionGeOneDotSixteenDotZero: true,
-			expectedMode: api.AddonModeEnsureExists,
+			expectedMode:             api.AddonModeEnsureExists,
+			expectedGetClusterSubnet: "10.239.0.0/16",
+			expectedIsAzureCNI:       true,
 		},
 		{
 			name: "coredns as an example - hybrid cluster",
@@ -2950,6 +2967,7 @@ func TestGetAddonFuncMap(t *testing.T) {
 									},
 								},
 							},
+							ClusterSubnet: "10.239.0.0/16",
 						},
 					},
 					AgentPoolProfiles: []*api.AgentPoolProfile{
@@ -2984,7 +3002,96 @@ func TestGetAddonFuncMap(t *testing.T) {
 			expectedShouldEnableAzureDiskCSISnapshotFeature:   true,
 			expectedShouldEnableAzureFileCSISnapshotFeature:   false,
 			expectedIsKubernetesVersionGeOneDotSixteenDotZero: true,
-			expectedMode: api.AddonModeReconcile,
+			expectedMode:             api.AddonModeReconcile,
+			expectedGetClusterSubnet: "10.239.0.0/16",
+			expectedIsAzureCNI:       true,
+		},
+		{
+			name: "coredns as an example - kubenet",
+			addon: api.KubernetesAddon{
+				Name:    common.CoreDNSAddonName,
+				Enabled: to.BoolPtr(true),
+				Mode:    api.AddonModeReconcile,
+				Config: map[string]string{
+					"foo": "bar",
+				},
+				Containers: []api.KubernetesContainerSpec{
+					{
+						Name:           common.CoreDNSAddonName,
+						CPURequests:    "100m",
+						MemoryRequests: "300Mi",
+						CPULimits:      "100m",
+						MemoryLimits:   "300Mi",
+						Image:          specConfig.KubernetesImageBase + k8sComponentsByVersionMap["1.15.4"][common.CoreDNSAddonName],
+					},
+				},
+			},
+			cs: &api.ContainerService{
+				Location: "eastus2",
+				Properties: &api.Properties{
+					OrchestratorProfile: &api.OrchestratorProfile{
+						OrchestratorType:    api.Kubernetes,
+						OrchestratorVersion: "1.18.0",
+						KubernetesConfig: &api.KubernetesConfig{
+							UseCloudControllerManager: to.BoolPtr(true),
+							NetworkPlugin:             api.NetworkPluginKubenet,
+							Addons: []api.KubernetesAddon{
+								{
+									Name:    common.CoreDNSAddonName,
+									Enabled: to.BoolPtr(true),
+									Config: map[string]string{
+										"foo": "bar",
+									},
+									Containers: []api.KubernetesContainerSpec{
+										{
+											Name:           common.CoreDNSAddonName,
+											CPURequests:    "100m",
+											MemoryRequests: "300Mi",
+											CPULimits:      "100m",
+											MemoryLimits:   "300Mi",
+											Image:          specConfig.KubernetesImageBase + k8sComponentsByVersionMap["1.15.4"][common.CoreDNSAddonName],
+										},
+									},
+								},
+							},
+							ClusterSubnet: "10.239.0.0/16",
+						},
+					},
+					AgentPoolProfiles: []*api.AgentPoolProfile{
+						{
+							Name:                "pool1",
+							Count:               1,
+							AvailabilityProfile: api.VirtualMachineScaleSets,
+							StorageProfile:      api.ManagedDisks,
+							OSType:              api.Windows,
+						},
+						{
+							Name:                "pool2",
+							Count:               1,
+							AvailabilityProfile: api.VirtualMachineScaleSets,
+							StorageProfile:      api.ManagedDisks,
+							OSType:              api.Linux,
+						},
+					},
+				},
+			},
+			expectedImage:                          specConfig.KubernetesImageBase + k8sComponentsByVersionMap["1.15.4"][common.CoreDNSAddonName],
+			expectedCPUReqs:                        "100m",
+			expectedCPULimits:                      "100m",
+			expectedMemReqs:                        "300Mi",
+			expectedMemLimits:                      "300Mi",
+			expectedFoo:                            "bar",
+			expectedNeedsManagedDiskStorageClasses: true,
+			expectedUsesCloudControllerManager:     true,
+			expectedHasWindows:                     true,
+			expectedHasLinux:                       true,
+			expectedCSIControllerReplicas:          "2",
+			expectedShouldEnableAzureDiskCSISnapshotFeature:   true,
+			expectedShouldEnableAzureFileCSISnapshotFeature:   false,
+			expectedIsKubernetesVersionGeOneDotSixteenDotZero: true,
+			expectedMode:             api.AddonModeReconcile,
+			expectedGetClusterSubnet: "10.239.0.0/16",
+			expectedIsAzureCNI:       false,
 		},
 	}
 
@@ -3093,6 +3200,16 @@ func TestGetAddonFuncMap(t *testing.T) {
 			if ret[0].Interface() != c.expectedMode {
 				t.Errorf("expected funcMap invocation of GetMode to return %s, instead got %s", c.expectedMode, ret[0].Interface())
 			}
+			v = reflect.ValueOf(funcMap["GetClusterSubnet"])
+			ret = v.Call(make([]reflect.Value, 0))
+			if ret[0].Interface() != c.expectedGetClusterSubnet {
+				t.Errorf("expected funcMap invocation of GetClusterSubnet to return %s, instead got %s", c.expectedGetClusterSubnet, ret[0].Interface())
+			}
+			v = reflect.ValueOf(funcMap["IsAzureCNI"])
+			ret = v.Call(make([]reflect.Value, 0))
+			if ret[0].Interface() != c.expectedIsAzureCNI {
+				t.Errorf("expected funcMap invocation of IsAzureCNI to return %t, instead got %t", c.expectedIsAzureCNI, ret[0].Interface())
+			}
 		})
 	}
 }