Skip to content

🌱 Remove obsolete docker-previous-version template #724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 26, 2025
Merged

🌱 Remove obsolete docker-previous-version template #724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion test/e2e/config/e2e_conf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 3 additions & 1 deletion test/e2e/data/infrastructure/cluster-template-docker-move.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ spec:
- anonymous-auth=true
ntp:
enabled: true
gzipUserData: false
serverConfig:
disableComponents:
pluginComponents:
Expand Down Expand Up @@ -194,4 +195,5 @@ metadata:
name: ${CLUSTER_NAME}-md-0
spec:
template:
spec: {}
spec:
gzipUserData: false
206 changes: 0 additions & 206 deletions test/e2e/data/infrastructure/cluster-template-docker-previous-version.yaml
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion test/e2e/data/infrastructure/cluster-template-kcp-remediation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ spec:
type: "RollingUpdate"
rollingUpdate:
maxSurge: 1
gzipUserData: false
serverConfig:
disableComponents:
pluginComponents:
Expand Down Expand Up @@ -203,7 +204,8 @@ metadata:
name: ${CLUSTER_NAME}-mhc-0
spec:
template:
spec: {}
spec:
gzipUserData: false
---
apiVersion: cluster.x-k8s.io/v1beta1
kind: MachineHealthCheck
Expand Down
1 change: 1 addition & 0 deletions test/e2e/data/infrastructure/clusterclass-template-docker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ metadata:
spec:
template:
spec:
gzipUserData: false
serverConfig:
cni: calico
disableComponents:
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/e2e_upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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),
Expand All @@ -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),
Expand Down
Loading