Prepare main branch for v1.6 development

Signed-off-by: Furkat Gofurov<[email protected]>
kubernetes-sigs · Aug 3, 2023 · 89b2d18 · 89b2d18
1 parent 1f5fcd2
commit 89b2d18
Show file tree

Hide file tree

Showing 16 changed files with 260 additions and 173 deletions.
diff --git a/Makefile b/Makefile
@@ -504,7 +504,7 @@ generate-modules: ## Run go mod tidy to ensure modules are up to date
 	cd $(TEST_DIR); go mod tidy
 
 .PHONY: generate-e2e-templates
-generate-e2e-templates: $(KUSTOMIZE) $(addprefix generate-e2e-templates-, v1.0 v1.3 v1.4 main) ## Generate cluster templates for all versions
+generate-e2e-templates: $(KUSTOMIZE) $(addprefix generate-e2e-templates-, v1.0 v1.4 v1.5 main) ## Generate cluster templates for all versions
 
 DOCKER_TEMPLATES := test/e2e/data/infrastructure-docker
 INMEMORY_TEMPLATES := test/e2e/data/infrastructure-inmemory
@@ -513,16 +513,16 @@ INMEMORY_TEMPLATES := test/e2e/data/infrastructure-inmemory
 generate-e2e-templates-v1.0: $(KUSTOMIZE)
 	$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1.0/cluster-template --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1.0/cluster-template.yaml
 
-.PHONY: generate-e2e-templates-v1.3
-generate-e2e-templates-v1.3: $(KUSTOMIZE)
-	$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1.3/cluster-template --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1.3/cluster-template.yaml
-	$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1.3/cluster-template-topology --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1.3/cluster-template-topology.yaml
-
 .PHONY: generate-e2e-templates-v1.4
 generate-e2e-templates-v1.4: $(KUSTOMIZE)
 	$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1.4/cluster-template --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1.4/cluster-template.yaml
 	$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1.4/cluster-template-topology --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1.4/cluster-template-topology.yaml
 
+.PHONY: generate-e2e-templates-v1.5
+generate-e2e-templates-v1.5: $(KUSTOMIZE)
+	$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1.5/cluster-template --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1.5/cluster-template.yaml
+	$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1.5/cluster-template-topology --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1.5/cluster-template-topology.yaml
+
 .PHONY: generate-e2e-templates-main
 generate-e2e-templates-main: $(KUSTOMIZE)
 	$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/main/cluster-template --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/main/cluster-template.yaml

