fix(amazon-vpc-cni-k8s): we need kiam 2.8 for amazon-vpc-cni-k8s

Because the --host-interface flag used for the setup is only present after kiam 2.7
kubernetes-retired · Sep 30, 2018 · 9dd1b58 · 9dd1b58
1 parent 09e338b
commit 9dd1b58
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/core/controlplane/config/amazon_vpc.go b/core/controlplane/config/amazon_vpc.go
@@ -0,0 +1 @@
+package config
diff --git a/core/controlplane/config/config.go b/core/controlplane/config/config.go
@@ -123,7 +123,7 @@ func NewDefaultCluster() *Cluster {
 		},
 		KIAMSupport: KIAMSupport{
 			Enabled:         false,
-			Image:           model.Image{Repo: "quay.io/uswitch/kiam", Tag: "v2.7", RktPullDocker: false},
+			Image:           model.Image{Repo: "quay.io/uswitch/kiam", Tag: "v2.8", RktPullDocker: false},
 			SessionDuration: "15m",
 			ServerAddresses: KIAMServerAddresses{ServerAddress: "localhost:443", AgentAddress: "kiam-server:443"},
 		},

diff --git a/core/root/config/templates/cluster.yaml b/core/root/config/templates/cluster.yaml
@@ -1433,7 +1433,7 @@ experimental:
     enabled: false
     image: 
       repo: quay.io/uswitch/kiam
-      tag: v2.7
+      tag: v2.8
       rktPullDocker: false
     sessionDuration: 15m  
     serverAddresses:

diff --git a/test/integration/maincluster_test.go b/test/integration/maincluster_test.go
@@ -142,7 +142,7 @@ func TestMainClusterConfig(t *testing.T) {
 			},
 			KIAMSupport: controlplane_config.KIAMSupport{
 				Enabled:         false,
-				Image:           model.Image{Repo: "quay.io/uswitch/kiam", Tag: "v2.7", RktPullDocker: false},
+				Image:           model.Image{Repo: "quay.io/uswitch/kiam", Tag: "v2.8", RktPullDocker: false},
 				SessionDuration: "15m",
 				ServerAddresses: controlplane_config.KIAMServerAddresses{ServerAddress: "localhost:443", AgentAddress: "kiam-server:443"},
 			},
@@ -1442,7 +1442,7 @@ worker:
 						},
 						KIAMSupport: controlplane_config.KIAMSupport{
 							Enabled:         false,
-							Image:           model.Image{Repo: "quay.io/uswitch/kiam", Tag: "v2.7", RktPullDocker: false},
+							Image:           model.Image{Repo: "quay.io/uswitch/kiam", Tag: "v2.8", RktPullDocker: false},
 							SessionDuration: "15m",
 							ServerAddresses: controlplane_config.KIAMServerAddresses{ServerAddress: "localhost:443", AgentAddress: "kiam-server:443"},
 						},
@@ -1686,7 +1686,7 @@ worker:
 					expected := controlplane_config.Experimental{
 						KIAMSupport: controlplane_config.KIAMSupport{
 							Enabled:         true,
-							Image:           model.Image{Repo: "quay.io/uswitch/kiam", Tag: "v2.7", RktPullDocker: false},
+							Image:           model.Image{Repo: "quay.io/uswitch/kiam", Tag: "v2.8", RktPullDocker: false},
 							SessionDuration: "15m",
 							ServerAddresses: controlplane_config.KIAMServerAddresses{ServerAddress: "localhost:443", AgentAddress: "kiam-server:443"},
 						},