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`) 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 fc271eeca..3963433fe 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -6,8 +6,8 @@ apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3 kind: Metadata releaseSeries: -- major: 1 - minor: 1 +- major: 0 + minor: 6 contract: v1beta1 - major: 0 minor: 5 diff --git a/test/e2e/config/packet-ci-actions.yaml b/test/e2e/config/packet-ci-actions.yaml index 4d608d33d..21895d0d4 100644 --- a/test/e2e/config/packet-ci-actions.yaml +++ b/test/e2e/config/packet-ci-actions.yaml @@ -125,7 +125,18 @@ 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.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.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 855b99e4b..307e12b60 100644 --- a/test/e2e/config/packet-ci.yaml +++ b/test/e2e/config/packet-ci.yaml @@ -127,7 +127,20 @@ 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.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.99 # next; use manifest from source files value: "../../../config/default" replacements: - old: "image: .*/cluster-api-provider-packet:.*"