From 9f64e6207cdef3473dd9c847e0e698a03bbbeb78 Mon Sep 17 00:00:00 2001 From: Chris Privitere <23177737+cprivitere@users.noreply.github.com> Date: Thu, 8 Sep 2022 09:18:48 -0500 Subject: [PATCH 1/4] Add 0.6.0 release Signed-off-by: Chris Privitere <23177737+cprivitere@users.noreply.github.com> --- metadata.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/metadata.yaml b/metadata.yaml index fc271eeca..6c43fb384 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -9,6 +9,9 @@ releaseSeries: - major: 1 minor: 1 contract: v1beta1 +- major: 0 + minor: 6 + contract: v1beta1 - major: 0 minor: 5 contract: v1beta1 From 7fc003e24fbc5e609fa00893028f2a1860060f4e Mon Sep 17 00:00:00 2001 From: Chris Privitere <23177737+cprivitere@users.noreply.github.com> Date: Thu, 8 Sep 2022 09:25:31 -0500 Subject: [PATCH 2/4] Update e2e ci config to reference 0.6.0 Signed-off-by: Chris Privitere <23177737+cprivitere@users.noreply.github.com> --- test/e2e/config/packet-ci-actions.yaml | 2 +- test/e2e/config/packet-ci.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/config/packet-ci-actions.yaml b/test/e2e/config/packet-ci-actions.yaml index 4d608d33d..2771f1a52 100644 --- a/test/e2e/config/packet-ci-actions.yaml +++ b/test/e2e/config/packet-ci-actions.yaml @@ -114,7 +114,7 @@ providers: # Add cluster templates - sourcePath: "../data/v1alpha3/cluster-template-packet-ccm.yaml" - sourcePath: "../data/v1alpha3/cluster-template-cpem.yaml" - - name: v0.5.0 + - name: v0.6.0 value: "${MANIFEST_PATH:=..}/infrastructure-components.yaml" type: "url" contract: v1beta1 diff --git a/test/e2e/config/packet-ci.yaml b/test/e2e/config/packet-ci.yaml index 855b99e4b..c50753ce4 100644 --- a/test/e2e/config/packet-ci.yaml +++ b/test/e2e/config/packet-ci.yaml @@ -114,7 +114,7 @@ providers: # Add cluster templates - sourcePath: "../data/v1alpha3/cluster-template-packet-ccm.yaml" - sourcePath: "../data/v1alpha3/cluster-template-cpem.yaml" - - name: v0.5.0 #latest in the v1beta1 series + - name: v0.6.0 #latest in the v1beta1 series value: "../../../config/default" replacements: - old: "image: .*/cluster-api-provider-packet:.*" From 7308bc4cfd6929657e11aa332b6816c426501df1 Mon Sep 17 00:00:00 2001 From: Chris Privitere <23177737+cprivitere@users.noreply.github.com> Date: Thu, 8 Sep 2022 09:25:42 -0500 Subject: [PATCH 3/4] Update defaults documented in readme Signed-off-by: Chris Privitere <23177737+cprivitere@users.noreply.github.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index aa07e3e6b..8df27d63d 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ If you do not change the generated `yaml` files, it will use defaults. You can l * `CLUSTER_NAME` (defaults to `my-cluster`) * `CONTROL_PLANE_MACHINE_COUNT` (defaults to `1`) -* `KUBE_VIP_VERSION` (defaults to `v0.4.2`) +* `KUBE_VIP_VERSION` (defaults to `v0.5.0`) * `NODE_OS` (defaults to `ubuntu_18_04`) * `POD_CIDR` (defaults to `192.168.0.0/16`) * `SERVICE_CIDR` (defaults to `172.26.0.0/16`) From b61095291bf8c95c41ccd88d0d7b5872b1c58967 Mon Sep 17 00:00:00 2001 From: Chris Privitere <23177737+cprivitere@users.noreply.github.com> Date: Thu, 8 Sep 2022 11:27:02 -0500 Subject: [PATCH 4/4] Change nextVersion to 0.6.99 Signed-off-by: Chris Privitere <23177737+cprivitere@users.noreply.github.com> --- clusterctl-settings.json | 2 +- metadata.yaml | 3 --- test/e2e/config/packet-ci-actions.yaml | 13 ++++++++++++- test/e2e/config/packet-ci.yaml | 15 ++++++++++++++- 4 files changed, 27 insertions(+), 6 deletions(-) diff --git a/clusterctl-settings.json b/clusterctl-settings.json index 8367b97e5..3a2f24873 100644 --- a/clusterctl-settings.json +++ b/clusterctl-settings.json @@ -2,7 +2,7 @@ "name": "infrastructure-packet", "config": { "componentsFile": "infrastructure-components.yaml", - "nextVersion": "v1.1.99" + "nextVersion": "v0.6.99" } } \ No newline at end of file diff --git a/metadata.yaml b/metadata.yaml index 6c43fb384..3963433fe 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -6,9 +6,6 @@ apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3 kind: Metadata releaseSeries: -- major: 1 - minor: 1 - contract: v1beta1 - major: 0 minor: 6 contract: v1beta1 diff --git a/test/e2e/config/packet-ci-actions.yaml b/test/e2e/config/packet-ci-actions.yaml index 2771f1a52..21895d0d4 100644 --- a/test/e2e/config/packet-ci-actions.yaml +++ b/test/e2e/config/packet-ci-actions.yaml @@ -114,6 +114,17 @@ providers: # Add cluster templates - sourcePath: "../data/v1alpha3/cluster-template-packet-ccm.yaml" - sourcePath: "../data/v1alpha3/cluster-template-cpem.yaml" + - name: v0.5.0 + value: "${MANIFEST_PATH:=..}/infrastructure-components.yaml" + type: "url" + contract: v1beta1 + files: + - sourcePath: "${MANIFEST_PATH:=..}/metadata.yaml" + - sourcePath: "../data/v1beta1/cluster-template.yaml" + - sourcePath: "../data/v1beta1/cluster-template-kcp-scale-in.yaml" + - sourcePath: "../data/v1beta1/cluster-template-node-drain.yaml" + - sourcePath: "../data/v1beta1/cluster-template-md-remediation.yaml" + - sourcePath: "../data/v1beta1/cluster-template-kcp-remediation.yaml" - name: v0.6.0 value: "${MANIFEST_PATH:=..}/infrastructure-components.yaml" type: "url" @@ -125,7 +136,7 @@ providers: - sourcePath: "../data/v1beta1/cluster-template-node-drain.yaml" - sourcePath: "../data/v1beta1/cluster-template-md-remediation.yaml" - sourcePath: "../data/v1beta1/cluster-template-kcp-remediation.yaml" - - name: v1.1.99 # next; use manifest from source files + - name: v0.6.99 # next; use manifest from source files value: "${MANIFEST_PATH:=..}/infrastructure-components.yaml" type: "url" contract: v1beta1 diff --git a/test/e2e/config/packet-ci.yaml b/test/e2e/config/packet-ci.yaml index c50753ce4..307e12b60 100644 --- a/test/e2e/config/packet-ci.yaml +++ b/test/e2e/config/packet-ci.yaml @@ -114,6 +114,19 @@ providers: # Add cluster templates - sourcePath: "../data/v1alpha3/cluster-template-packet-ccm.yaml" - sourcePath: "../data/v1alpha3/cluster-template-cpem.yaml" + - name: v0.5.0 #latest in the v1beta1 series + value: "../../../config/default" + replacements: + - old: "image: .*/cluster-api-provider-packet:.*" + new: "image: ${REGISTRY:=ghcr.io}/${IMAGE_NAME:=kubernetes-sigs/cluster-api-provider-packet}:${TAG:=e2e}" + contract: v1beta1 + files: + - sourcePath: "../../../metadata.yaml" + - sourcePath: "../data/v1beta1/cluster-template.yaml" + - sourcePath: "../data/v1beta1/cluster-template-kcp-scale-in.yaml" + - sourcePath: "../data/v1beta1/cluster-template-node-drain.yaml" + - sourcePath: "../data/v1beta1/cluster-template-md-remediation.yaml" + - sourcePath: "../data/v1beta1/cluster-template-kcp-remediation.yaml" - name: v0.6.0 #latest in the v1beta1 series value: "../../../config/default" replacements: @@ -127,7 +140,7 @@ providers: - sourcePath: "../data/v1beta1/cluster-template-node-drain.yaml" - sourcePath: "../data/v1beta1/cluster-template-md-remediation.yaml" - sourcePath: "../data/v1beta1/cluster-template-kcp-remediation.yaml" - - name: v1.1.99 # next; use manifest from source files + - name: v0.6.99 # next; use manifest from source files value: "../../../config/default" replacements: - old: "image: .*/cluster-api-provider-packet:.*"