Skip to content

Commit 0bfb7e1

Browse files
cpriviterecprivitere
authored
Merge pull request #586 from cprivitere/release-070
Push Release v0.7.0
2 parents 070ee2c + 356d129 commit 0bfb7e1

File tree

11 files changed

+16
-11
lines changed

11 files changed

+16
-11
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ You should then follow the [Cluster API Quick Start Guide](https://cluster-api.s
4949

5050
If you do not change the generated `yaml` files, it will use defaults. You can look in the [templates/cluster-template.yaml](./templates/cluster-template.yaml) file for details.
5151

52-
* `CPEM_VERSION` (defaults to `v3.6.0`)
52+
* `CPEM_VERSION` (defaults to `v3.6.1`)
5353
* `KUBE_VIP_VERSION` (defaults to `v0.5.12`)
5454
* `NODE_OS` (defaults to `ubuntu_20_04`)
5555
* `POD_CIDR` (defaults to `192.168.0.0/16`)

‎docs/RELEASE.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ This is normally performed by our CI system. However, there are important steps
1111
In order to cut a release, you must:
1212

1313
1. If this is a new major or minor version - but **not** just a patch change - update [metadata.yaml](../metadata.yaml) to add it, and map it to the correct cluster-api contract version
14+
1. Update [packet-ci-actions.yaml](../test/e2e/config/packet-ci-actions.yaml) and [packet-ci.yaml](../test/e2e/config/packet-ci.yaml) to use the new version number for the current and/or new contract version of the packet InfrastructureProvider.
15+
1. If this is a new major or minor version - but **not** just a patch chagne - update [packet-ci-actions.yaml](../test/e2e/config/packet-ci-actions.yaml) and [packet-ci.yaml](../test/e2e/config/packet-ci.yaml) to have a new "next" version number for the latest contract version of the packet InfrastructureProvider.
1416
1. Commit the changes.
1517
1. Push out your branch, open a PR and merge the changes
1618
1. Wait for the Continuous Integration github action to finish running

‎metadata.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
77
kind: Metadata
88
releaseSeries:
9+
- major: 0
10+
minor: 7
11+
contract: v1beta1
912
- major: 0
1013
minor: 6
1114
contract: v1beta1

‎templates/cluster-template-crs-cni.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ spec:
164164
echo "complete -o default -F __start_kubectl k" >> $HOME/.bashrc
165165
if [ -f "/run/kubeadm/kubeadm.yaml" ]; then
166166
export KUBECONFIG=/etc/kubernetes/admin.conf
167-
export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/${CPEM_VERSION:=v3.6.0}/deployment.yaml
167+
export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/${CPEM_VERSION:=v3.6.1}/deployment.yaml
168168
export SECRET_DATA='cloud-sa.json=''{"apiKey": "{{ .apiKey }}","projectID": "${PROJECT_ID}", "eipTag": "cluster-api-provider-packet:cluster-id:${CLUSTER_NAME}", "eipHealthCheckUseHostIP": true}'''
169169
kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}" || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}") || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}")
170170
kubectl apply -f $${CPEM_YAML} || (sleep 1 && kubectl apply -f $${CPEM_YAML}) || (sleep 1 && kubectl apply -f $${CPEM_YAML})

‎templates/cluster-template-kube-vip-crs-cni.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ spec:
157157
echo "complete -o default -F __start_kubectl k" >> $HOME/.bashrc
158158
if [ -f "/run/kubeadm/kubeadm.yaml" ]; then
159159
export KUBECONFIG=/etc/kubernetes/admin.conf
160-
export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/${CPEM_VERSION:=v3.6.0}/deployment.yaml
160+
export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/${CPEM_VERSION:=v3.6.1}/deployment.yaml
161161
export SECRET_DATA='cloud-sa.json=''{"apiKey": "{{ .apiKey }}","projectID": "${PROJECT_ID}"}'''
162162
kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}" || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}") || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}")
163163
kubectl apply -f $${CPEM_YAML} || (sleep 1 && kubectl apply -f $${CPEM_YAML}) || (sleep 1 && kubectl apply -f $${CPEM_YAML})

