Cleanup 'docker-previous-version' template and add gzipUserData field in templates

New version of CAPRKE2 (v0.19.0) is out, hence we can now remove previous version
template introduced in #649
to workaround e2e complications.

Signed-off-by: Furkat Gofurov <[email protected]>

Author: furkatgofurov7

test/e2e/config/e2e_conf.yaml

@@ -36,7 +36,6 @@ providers:
       contract: v1beta1
       files:
         - sourcePath: "../data/infrastructure/cluster-template-docker.yaml"
-        - sourcePath: "../data/infrastructure/cluster-template-docker-previous-version.yaml"
         - sourcePath: "../data/infrastructure/cluster-template-docker-move.yaml"
         - sourcePath: "../data/infrastructure/cluster-template-kcp-remediation.yaml"
         - sourcePath: "../data/shared/v1beta1/metadata.yaml"

test/e2e/data/infrastructure/cluster-template-docker-move.yaml

@@ -114,6 +114,7 @@ spec:
       - anonymous-auth=true
     ntp:
       enabled: true
+  gzipUserData: false
   serverConfig:
     disableComponents:
       pluginComponents:
@@ -194,4 +195,5 @@ metadata:
   name: ${CLUSTER_NAME}-md-0
 spec: 
   template:
-    spec: {}
+    spec:
+      gzipUserData: false

test/e2e/data/infrastructure/cluster-template-docker-previous-version.yaml

@@ -133,7 +133,7 @@ spec:
       enabled: true
     nodeAnnotations:
       test: "true"
-  gzipUserData: false
+  gzipUserData: true
   serverConfig:
     disableComponents:
       pluginComponents:
@@ -232,4 +232,4 @@ spec:
       agentConfig:
         nodeAnnotations:
           test: "true"
-      gzipUserData: false
+      gzipUserData: true

test/e2e/data/infrastructure/cluster-template-docker.yaml

@@ -134,6 +134,7 @@ spec:
     type: "RollingUpdate"
     rollingUpdate:
       maxSurge: 1
+  gzipUserData: false
   serverConfig:
     disableComponents:
       pluginComponents:
@@ -203,7 +204,8 @@ metadata:
   name: ${CLUSTER_NAME}-mhc-0
 spec: 
   template:
-    spec: {}
+    spec:
+      gzipUserData: false
 ---
 apiVersion: cluster.x-k8s.io/v1beta1
 kind: MachineHealthCheck

test/e2e/data/infrastructure/cluster-template-kcp-remediation.yaml

@@ -154,6 +154,7 @@ metadata:
 spec:
   template:
     spec:
+      gzipUserData: false
       serverConfig:
         cni: calico
         disableComponents:

test/e2e/data/infrastructure/clusterclass-template-docker.yaml

@@ -98,7 +98,7 @@ var _ = Describe("Provider upgrade", func() {
 					ClusterctlConfigPath:     clusterctlConfigPath,
 					KubeconfigPath:           bootstrapClusterProxy.GetKubeconfigPath(),
 					InfrastructureProvider:   "docker",
-					Flavor:                   "docker-previous-version",
+					Flavor:                   "docker",
 					Namespace:                namespace.Name,
 					ClusterName:              clusterName,
 					KubernetesVersion:        e2eConfig.GetVariable(KubernetesVersion),
@@ -164,7 +164,7 @@ var _ = Describe("Provider upgrade", func() {
 					ClusterctlConfigPath:     clusterctlConfigPath,
 					KubeconfigPath:           bootstrapClusterProxy.GetKubeconfigPath(),
 					InfrastructureProvider:   "docker",
-					Flavor:                   "docker-previous-version",
+					Flavor:                   "docker",
 					Namespace:                namespace.Name,
 					ClusterName:              clusterName,
 					KubernetesVersion:        e2eConfig.GetVariable(KubernetesVersion),
@@ -189,7 +189,7 @@ var _ = Describe("Provider upgrade", func() {
 					ClusterctlConfigPath:     clusterctlConfigPath,
 					KubeconfigPath:           bootstrapClusterProxy.GetKubeconfigPath(),
 					InfrastructureProvider:   "docker",
-					Flavor:                   "docker-previous-version",
+					Flavor:                   "docker",
 					Namespace:                namespace.Name,
 					ClusterName:              clusterName,
 					KubernetesVersion:        e2eConfig.GetVariable(KubernetesVersionUpgradeTo),