From 9dd1b580e05ecf3ce041f85d7f76919090ddd9a7 Mon Sep 17 00:00:00 2001 From: Yusuke KUOKA Date: Sun, 30 Sep 2018 22:16:16 +0900 Subject: [PATCH] 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 --- core/controlplane/config/amazon_vpc.go | 1 + core/controlplane/config/config.go | 2 +- core/root/config/templates/cluster.yaml | 2 +- test/integration/maincluster_test.go | 6 +++--- 4 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 core/controlplane/config/amazon_vpc.go diff --git a/core/controlplane/config/amazon_vpc.go b/core/controlplane/config/amazon_vpc.go new file mode 100644 index 000000000..d912156be --- /dev/null +++ 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 index 77df1a8f1..c97907194 100644 --- 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 index bd8e53002..14c23bb3b 100644 --- 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 index be3e5a78d..d5ff40c32 100644 --- 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"}, },