‎templates/cluster-template-kube-vip.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ spec:
136136
echo "complete -o default -F __start_kubectl k" >> $HOME/.bashrc
137137
if [ -f "/run/kubeadm/kubeadm.yaml" ]; then
138138
export KUBECONFIG=/etc/kubernetes/admin.conf
139-
export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/${CPEM_VERSION:=v3.6.0}/deployment.yaml
139+
export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/${CPEM_VERSION:=v3.6.1}/deployment.yaml
140140
export SECRET_DATA='cloud-sa.json=''{"apiKey": "{{ .apiKey }}","projectID": "${PROJECT_ID}"}'''
141141
kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}" || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}") || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}")
142142
kubectl apply -f $${CPEM_YAML} || (sleep 1 && kubectl apply -f $${CPEM_YAML}) || (sleep 1 && kubectl apply -f $${CPEM_YAML})

‎templates/cluster-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ spec:
8989
echo "complete -o default -F __start_kubectl k" >> $HOME/.bashrc
9090
if [ -f "/run/kubeadm/kubeadm.yaml" ]; then
9191
export KUBECONFIG=/etc/kubernetes/admin.conf
92-
export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/${CPEM_VERSION:=v3.6.0}/deployment.yaml
92+
export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/${CPEM_VERSION:=v3.6.1}/deployment.yaml
9393
export SECRET_DATA='cloud-sa.json=''{"apiKey": "{{ .apiKey }}","projectID": "${PROJECT_ID}", "eipTag": "cluster-api-provider-packet:cluster-id:${CLUSTER_NAME}", "eipHealthCheckUseHostIP": true}'''
9494
kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}" || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}") || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}")
9595
kubectl apply -f $${CPEM_YAML} || (sleep 1 && kubectl apply -f $${CPEM_YAML}) || (sleep 1 && kubectl apply -f $${CPEM_YAML})

‎templates/experimental-kube-vip/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ patches:
8383
echo "complete -o default -F __start_kubectl k" >> $HOME/.bashrc
8484
if [ -f "/run/kubeadm/kubeadm.yaml" ]; then
8585
export KUBECONFIG=/etc/kubernetes/admin.conf
86-
export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/${CPEM_VERSION:=v3.6.0}/deployment.yaml
86+
export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/${CPEM_VERSION:=v3.6.1}/deployment.yaml
8787
export SECRET_DATA='cloud-sa.json=''{"apiKey": "{{ .apiKey }}","projectID": "${PROJECT_ID}"}'''
8888
kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}" || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}") || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}")
8989
kubectl apply -f $${CPEM_YAML} || (sleep 1 && kubectl apply -f $${CPEM_YAML}) || (sleep 1 && kubectl apply -f $${CPEM_YAML})

‎test/e2e/config/packet-ci-actions.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ providers:
114114
# Add cluster templates
115115
- sourcePath: "../data/v1alpha3/cluster-template-packet-ccm.yaml"
116116
- sourcePath: "../data/v1alpha3/cluster-template-cpem.yaml"
117-
- name: v0.6.2
117+
- name: v0.7.0
118118
value: "${MANIFEST_PATH:=..}/infrastructure-components.yaml"
119119
type: "url"
120120
contract: v1beta1
@@ -125,7 +125,7 @@ providers:
125125
- sourcePath: "../data/v1beta1/cluster-template-node-drain.yaml"
126126
- sourcePath: "../data/v1beta1/cluster-template-md-remediation.yaml"
127127
- sourcePath: "../data/v1beta1/cluster-template-kcp-remediation.yaml"
128-
- name: v0.6.99 # next; use manifest from source files
128+
- name: v0.7.99 # next; use manifest from source files
129129
value: "${MANIFEST_PATH:=..}/infrastructure-components.yaml"
130130
type: "url"
131131
contract: v1beta1

‎test/e2e/config/packet-ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ providers:
114114
# Add cluster templates
115115
- sourcePath: "../data/v1alpha3/cluster-template-packet-ccm.yaml"
116116
- sourcePath: "../data/v1alpha3/cluster-template-cpem.yaml"
117-
- name: v0.6.2 #latest in the v1beta1 series
117+
- name: v0.7.0 #latest in the v1beta1 series
118118
value: "../../../config/default"
119119
replacements:
120120
- old: "image: .*/cluster-api-provider-packet:.*"
@@ -127,7 +127,7 @@ providers:
127127
- sourcePath: "../data/v1beta1/cluster-template-node-drain.yaml"
128128
- sourcePath: "../data/v1beta1/cluster-template-md-remediation.yaml"
129129
- sourcePath: "../data/v1beta1/cluster-template-kcp-remediation.yaml"
130-
- name: v0.6.99 # next; use manifest from source files
130+
- name: v0.7.99 # next; use manifest from source files
131131
value: "../../../config/default"
132132
replacements:
133133
- old: "image: .*/cluster-api-provider-packet:.*"

0 commit comments

Comments
 (0)