Skip to content

Commit ae9eade

Browse files
moadqassemmoadqassem
authored
Upgrade e2e tests (kubermatic#1080)
* make containerd the default cri Signed-off-by: Moath Qasim <moad.qassem@gmail.com> * upgrading k8s master node in e2e tests Signed-off-by: Moath Qasim <moad.qassem@gmail.com> * upgrading k8s versions in e2e tests Signed-off-by: Moath Qasim <moad.qassem@gmail.com> * debug Signed-off-by: Moath Qasim <moad.qassem@gmail.com> * configure containerd Signed-off-by: Moath Qasim <moad.qassem@gmail.com> * add buildah Signed-off-by: Moath Qasim <moad.qassem@gmail.com> * run containerd as cri in e2e tests Signed-off-by: Moath Qasim <moad.qassem@gmail.com> * debug Signed-off-by: Moath Qasim <moad.qassem@gmail.com> * debug Signed-off-by: Moath Qasim <moad.qassem@gmail.com> * update fixtures Signed-off-by: Moath Qasim <moad.qassem@gmail.com> * revert debug Signed-off-by: Moath Qasim <moad.qassem@gmail.com> * update fixtures Signed-off-by: Moath Qasim <moad.qassem@gmail.com> * fixing defaults Signed-off-by: Moath Qasim <moad.qassem@gmail.com> * fix container runtime defaulting bug Signed-off-by: Moath Qasim <moad.qassem@gmail.com> * update flatcar image in azure Signed-off-by: Moath Qasim <moad.qassem@gmail.com> * fix custom tests Signed-off-by: Moath Qasim <moad.qassem@gmail.com>
1 parent 6e521e5 commit ae9eade

13 files changed

Lines changed: 112 additions & 31 deletions

File tree

‎hack/ci-e2e-test.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ trap cleanup EXIT
4040
echo "Installing dependencies..."
4141
apt update && apt install -y jq rsync unzip genisoimage
4242
curl --retry 5 --location --remote-name \
43-
https://storage.googleapis.com/kubernetes-release/release/v1.12.4/bin/linux/amd64/kubectl &&
43+
https://storage.googleapis.com/kubernetes-release/release/v1.22.2/bin/linux/amd64/kubectl &&
4444
chmod +x kubectl &&
4545
mv kubectl /usr/local/bin
4646

‎pkg/cloudprovider/provider/azure/provider.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ var imageReferences = map[providerconfigtypes.OperatingSystem]compute.ImageRefer
140140
Publisher: to.StringPtr("kinvolk"),
141141
Offer: to.StringPtr("flatcar-container-linux"),
142142
Sku: to.StringPtr("stable"),
143-
Version: to.StringPtr("2345.3.0"),
143+
Version: to.StringPtr("2905.2.5"),
144144
},
145145
}
146146

‎pkg/containerruntime/containerd.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,3 +151,7 @@ systemctl daemon-reload
151151
systemctl enable --now containerd
152152
`))
153153
)
154+
155+
func (eng *Containerd) String() string {
156+
return containerdName
157+
}

‎pkg/containerruntime/containerruntime.go‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,16 @@ import (
2323
)
2424

2525
const (
26-
Default = "docker"
26+
dockerName = "docker"
27+
containerdName = "containerd"
2728
)
2829

2930
type Engine interface {
3031
KubeletFlags() []string
3132
ScriptFor(os types.OperatingSystem) (string, error)
3233
ConfigFileName() string
3334
Config() (string, error)
35+
String() string
3436
}
3537

3638
type Opt func(*Config)
@@ -51,10 +53,10 @@ func Get(containerRuntimeName string, opts ...Opt) Config {
5153
cfg := Config{}
5254

5355
switch containerRuntimeName {
54-
case "docker":
56+
case dockerName:
5557
cfg.Docker = &Docker{}
5658
cfg.Containerd = nil
57-
case "containerd":
59+
case containerdName:
5860
cfg.Containerd = &Containerd{}
5961
cfg.Docker = nil
6062
default:
@@ -79,12 +81,12 @@ type Config struct {
7981
func (cfg Config) String() string {
8082
switch {
8183
case cfg.Containerd != nil:
82-
return "containerd"
84+
return containerdName
8385
case cfg.Docker != nil:
84-
return "docker"
86+
return dockerName
8587
}
8688

87-
return Default
89+
return dockerName
8890
}
8991

9092
func (cfg Config) Engine(kubeletVersion *semver.Version) Engine {

‎pkg/containerruntime/docker.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,3 +163,7 @@ systemctl daemon-reload
163163
systemctl enable --now docker
164164
`))
165165
)
166+
167+
func (eng *Docker) String() string {
168+
return dockerName
169+
}

