Skip to content

Commit b1268f4

Browse files
🌱 Drop 1.0->current upgrade test (#11755)
* Drop 1.0->current upgrade test * Drop metadata.yaml
1 parent ba811c8 commit b1268f4

File tree

9 files changed

+7
-291
lines changed

9 files changed

+7
-291
lines changed

Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ generate-doctoc:
556556
TRACE=$(TRACE) ./hack/generate-doctoc.sh
557557

558558
.PHONY: generate-e2e-templates
559-
generate-e2e-templates: $(KUSTOMIZE) $(addprefix generate-e2e-templates-, v0.3 v0.4 v1.0 v1.5 v1.6 v1.8 v1.9 main) ## Generate cluster templates for all versions
559+
generate-e2e-templates: $(KUSTOMIZE) $(addprefix generate-e2e-templates-, v0.3 v0.4 v1.5 v1.6 v1.8 v1.9 main) ## Generate cluster templates for all versions
560560

561561
DOCKER_TEMPLATES := test/e2e/data/infrastructure-docker
562562
INMEMORY_TEMPLATES := test/e2e/data/infrastructure-inmemory
@@ -569,10 +569,6 @@ generate-e2e-templates-v0.3: $(KUSTOMIZE)
569569
generate-e2e-templates-v0.4: $(KUSTOMIZE)
570570
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v0.4/cluster-template --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v0.4/cluster-template.yaml
571571

572-
.PHONY: generate-e2e-templates-v1.0
573-
generate-e2e-templates-v1.0: $(KUSTOMIZE)
574-
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1.0/cluster-template --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1.0/cluster-template.yaml
575-
576572
.PHONY: generate-e2e-templates-v1.5
577573
generate-e2e-templates-v1.5: $(KUSTOMIZE)
578574
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1.5/cluster-template --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1.5/cluster-template.yaml

docs/book/src/clusterctl/commands/upgrade.md

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,18 +80,15 @@ clusterctl upgrade apply \
8080
<h1>Clusterctl upgrade test coverage</h1>
8181

8282
Cluster API only tests a subset of possible clusterctl upgrade paths as otherwise the test matrix would be overwhelming.
83-
Untested upgrade paths are not blocked by clusterctl and should work in general, they are just not tested. Users
84-
intending to use an upgrade path not tested by us should do their own validation to ensure the operation works correctly.
83+
Untested upgrade paths are not blocked by clusterctl and should work in general, but users
84+
intending to perform an upgrade path not tested by us should do their own validation to ensure the operation works correctly.
8585

8686
The following is an example of the tested upgrade paths for v1.7:
8787

88-
| From | To | Note |
89-
|------|------|------------------------------------------------------|
90-
| v1.0 | v1.7 | v1.0 is the first release with the v1beta1 contract. |
91-
| v1.5 | v1.7 | v1.5 is v1.7 - 2. |
92-
| v1.6 | v1.7 | v1.6 is v1.7 - 1. |
93-
94-
The idea is to always test upgrade from v1.0 and the previous two minor releases.
88+
| From | To | Note |
89+
|------|------|------------------------------|
90+
| v1.5 | v1.7 | n-2 --> n (v1.5 is v1.7 - 2) |
91+
| v1.6 | v1.7 | n-1 --> n (v1.6 is v1.7 - 1) |
9592

9693
</aside>
9794

test/e2e/clusterctl_upgrade_test.go

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -182,42 +182,6 @@ var _ = Describe("When testing clusterctl upgrades (v0.4=>v1.6=>current)", func(
182182
})
183183
})
184184

185-
// Note: This test should not be changed during "prepare main branch".
186-
var _ = Describe("When testing clusterctl upgrades (v1.0=>current)", func() {
187-
// Get v1.0 latest stable release
188-
version := "1.0"
189-
stableRelease, err := GetStableReleaseOfMinor(ctx, version)
190-
Expect(err).ToNot(HaveOccurred(), "Failed to get stable version for minor release : %s", version)
191-
ClusterctlUpgradeSpec(ctx, func() ClusterctlUpgradeSpecInput {
192-
return ClusterctlUpgradeSpecInput{
193-
E2EConfig: e2eConfig,
194-
ClusterctlConfigPath: clusterctlConfigPath,
195-
BootstrapClusterProxy: bootstrapClusterProxy,
196-
ArtifactFolder: artifactFolder,
197-
SkipCleanup: skipCleanup,
198-
InfrastructureProvider: ptr.To("docker"),
199-
InitWithBinary: fmt.Sprintf(clusterctlDownloadURL, stableRelease),
200-
// We have to pin the providers because with `InitWithProvidersContract` the test would
201-
// use the latest version for the contract (which is v1.3.X for v1beta1).
202-
InitWithCoreProvider: fmt.Sprintf(providerCAPIPrefix, stableRelease),
203-
InitWithBootstrapProviders: []string{fmt.Sprintf(providerKubeadmPrefix, stableRelease)},
204-
InitWithControlPlaneProviders: []string{fmt.Sprintf(providerKubeadmPrefix, stableRelease)},
205-
InitWithInfrastructureProviders: []string{fmt.Sprintf(providerDockerPrefix, stableRelease)},
206-
// We have to set this to an empty array as clusterctl v1.0 doesn't support
207-
// runtime extension providers. If we don't do this the test will automatically
208-
// try to deploy the latest version of our test-extension from docker.yaml.
209-
InitWithRuntimeExtensionProviders: []string{},
210-
// NOTE: If this version is changed here the image and SHA must also be updated in all DockerMachineTemplates in `test/data/infrastructure-docker/v1.0/bases.
211-
// Note: Both InitWithKubernetesVersion and WorkloadKubernetesVersion should be the highest mgmt cluster version supported by the source Cluster API version.
212-
InitWithKubernetesVersion: "v1.23.17",
213-
WorkloadKubernetesVersion: "v1.23.17",
214-
MgmtFlavor: "topology",
215-
WorkloadFlavor: "",
216-
UseKindForManagementCluster: true,
217-
}
218-
})
219-
})
220-
221185
// Note: This test should be changed during "prepare main branch", it should test n-2 => current.
222186
var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.8=>current) [ClusterClass]", Label("ClusterClass"), func() {
223187
// Get n-2 latest stable release