diff --git a/cmd/clusterctl/hack/create-local-repository.py b/cmd/clusterctl/hack/create-local-repository.py
@@ -52,36 +52,36 @@
 providers = {
     'cluster-api': {
         'componentsFile': 'core-components.yaml',
-        'nextVersion': 'v1.5.99',
+        'nextVersion': 'v1.6.99',
         'type': 'CoreProvider',
     },
     'bootstrap-kubeadm': {
         'componentsFile': 'bootstrap-components.yaml',
-        'nextVersion': 'v1.5.99',
+        'nextVersion': 'v1.6.99',
         'type': 'BootstrapProvider',
         'configFolder': 'bootstrap/kubeadm/config/default',
     },
     'control-plane-kubeadm': {
         'componentsFile': 'control-plane-components.yaml',
-        'nextVersion': 'v1.5.99',
+        'nextVersion': 'v1.6.99',
         'type': 'ControlPlaneProvider',
         'configFolder': 'controlplane/kubeadm/config/default',
     },
     'infrastructure-docker': {
         'componentsFile': 'infrastructure-components.yaml',
-        'nextVersion': 'v1.5.99',
+        'nextVersion': 'v1.6.99',
         'type': 'InfrastructureProvider',
         'configFolder': 'test/infrastructure/docker/config/default',
     },
     'infrastructure-in-memory': {
           'componentsFile': 'infrastructure-components.yaml',
-          'nextVersion': 'v1.5.99',
+          'nextVersion': 'v1.6.99',
           'type': 'InfrastructureProvider',
           'configFolder': 'test/infrastructure/inmemory/config/default',
       },
       'runtime-extension-test': {
         'componentsFile': 'runtime-extension-components.yaml',
-        'nextVersion': 'v1.5.99',
+        'nextVersion': 'v1.6.99',
         'type': 'RuntimeExtensionProvider',
         'configFolder': 'test/extension/config/default',
     },

diff --git a/docs/release/release-tasks.md b/docs/release/release-tasks.md
@@ -108,7 +108,8 @@ This comes down to changing occurrences of the old version to the new version, e
       1. Create a new `v1.4` `metadata.yaml` (`test/e2e/data/shared/v1.4/metadata.yaml`) by copying
    `test/e2e/data/shared/main/metadata.yaml`
       2. Add the new release to the main `metadata.yaml` (`test/e2e/data/shared/main/metadata.yaml`).
-      3. Remove old `metadata.yaml`'s that are not used anymore in clusterctl upgrade tests.
+      3. Add the new release to the root level `metadata.yaml`
+      4. Remove old `metadata.yaml`'s that are not used anymore in clusterctl upgrade tests.
    4. Adjust cluster templates in `test/e2e/data/infrastructure-docker`:
       1. Create a new `v1.4` folder. It should be created based on the `main` folder and only contain the templates
          we use in the clusterctl upgrade tests (as of today `cluster-template` and `cluster-template-topology`).
@@ -119,8 +120,8 @@ This comes down to changing occurrences of the old version to the new version, e
 3. Make sure all tests are green (also run `pull-cluster-api-e2e-full-main` and `pull-cluster-api-e2e-workload-upgrade-1-23-latest-main`).
 
 Prior art: 
-- 1.3 - https://github.com/kubernetes-sigs/cluster-api/pull/6834/files
 - 1.4 - https://github.com/kubernetes-sigs/cluster-api/pull/7692/files
+- 1.5 - https://github.com/kubernetes-sigs/cluster-api/pull/8430/files
 
 #### Create a new GitHub milestone for the next release
 

diff --git a/hack/tools/tilt-prepare/main.go b/hack/tools/tilt-prepare/main.go
@@ -70,7 +70,7 @@ const (
 
 var (
 	// Defines the default version to be used for the provider CR if no version is specified in the tilt-provider.yaml|json file.
-	defaultProviderVersion = "v1.5.99"
+	defaultProviderVersion = "v1.6.99"
 
 	// This data struct mirrors a subset of info from the providers struct in the tilt file
 	// which is containing "hard-coded" tilt-provider.yaml files for the providers managed in the Cluster API repository.

diff --git a/metadata.yaml b/metadata.yaml
@@ -6,6 +6,9 @@
 apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
 kind: Metadata
 releaseSeries:
+  - major: 1
+    minor: 6
+    contract: v1beta1
   - major: 1
     minor: 5
     contract: v1beta1

diff --git a/test/e2e/clusterctl_upgrade_test.go b/test/e2e/clusterctl_upgrade_test.go
@@ -66,7 +66,7 @@ var _ = Describe("When testing clusterctl upgrades (v1.0=>current)", func() {
 	})
 })
 
-var _ = Describe("When testing clusterctl upgrades (v1.3=>current)", func() {
+var _ = Describe("When testing clusterctl upgrades (v1.4=>current)", func() {
 	ClusterctlUpgradeSpec(ctx, func() ClusterctlUpgradeSpecInput {
 		return ClusterctlUpgradeSpecInput{
 			E2EConfig:              e2eConfig,
@@ -75,21 +75,21 @@ var _ = Describe("When testing clusterctl upgrades (v1.3=>current)", func() {
 			ArtifactFolder:         artifactFolder,
 			SkipCleanup:            skipCleanup,
 			InfrastructureProvider: pointer.String("docker"),
-			InitWithBinary:         "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.6/clusterctl-{OS}-{ARCH}",
+			InitWithBinary:         "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.5/clusterctl-{OS}-{ARCH}",
 			// We have to pin the providers because with `InitWithProvidersContract` the test would
-			// use the latest version for the contract (which is v1.4.X for v1beta1).
-			InitWithCoreProvider:            "cluster-api:v1.3.6",
-			InitWithBootstrapProviders:      []string{"kubeadm:v1.3.6"},
-			InitWithControlPlaneProviders:   []string{"kubeadm:v1.3.6"},
-			InitWithInfrastructureProviders: []string{"docker:v1.3.6"},
-			// We have to set this to an empty array as clusterctl v1.3 doesn't support
+			// use the latest version for the contract (which is v1.5.X for v1beta1).
+			InitWithCoreProvider:            "cluster-api:v1.4.5",
+			InitWithBootstrapProviders:      []string{"kubeadm:v1.4.5"},
+			InitWithControlPlaneProviders:   []string{"kubeadm:v1.4.5"},
+			InitWithInfrastructureProviders: []string{"docker:v1.4.5"},
+			// We have to set this to an empty array as clusterctl v1.4 doesn't support
 			// runtime extension providers. If we don't do this the test will automatically
 			// try to deploy the latest version of our test-extension from docker.yaml.
 			InitWithRuntimeExtensionProviders: []string{},
 			InitWithProvidersContract:         "v1beta1",
-			// NOTE: If this version is changed here the image and SHA must also be updated in all DockerMachineTemplates in `test/data/infrastructure-docker/v1.3/bases.
-			InitWithKubernetesVersion: "v1.26.4",
-			WorkloadKubernetesVersion: "v1.26.4",
+			// NOTE: If this version is changed here the image and SHA must also be updated in all DockerMachineTemplates in `test/e2e/data/infrastructure-docker/v1.4/bases.
+			InitWithKubernetesVersion: "v1.27.3",
+			WorkloadKubernetesVersion: "v1.27.3",
 			MgmtFlavor:                "topology",
 			WorkloadFlavor:            "",
 			// This check ensures that ownerReference apiVersions are updated for all types after the upgrade.
@@ -107,7 +107,7 @@ var _ = Describe("When testing clusterctl upgrades (v1.3=>current)", func() {
 	})
 })
 
-var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.3=>current) [ClusterClass]", func() {
+var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.4=>current) [ClusterClass]", func() {
 	ClusterctlUpgradeSpec(ctx, func() ClusterctlUpgradeSpecInput {
 		return ClusterctlUpgradeSpecInput{
 			E2EConfig:              e2eConfig,
@@ -116,21 +116,21 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.3=>cur
 			ArtifactFolder:         artifactFolder,
 			SkipCleanup:            skipCleanup,
 			InfrastructureProvider: pointer.String("docker"),
-			InitWithBinary:         "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.6/clusterctl-{OS}-{ARCH}",
+			InitWithBinary:         "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.5/clusterctl-{OS}-{ARCH}",
 			// We have to pin the providers because with `InitWithProvidersContract` the test would
-			// use the latest version for the contract (which is v1.4.X for v1beta1).
-			InitWithCoreProvider:            "cluster-api:v1.3.6",
-			InitWithBootstrapProviders:      []string{"kubeadm:v1.3.6"},
-			InitWithControlPlaneProviders:   []string{"kubeadm:v1.3.6"},
-			InitWithInfrastructureProviders: []string{"docker:v1.3.6"},
-			// We have to set this to an empty array as clusterctl v1.3 doesn't support
+			// use the latest version for the contract (which is v1.5.X for v1beta1).
+			InitWithCoreProvider:            "cluster-api:v1.4.5",
+			InitWithBootstrapProviders:      []string{"kubeadm:v1.4.5"},
+			InitWithControlPlaneProviders:   []string{"kubeadm:v1.4.5"},
+			InitWithInfrastructureProviders: []string{"docker:v1.4.5"},
+			// We have to set this to an empty array as clusterctl v1.4 doesn't support
 			// runtime extension providers. If we don't do this the test will automatically
 			// try to deploy the latest version of our test-extension from docker.yaml.
 			InitWithRuntimeExtensionProviders: []string{},
 			InitWithProvidersContract:         "v1beta1",
-			// NOTE: If this version is changed here the image and SHA must also be updated in all DockerMachineTemplates in `test/data/infrastructure-docker/v1.3/bases.
-			InitWithKubernetesVersion: "v1.26.4",
-			WorkloadKubernetesVersion: "v1.26.4",
+			// NOTE: If this version is changed here the image and SHA must also be updated in all DockerMachineTemplates in `test/e2e/data/infrastructure-docker/v1.4/bases.
+			InitWithKubernetesVersion: "v1.27.3",
+			WorkloadKubernetesVersion: "v1.27.3",
 			MgmtFlavor:                "topology",
 			WorkloadFlavor:            "topology",
 			// This check ensures that ownerReference apiVersions are updated for all types after the upgrade.
@@ -148,7 +148,7 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.3=>cur
 	})
 })
 
-var _ = Describe("When testing clusterctl upgrades (v1.4=>current)", func() {
+var _ = Describe("When testing clusterctl upgrades (v1.5=>current)", func() {
 	ClusterctlUpgradeSpec(ctx, func() ClusterctlUpgradeSpecInput {
 		return ClusterctlUpgradeSpecInput{
 			E2EConfig:                 e2eConfig,
@@ -157,9 +157,9 @@ var _ = Describe("When testing clusterctl upgrades (v1.4=>current)", func() {
 			ArtifactFolder:            artifactFolder,
 			SkipCleanup:               skipCleanup,
 			InfrastructureProvider:    pointer.String("docker"),
-			InitWithBinary:            "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.0/clusterctl-{OS}-{ARCH}",
+			InitWithBinary:            "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0/clusterctl-{OS}-{ARCH}",
 			InitWithProvidersContract: "v1beta1",
-			// NOTE: If this version is changed here the image and SHA must also be updated in all DockerMachineTemplates in `test/data/infrastructure-docker/v1.4/bases.
+			// NOTE: If this version is changed here the image and SHA must also be updated in all DockerMachineTemplates in `test/e2e/data/infrastructure-docker/v1.5/bases.
 			InitWithKubernetesVersion: "v1.27.3",
 			WorkloadKubernetesVersion: "v1.27.3",
 			MgmtFlavor:                "topology",
@@ -179,7 +179,7 @@ var _ = Describe("When testing clusterctl upgrades (v1.4=>current)", func() {
 	})
 })
 
-var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.4=>current) [ClusterClass]", func() {
+var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.5=>current) [ClusterClass]", func() {
 	ClusterctlUpgradeSpec(ctx, func() ClusterctlUpgradeSpecInput {
 		return ClusterctlUpgradeSpecInput{
 			E2EConfig:                 e2eConfig,
@@ -188,9 +188,9 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.4=>cur
 			ArtifactFolder:            artifactFolder,
 			SkipCleanup:               skipCleanup,
 			InfrastructureProvider:    pointer.String("docker"),
-			InitWithBinary:            "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.0/clusterctl-{OS}-{ARCH}",
+			InitWithBinary:            "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0/clusterctl-{OS}-{ARCH}",
 			InitWithProvidersContract: "v1beta1",
-			// NOTE: If this version is changed here the image and SHA must also be updated in all DockerMachineTemplates in `test/data/infrastructure-docker/v1.4/bases.
+			// NOTE: If this version is changed here the image and SHA must also be updated in all DockerMachineTemplates in `test/e2e/data/infrastructure-docker/v1.5/bases.
 			InitWithKubernetesVersion: "v1.27.3",
 			WorkloadKubernetesVersion: "v1.27.3",
 			MgmtFlavor:                "topology",