‎pkg/userdata/amzn2/provider.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ func (p Provider) UserData(req plugin.UserDataRequest) (string, error) {
105105
ContainerRuntimeScript string
106106
ContainerRuntimeConfigFileName string
107107
ContainerRuntimeConfig string
108+
ContainerRuntimeName string
108109
}{
109110
UserDataRequest: req,
110111
ProviderSpec: pconfig,
@@ -118,6 +119,7 @@ func (p Provider) UserData(req plugin.UserDataRequest) (string, error) {
118119
ContainerRuntimeScript: crScript,
119120
ContainerRuntimeConfigFileName: crEngine.ConfigFileName(),
120121
ContainerRuntimeConfig: crConfig,
122+
ContainerRuntimeName: crEngine.String(),
121123
}
122124

123125
buf := strings.Builder{}
@@ -244,7 +246,7 @@ write_files:
244246
245247
- path: "/etc/systemd/system/kubelet.service"
246248
content: |
247-
{{ kubeletSystemdUnit .ContainerRuntime.String .KubeletVersion .CloudProviderName .MachineSpec.Name .DNSIPs .ExternalCloudProvider .PauseImage .MachineSpec.Taints .ExtraKubeletFlags | indent 4 }}
249+
{{ kubeletSystemdUnit .ContainerRuntimeName .KubeletVersion .CloudProviderName .MachineSpec.Name .DNSIPs .ExternalCloudProvider .PauseImage .MachineSpec.Taints .ExtraKubeletFlags | indent 4 }}
248250
249251
- path: "/etc/kubernetes/cloud-config"
250252
permissions: "0600"

‎pkg/userdata/centos/provider.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ func (p Provider) UserData(req plugin.UserDataRequest) (string, error) {
105105
ContainerRuntimeScript string
106106
ContainerRuntimeConfigFileName string
107107
ContainerRuntimeConfig string
108+
ContainerRuntimeName string
108109
}{
109110
UserDataRequest: req,
110111
ProviderSpec: pconfig,
@@ -118,6 +119,7 @@ func (p Provider) UserData(req plugin.UserDataRequest) (string, error) {
118119
ContainerRuntimeScript: crScript,
119120
ContainerRuntimeConfigFileName: crEngine.ConfigFileName(),
120121
ContainerRuntimeConfig: crConfig,
122+
ContainerRuntimeName: crEngine.String(),
121123
}
122124

123125
buf := strings.Builder{}
@@ -244,7 +246,7 @@ write_files:
244246
245247
- path: "/etc/systemd/system/kubelet.service"
246248
content: |
247-
{{ kubeletSystemdUnit .ContainerRuntime.String .KubeletVersion .CloudProviderName .MachineSpec.Name .DNSIPs .ExternalCloudProvider .PauseImage .MachineSpec.Taints .ExtraKubeletFlags | indent 4 }}
249+
{{ kubeletSystemdUnit .ContainerRuntimeName .KubeletVersion .CloudProviderName .MachineSpec.Name .DNSIPs .ExternalCloudProvider .PauseImage .MachineSpec.Taints .ExtraKubeletFlags | indent 4 }}
248250
249251
- path: "/etc/kubernetes/cloud-config"
250252
permissions: "0600"

‎pkg/userdata/rhel/provider.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ func (p Provider) UserData(req plugin.UserDataRequest) (string, error) {
105105
ContainerRuntimeScript string
106106
ContainerRuntimeConfigFileName string
107107
ContainerRuntimeConfig string
108+
ContainerRuntimeName string
108109
}{
109110
UserDataRequest: req,
110111
ProviderSpec: pconfig,
@@ -118,6 +119,7 @@ func (p Provider) UserData(req plugin.UserDataRequest) (string, error) {
118119
ContainerRuntimeScript: crScript,
119120
ContainerRuntimeConfigFileName: crEngine.ConfigFileName(),
120121
ContainerRuntimeConfig: crConfig,
122+
ContainerRuntimeName: crEngine.String(),
121123
}
122124

123125
var buf strings.Builder
@@ -256,7 +258,7 @@ write_files:
256258
257259
- path: "/etc/systemd/system/kubelet.service"
258260
content: |
259-
{{ kubeletSystemdUnit .ContainerRuntime.String .KubeletVersion .CloudProviderName .MachineSpec.Name .DNSIPs .ExternalCloudProvider .PauseImage .MachineSpec.Taints .ExtraKubeletFlags | indent 4 }}
261+
{{ kubeletSystemdUnit .ContainerRuntimeName .KubeletVersion .CloudProviderName .MachineSpec.Name .DNSIPs .ExternalCloudProvider .PauseImage .MachineSpec.Taints .ExtraKubeletFlags | indent 4 }}
260262
261263
- path: "/etc/kubernetes/cloud-config"
262264
permissions: "0600"

‎pkg/userdata/ubuntu/provider.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ func (p Provider) UserData(req plugin.UserDataRequest) (string, error) {
104104
ContainerRuntimeScript string
105105
ContainerRuntimeConfigFileName string
106106
ContainerRuntimeConfig string
107+
ContainerRuntimeName string
107108
}{
108109
UserDataRequest: req,
109110
ProviderSpec: pconfig,
@@ -117,6 +118,7 @@ func (p Provider) UserData(req plugin.UserDataRequest) (string, error) {
117118
ContainerRuntimeScript: crScript,
118119
ContainerRuntimeConfigFileName: crEngine.ConfigFileName(),
119120
ContainerRuntimeConfig: crConfig,
121+
ContainerRuntimeName: crEngine.String(),
120122
}
121123

122124
var buf strings.Builder
@@ -245,7 +247,7 @@ write_files:
245247
246248
- path: "/etc/systemd/system/kubelet.service"
247249
content: |
248-
{{ kubeletSystemdUnit .ContainerRuntime.String .KubeletVersion .CloudProviderName .MachineSpec.Name .DNSIPs .ExternalCloudProvider .PauseImage .MachineSpec.Taints .ExtraKubeletFlags | indent 4 }}
250+
{{ kubeletSystemdUnit .ContainerRuntimeName .KubeletVersion .CloudProviderName .MachineSpec.Name .DNSIPs .ExternalCloudProvider .PauseImage .MachineSpec.Taints .ExtraKubeletFlags | indent 4 }}
249251
250252
- path: "/etc/systemd/system/kubelet.service.d/extras.conf"
251253
content: |

‎test/e2e/provisioning/all_e2e_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ func TestKubevirtDNSConfigProvisioningE2E(t *testing.T) {
312312
name: "Kubevirt with dns config",
313313
osName: "ubuntu",
314314
containerRuntime: "docker",
315-
kubernetesVersion: "v1.17.0",
315+
kubernetesVersion: "v1.22.2",
316316
executor: verifyCreateAndDelete,
317317
}
318318

@@ -794,7 +794,7 @@ func TestVsphereResourcePoolProvisioningE2E(t *testing.T) {
794794
name: "vSphere resource pool provisioning",
795795
osName: "flatcar",
796796
containerRuntime: "docker",
797-
kubernetesVersion: "1.17.0",
797+
kubernetesVersion: "1.22.2",
798798
executor: verifyCreateAndDelete,
799799
}
800800

@@ -868,7 +868,7 @@ func TestUbuntuProvisioningWithUpgradeE2E(t *testing.T) {
868868
name: "Ubuntu upgrade",
869869
osName: "ubuntu",
870870
containerRuntime: "docker",
871-
kubernetesVersion: "1.16.2",
871+
kubernetesVersion: "1.22.2",
872872
executor: verifyCreateAndDelete,
873873
}
874874

0 commit comments

Comments
 (0)