Merge pull request #3851 from justinsb/calico_on_other_versions_also

Automatic merge from submit-queue.

Apply gossip dns changes to 1.8 calico version also

upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.6.yaml.template

@@ -178,6 +178,10 @@ spec:
             - mountPath: /var/run/calico
               name: var-run-calico
               readOnly: false
+            # Necessary for gossip based DNS
+            - mountPath: /etc/hosts
+              name: etc-hosts
+              readOnly: true
         # This container installs the Calico CNI binaries
         # and CNI network config file on each node.
         - name: install-cni
@@ -208,6 +212,10 @@ spec:
               name: cni-bin-dir
             - mountPath: /host/etc/cni/net.d
               name: cni-net-dir
+            # Necessary for gossip based DNS
+            - mountPath: /etc/hosts
+              name: etc-hosts
+              readOnly: true
       volumes:
         # Used by calico/node.
         - name: lib-modules
@@ -223,6 +231,9 @@ spec:
         - name: cni-net-dir
           hostPath:
             path: /etc/cni/net.d
+        - name: etc-hosts
+          hostPath:
+            path: /etc/hosts
 
 ---
 
@@ -281,6 +292,16 @@ spec:
             - name: CONFIGURE_ETC_HOSTS
               value: "true"
 
+          volumeMounts:
+            # Necessary for gossip based DNS
+            - mountPath: /etc/hosts
+              name: etc-hosts
+              readOnly: true
+      volumes:
+        - name: etc-hosts
+          hostPath:
+            path: /etc/hosts
+
 {{ if and (eq .CloudProvider "aws") (.Networking.Calico.CrossSubnet) -}}
 # This manifest installs the k8s-ec2-srcdst container, which disables
 # src/dst ip checks to allow BGP to function for calico for hosts within subnets

upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.8.yaml.template

@@ -190,6 +190,10 @@ spec:
             - mountPath: /var/run/calico
               name: var-run-calico
               readOnly: false
+            # Necessary for gossip based DNS
+            - mountPath: /etc/hosts
+              name: etc-hosts
+              readOnly: true
         # This container installs the Calico CNI binaries
         # and CNI network config file on each node.
         - name: install-cni
@@ -220,6 +224,10 @@ spec:
               name: cni-bin-dir
             - mountPath: /host/etc/cni/net.d
               name: cni-net-dir
+            # Necessary for gossip based DNS
+            - mountPath: /etc/hosts
+              name: etc-hosts
+              readOnly: true
       volumes:
         # Used by calico/node.
         - name: lib-modules
@@ -235,6 +243,9 @@ spec:
         - name: cni-net-dir
           hostPath:
             path: /etc/cni/net.d
+        - name: etc-hosts
+          hostPath:
+            path: /etc/hosts
 
 ---
 
@@ -320,6 +331,16 @@ spec:
                   name: calico-config
                   key: etcd_endpoints
 
+          volumeMounts:
+            # Necessary for gossip based DNS
+            - mountPath: /etc/hosts
+              name: etc-hosts
+              readOnly: true
+      volumes:
+        - name: etc-hosts
+          hostPath:
+            path: /etc/hosts
+
 {{ if and (eq .CloudProvider "aws") (.Networking.Calico.CrossSubnet) -}}
 # This manifest installs the k8s-ec2-srcdst container, which disables
 # src/dst ip checks to allow BGP to function for calico for hosts within subnets

upup/pkg/fi/cloudup/bootstrapchannelbuilder.go

@@ -468,10 +468,11 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
 
 	if b.cluster.Spec.Networking.Calico != nil {
 		key := "networking.projectcalico.org"
+		// 2.6.3-kops.1 = 2.6.2 with kops manifest tweaks.  This should go away with the next version bump.
 		versions := map[string]string{
 			"pre-k8s-1.6": "2.4.1",
-			"k8s-1.6":     "2.4.1",
-			"k8s-1.8":     "2.6.2",
+			"k8s-1.6":     "2.4.2-kops.1",
+			"k8s-1.8":     "2.6.3-kops.1",
 		}
 
 		{