Merge pull request #1251 from HotelsDotCom/feature/bump-nds

Bump Calico/Typha Versions now Typha Issue resolved.
kubernetes-retired · Apr 24, 2018 · 1ada46c · 1ada46c
2 parents ef2ff13 + 800f4d2
commit 1ada46c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 18 deletions.
diff --git a/core/controlplane/config/config.go b/core/controlplane/config/config.go
@@ -30,11 +30,11 @@ const (
 	userDataDir    = "userdata"
 
 	// Experimental SelfHosting feature default images.
-	kubeNetworkingSelfHostingDefaultCalicoNodeImageTag = "v3.0.3"
-	kubeNetworkingSelfHostingDefaultCalicoCniImageTag  = "v2.0.1"
+	kubeNetworkingSelfHostingDefaultCalicoNodeImageTag = "v3.0.6"
+	kubeNetworkingSelfHostingDefaultCalicoCniImageTag  = "v2.0.5"
 	kubeNetworkingSelfHostingDefaultFlannelImageTag    = "v0.9.1"
 	kubeNetworkingSelfHostingDefaultFlannelCniImageTag = "v0.3.0"
-	kubeNetworkingSelfHostingDefaultTyphaImageTag      = "v0.6.2"
+	kubeNetworkingSelfHostingDefaultTyphaImageTag      = "v0.6.4"
 )
 
 func NewDefaultCluster() *Cluster {

diff --git a/core/controlplane/config/templates/cloud-config-controller b/core/controlplane/config/templates/cloud-config-controller
@@ -1127,21 +1127,6 @@ write_files:
             # as a host-networked pod.
             hostNetwork: true
             serviceAccountName: canal
-            initContainers:
-            - name: wait-for-default-clusterinformation
-              image: {{.HyperkubeImage.RepoWithTag}}
-              command: ["/bin/sh", "-c" ]
-              args:
-                - |
-                    set -x ;
-                    while true; do
-                      if /kubectl get clusterinformation default; then
-                        echo "Calcio clusterinformation default exists, can continue..."
-                        exit 0
-                      fi
-                      echo "Waiting for Calcio clusterinformation default..."
-                      sleep 5
-                    done
             containers:
             - image: {{ .Kubernetes.Networking.SelfHosting.TyphaImage.RepoWithTag }}
               name: typha