test/e2e/config/docker.yaml

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,6 @@ providers:
5353
new: --metrics-addr=:8080
5454
files:
5555
- sourcePath: "../data/shared/v0.4/metadata.yaml"
56-
- name: "{go://sigs.k8s.io/[email protected]}"
57-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/core-components.yaml"
58-
type: "url"
59-
contract: v1beta1
60-
replacements:
61-
- old: --metrics-addr=127.0.0.1:8080
62-
new: --metrics-addr=:8080
63-
files:
64-
- sourcePath: "../data/shared/v1.0/metadata.yaml"
6556
- name: "{go://sigs.k8s.io/[email protected]}"
6657
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/core-components.yaml"
6758
type: "url"
@@ -124,15 +115,6 @@ providers:
124115
new: --metrics-addr=:8080
125116
files:
126117
- sourcePath: "../data/shared/v0.4/metadata.yaml"
127-
- name: "{go://sigs.k8s.io/[email protected]}"
128-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/bootstrap-components.yaml"
129-
type: "url"
130-
contract: v1beta1
131-
replacements:
132-
- old: --metrics-addr=127.0.0.1:8080
133-
new: --metrics-addr=:8080
134-
files:
135-
- sourcePath: "../data/shared/v1.0/metadata.yaml"
136118
- name: "{go://sigs.k8s.io/[email protected]}"
137119
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/bootstrap-components.yaml"
138120
type: "url"
@@ -195,15 +177,6 @@ providers:
195177
new: --metrics-addr=:8080
196178
files:
197179
- sourcePath: "../data/shared/v0.4/metadata.yaml"
198-
- name: "{go://sigs.k8s.io/[email protected]}"
199-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/control-plane-components.yaml"
200-
type: "url"
201-
contract: v1beta1
202-
replacements:
203-
- old: --metrics-addr=127.0.0.1:8080
204-
new: --metrics-addr=:8080
205-
files:
206-
- sourcePath: "../data/shared/v1.0/metadata.yaml"
207180
- name: "{go://sigs.k8s.io/[email protected]}"
208181
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/control-plane-components.yaml"
209182
type: "url"
@@ -268,16 +241,6 @@ providers:
268241
files:
269242
- sourcePath: "../data/shared/v0.4/metadata.yaml"
270243
- sourcePath: "../data/infrastructure-docker/v0.4/cluster-template.yaml"
271-
- name: "{go://sigs.k8s.io/[email protected]}"
272-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/infrastructure-components-development.yaml"
273-
type: "url"
274-
contract: v1beta1
275-
replacements:
276-
- old: --metrics-addr=127.0.0.1:8080
277-
new: --metrics-addr=:8080
278-
files:
279-
- sourcePath: "../data/shared/v1.0/metadata.yaml"
280-
- sourcePath: "../data/infrastructure-docker/v1.0/cluster-template.yaml"
281244
- name: "{go://sigs.k8s.io/[email protected]}"
282245
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/infrastructure-components-development.yaml"
283246
type: "url"

test/e2e/data/infrastructure-docker/v1.0/bases/cluster-with-kcp.yaml

Lines changed: 0 additions & 103 deletions
This file was deleted.

test/e2e/data/infrastructure-docker/v1.0/bases/crs.yaml

Lines changed: 0 additions & 24 deletions
This file was deleted.

test/e2e/data/infrastructure-docker/v1.0/bases/md.yaml

Lines changed: 0 additions & 58 deletions
This file was deleted.

test/e2e/data/infrastructure-docker/v1.0/cluster-template/kustomization.yaml

Lines changed: 0 additions & 4 deletions
This file was deleted.

test/e2e/data/shared/v1.0/metadata.yaml

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)