Skip to content

Commit 589f13a

Browse files
sbueringerpierreprinetti
authored andcommitted
🐛 PR for final bugfixes before the v1alpha3 release (kubernetes-sigs#520)
* finalize release doc * upgrade to cluster-api 0.3.1 * review fixes + metadata.yaml * another fixup * update doc * minor change to conformance test script * fixup env.rc * fixup * update * fix for yq 3.2.1 * another fixup * upgrade to capi 0.3.2 * Minor fixes * more minor fixes * fix cluster & machine deletion
1 parent 507b438 commit 589f13a

File tree

9 files changed

+95
-78
lines changed

9 files changed

+95
-78
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -291,14 +291,14 @@ release-notes: $(RELEASE_NOTES)
291291
## --------------------------------------
292292

293293
# Properties for create-cluster
294-
OPENSTACK_CONTROLPLANE_IP ?= "192.168.200.195"
294+
OPENSTACK_CONTROLPLANE_IP ?= ""
295295
OPENSTACK_FAILURE_DOMAIN ?= "nova"
296296
OPENSTACK_CLOUD ?= "capi-quickstart"
297297
OPENSTACK_CLOUD_CACERT_B64 ?= "Cg=="
298298
OPENSTACK_CLOUD_PROVIDER_CONF_B64 ?= ""
299299
OPENSTACK_CLOUD_YAML_B64 ?= ""
300300
OPENSTACK_EXTERNAL_NETWORK_ID ?= ""
301-
OPENSTACK_DNS_NAMESERVERS ?= "192.168.200.1"
301+
OPENSTACK_DNS_NAMESERVERS ?= ""
302302
OPENSTACK_IMAGE_NAME ?= "ubuntu-1910-kube-v1.17.3"
303303
OPENSTACK_SSH_AUTHORIZED_KEY ?= ""
304304
OPENSTACK_NODE_MACHINE_FLAVOR ?= "m1.medium"
@@ -335,7 +335,7 @@ create-cluster: $(CLUSTERCTL) $(ENVSUBST) ## Create a development Kubernetes clu
335335

336336
# (Re-)install Core providers
337337
$(CLUSTERCTL) delete --all
338-
$(CLUSTERCTL) init --core cluster-api:v0.3.0 --bootstrap kubeadm:v0.3.0 --control-plane kubeadm:v0.3.0
338+
$(CLUSTERCTL) init --core cluster-api:v0.3.2 --bootstrap kubeadm:v0.3.2 --control-plane kubeadm:v0.3.2
339339

340340
# (Re-)deploy CAPO provider
341341
MANIFEST_IMG=$(CONTROLLER_IMG)-$(ARCH) MANIFEST_TAG=$(TAG) $(MAKE) set-manifest-image

RELEASE.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
2. If this is a new minor release, create a new release branch and push to github, otherwise switch to it, for example `release-0.2`
2323
3. Run `make release-notes` to gather changes since the last revision. If you need to specify a specific tag to look for changes
2424
since, use `make release-notes ARGS="--from <tag>"` Pay close attention to the `## :question: Sort these by hand` section, as it contains items that need to be manually sorted.
25-
4. Tag the repository and push the tag `git tag -s -m $VERSION $VERSION`
25+
4. Tag the repository and push the tag `git tag -s -m $VERSION $VERSION; git push upstream $VERSION`
2626
5. Create a draft release in github and associate it with the tag that was just created, copying the generated release notes into
2727
the draft.
2828
6. Checkout the tag you've just created and make sure git is in a clean state
@@ -31,9 +31,11 @@
3131
1. `./out/infrastructure-components.yaml`
3232
2. `./templates/cluster-template.yaml`
3333
3. `./templates/cluster-template-without-lb.yaml`
34+
4. `./metadata.yaml` (clusterctl >0.3.1 will include hardcoded metadata for CAPO. But let's keep the `metadata.yaml` file for our v0.3.* releases to be compatible with clusterctl <=0.3.1)
3435
9. Perform the [image promotion process](https://github.com/kubernetes/k8s.io/tree/master/k8s.gcr.io#image-promoter).
3536
The staging repository is at https://console.cloud.google.com/gcr/images/k8s-staging-capi-openstack/GLOBAL. Be
3637
sure to choose the top level `capi-openstack-controller`, which will provide the multi-arch manifest, rather than one for a specific architecture.
38+
Add the new sha=>tag mapping to the [images.yaml](https://github.com/kubernetes/k8s.io/edit/master/k8s.gcr.io/images/k8s-staging-capi-openstack/images.yaml)
3739
10. Finalise the release notes
3840
11. Publish release. Use the pre-release option for release
3941
candidate versions of Cluster API Provider OpenStack.
@@ -45,13 +47,12 @@
4547

4648
Releasing requires a particular set of permissions.
4749

48-
* Push access to the staging gcr bucket ([kubernetes/k8s.io/k8s.gcr.io/k8s-staging-capi-openstack/OWNERS](https://github.com/kubernetes/k8s.io/blob/master/k8s.gcr.io/k8s-staging-capi-openstack/OWNERS)
49-
* Tag push access to the GitHub repository ([kubernetes/org/config/kubernetes-sigs/sig-cluster-lifecycle/teams.yaml](https://github.com/kubernetes/org/blob/master/config/kubernetes-sigs/sig-cluster-lifecycle/teams.yaml#L136-L137))
50-
* GitHub release creation access ([kubernetes/org/config/kubernetes-sigs/sig-cluster-lifecycle/teams.yaml](https://github.com/kubernetes/org/blob/master/config/kubernetes-sigs/sig-cluster-lifecycle/teams.yaml#L136-L137))
50+
* Approver role for the image promoter process ([kubernetes/k8s.io/blob/master/k8s.gcr.io/images/k8s-staging-capi-openstack/OWNERS](https://github.com/kubernetes/k8s.io/blob/master/k8s.gcr.io/images/k8s-staging-capi-openstack/OWNERS))
51+
* Tag push and release creation rights to the GitHub repository (team `cluster-api-provider-openstack-maintainers` in [kubernetes/org/config/kubernetes-sigs/sig-cluster-lifecycle/teams.yaml](https://github.com/kubernetes/org/blob/master/config/kubernetes-sigs/sig-cluster-lifecycle/teams.yaml))
5152

5253
## Staging
5354

5455
There is a post-submit Prow job running after each commit on master which pushes a new image to the staging repo (`gcr.io/k8s-staging-capi-openstack/capi-openstack-controller:latest`). Following configuration is involved:
55-
* staging gcr bucket: [kubernetes/k8s.io/k8s.gcr.io/k8s-staging-capi-openstack/manifest.yaml](https://github.com/kubernetes/k8s.io/blob/master/k8s.gcr.io/k8s-staging-capi-openstack/manifest.yaml)
56-
* post-submit `post-capi-openstack-push-images` Prow job: [kubernetes/test-infra/config/jobs/image-pushing/k8s-staging-capi-openstack.yaml](https://github.com/kubernetes/test-infra/blob/master/config/jobs/image-pushing/k8s-staging-capi-openstack.yaml)) (corresponding dashboard is located at [https://testgrid.k8s.io/sig-cluster-lifecycle-image-pushes#post-capi-openstack-push-images](https://testgrid.k8s.io/sig-cluster-lifecycle-image-pushes#post-capi-openstack-push-images))
56+
* staging gcr bucket: [kubernetes/k8s.io/blob/master/k8s.gcr.io/manifests/k8s-staging-capi-openstack/promoter-manifest.yaml](https://github.com/kubernetes/k8s.io/blob/master/k8s.gcr.io/manifests/k8s-staging-capi-openstack/promoter-manifest.yaml)
57+
* post-submit `post-capi-openstack-push-images` Prow job: [kubernetes/test-infra/blob/master/config/jobs/image-pushing/k8s-staging-cluster-api.yaml](https://github.com/kubernetes/test-infra/blob/master/config/jobs/image-pushing/k8s-staging-cluster-api.yaml)) (corresponding dashboard is located at [https://testgrid.k8s.io/sig-cluster-lifecycle-image-pushes#post-capi-openstack-push-images](https://testgrid.k8s.io/sig-cluster-lifecycle-image-pushes#post-capi-openstack-push-images))
5758
* Google Cloud Build configuration which is used by the Prow job: [kubernetes-sigs/cluster-api-provider-openstack/cloudbuild.yaml](https://github.com/kubernetes-sigs/cluster-api-provider-openstack/blob/master/cloudbuild.yaml)

controllers/openstackcluster_controller.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,14 +100,14 @@ func (r *OpenStackClusterReconciler) Reconcile(req ctrl.Request) (_ ctrl.Result,
100100

101101
// Handle deleted clusters
102102
if !openStackCluster.DeletionTimestamp.IsZero() {
103-
return r.reconcileDelete(log, cluster, openStackCluster)
103+
return r.reconcileDelete(ctx, log, patchHelper, cluster, openStackCluster)
104104
}
105105

106106
// Handle non-deleted clusters
107107
return r.reconcileNormal(ctx, log, patchHelper, cluster, openStackCluster)
108108
}
109109

110-
func (r *OpenStackClusterReconciler) reconcileDelete(log logr.Logger, cluster *clusterv1.Cluster, openStackCluster *infrav1.OpenStackCluster) (ctrl.Result, error) {
110+
func (r *OpenStackClusterReconciler) reconcileDelete(ctx context.Context, log logr.Logger, patchHelper *patch.Helper, cluster *clusterv1.Cluster, openStackCluster *infrav1.OpenStackCluster) (ctrl.Result, error) {
111111
log.Info("Reconciling Cluster delete")
112112

113113
clusterName := fmt.Sprintf("%s-%s", cluster.Namespace, cluster.Name)
@@ -154,7 +154,9 @@ func (r *OpenStackClusterReconciler) reconcileDelete(log logr.Logger, cluster *c
154154

155155
// Cluster is deleted so remove the finalizer.
156156
controllerutil.RemoveFinalizer(openStackCluster, infrav1.ClusterFinalizer)
157-
157+
if err := patchHelper.Patch(ctx, openStackCluster); err != nil {
158+
return ctrl.Result{}, err
159+
}
158160
return reconcile.Result{}, nil
159161
}
160162

controllers/openstackmachine_controller.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ func (r *OpenStackMachineReconciler) Reconcile(req ctrl.Request) (_ ctrl.Result,
143143

144144
// Handle deleted machines
145145
if !openStackMachine.DeletionTimestamp.IsZero() {
146-
return r.reconcileDelete(logger, machine, openStackMachine, cluster, openStackCluster)
146+
return r.reconcileDelete(ctx, logger, patchHelper, machine, openStackMachine, cluster, openStackCluster)
147147
}
148148

149149
// Handle non-deleted clusters
@@ -193,7 +193,7 @@ func (r *OpenStackMachineReconciler) SetupWithManager(mgr ctrl.Manager, options
193193
)
194194
}
195195

196-
func (r *OpenStackMachineReconciler) reconcileDelete(logger logr.Logger, machine *clusterv1.Machine, openStackMachine *infrav1.OpenStackMachine, cluster *clusterv1.Cluster, openStackCluster *infrav1.OpenStackCluster) (ctrl.Result, error) {
196+
func (r *OpenStackMachineReconciler) reconcileDelete(ctx context.Context, logger logr.Logger, patchHelper *patch.Helper, machine *clusterv1.Machine, openStackMachine *infrav1.OpenStackMachine, cluster *clusterv1.Cluster, openStackCluster *infrav1.OpenStackCluster) (ctrl.Result, error) {
197197
logger.Info("Handling deleted OpenStackMachine")
198198

199199
clusterName := fmt.Sprintf("%s-%s", cluster.ObjectMeta.Namespace, cluster.Name)
@@ -227,6 +227,9 @@ func (r *OpenStackMachineReconciler) reconcileDelete(logger logr.Logger, machine
227227
if instance == nil {
228228
logger.Info("Skipped deleting machine that is already deleted")
229229
controllerutil.RemoveFinalizer(openStackMachine, infrav1.MachineFinalizer)
230+
if err := patchHelper.Patch(ctx, openStackMachine); err != nil {
231+
return ctrl.Result{}, err
232+
}
230233
return ctrl.Result{}, nil
231234
}
232235

@@ -242,7 +245,9 @@ func (r *OpenStackMachineReconciler) reconcileDelete(logger logr.Logger, machine
242245

243246
// Instance is deleted so remove the finalizer.
244247
controllerutil.RemoveFinalizer(openStackMachine, infrav1.MachineFinalizer)
245-
248+
if err := patchHelper.Patch(ctx, openStackMachine); err != nil {
249+
return ctrl.Result{}, err
250+
}
246251
return ctrl.Result{}, nil
247252
}
248253

@@ -254,7 +259,7 @@ func (r *OpenStackMachineReconciler) reconcileNormal(ctx context.Context, logger
254259
}
255260

256261
// If the OpenStackMachine doesn't have our finalizer, add it.
257-
controllerutil.AddFinalizer(openStackMachine, infrav1.ClusterFinalizer)
262+
controllerutil.AddFinalizer(openStackMachine, infrav1.MachineFinalizer)
258263
// Register the finalizer immediately to avoid orphaning OpenStack resources on delete
259264
if err := patchHelper.Patch(ctx, openStackMachine); err != nil {
260265
return ctrl.Result{}, err

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ require (
1515
k8s.io/client-go v0.17.2
1616
k8s.io/klog v1.0.0
1717
k8s.io/utils v0.0.0-20200229041039-0a110f9eb7ab
18-
sigs.k8s.io/cluster-api v0.3.0
18+
sigs.k8s.io/cluster-api v0.3.2
1919
sigs.k8s.io/controller-runtime v0.5.1
2020
)

go.sum

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r
3838
github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
3939
github.com/bifurcation/mint v0.0.0-20180715133206-93c51c6ce115/go.mod h1:zVt7zX3K/aDCk9Tj+VM7YymsX66ERvzCJzw8rFCX2JU=
4040
github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
41+
github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
4142
github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
4243
github.com/caddyserver/caddy v1.0.3/go.mod h1:G+ouvOY32gENkJC+jhgl62TyhvqEsFaDiZ4uw0RzP1E=
4344
github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
@@ -49,7 +50,7 @@ github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL
4950
github.com/cheekybits/genny v0.0.0-20170328200008-9127e812e1e9/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
5051
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
5152
github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
52-
github.com/coredns/corefile-migration v1.0.6/go.mod h1:OFwBp/Wc9dJt5cAZzHWMNhK1r5L0p0jDwIBc6j8NC8E=
53+
github.com/coredns/corefile-migration v1.0.7/go.mod h1:OFwBp/Wc9dJt5cAZzHWMNhK1r5L0p0jDwIBc6j8NC8E=
5354
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
5455
github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
5556
github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
@@ -156,8 +157,6 @@ github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
156157
github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
157158
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
158159
github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
159-
github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7 h1:u4bArs140e9+AfE52mFHOXVFnOSBJBRlzTHrOPLOIhE=
160-
github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
161160
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
162161
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY=
163162
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -621,10 +620,8 @@ modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
621620
modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
622621
modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
623622
modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
624-
sigs.k8s.io/cluster-api v0.3.0 h1:e0t4IJmefMEammok9DsXw29vPu8UAMe0k19zdLFiU2w=
625-
sigs.k8s.io/cluster-api v0.3.0/go.mod h1:+i6vt6ot1/UlIAZZ1sCtchkBIJw33m41mu3fclRWQXA=
626-
sigs.k8s.io/controller-runtime v0.5.0 h1:CbqIy5fbUX+4E9bpnBFd204YAzRYlM9SWW77BbrcDQo=
627-
sigs.k8s.io/controller-runtime v0.5.0/go.mod h1:REiJzC7Y00U+2YkMbT8wxgrsX5USpXKGhb2sCtAXiT8=
623+
sigs.k8s.io/cluster-api v0.3.2 h1:+oiclIxk1PthGCBbYLEdfZi1u2qFTjK+wwIrtLNlBXA=
624+
sigs.k8s.io/cluster-api v0.3.2/go.mod h1:PkmtV10dmmSmBSpR28c5UxDvWRszTxj+p9KLrb8JVZ8=
628625
sigs.k8s.io/controller-runtime v0.5.1 h1:TNidCfVoU/cs2i+9xoTcL/l7yhl0bDhYXU0NCG6wmiE=
629626
sigs.k8s.io/controller-runtime v0.5.1/go.mod h1:Uojny7gvg55YLQnEGnPzRE3dC4ik2tRlZJgOUCWXAV4=
630627
sigs.k8s.io/kind v0.7.1-0.20200303021537-981bd80d3802/go.mod h1:HIZ3PWUezpklcjkqpFbnYOqaqsAE1JeCTEwkgvPLXjk=

hack/ci/e2e-conformance.sh

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ OPENSTACK_CLOUD_YAML_FILE=${OPENSTACK_CLOUD_YAML_FILE:-"/tmp/clouds.yaml"}
2222
OPENSTACK_SSH_AUTHORIZED_KEY_PATH=${OPENSTACK_SSH_AUTHORIZED_KEY_PATH:-"/tmp/id_rsa.pub"}
2323
OPENSTACK_SSH_PRIVATE_KEY_PATH=${OPENSTACK_SSH_PRIVATE_KEY_PATH:-"/tmp/id_rsa"}
2424
OPENSTACK_IMAGE_NAME="ubuntu-1910-kube-v1.17.3"
25+
OPENSTACK_CONTROLPLANE_IP=${OPENSTACK_CONTROLPLANE_IP:-"192.168.200.195"}
26+
OPENSTACK_DNS_NAMESERVERS=${OPENSTACK_DNS_NAMESERVERS:-"192.168.200.1"}
2527
CLUSTER_NAME=${CLUSTER_NAME:-"capi-quickstart"}
2628
KUBERNETES_VERSION=${KUBERNETES_VERSION:-"v1.17.3"}
2729
TIMESTAMP=$(date +"%Y-%m-%dT%H:%M:%SZ")
@@ -161,7 +163,7 @@ upload_image() {
161163
fi
162164

163165
tmp_source_image=/tmp/ubuntu-1910.ova.qcow2
164-
wget -q https://github.com/sbueringer/image-builder/releases/download/v1.17.3-04/ubuntu-1910-kube-v1.17.3.qcow2 -O ${tmp_source_image}
166+
wget -q -c https://github.com/sbueringer/image-builder/releases/download/v1.17.3-04/ubuntu-1910-kube-v1.17.3.qcow2 -O ${tmp_source_image}
165167

166168
echo "Uploading image ${tmp_source_image} as ${OPENSTACK_IMAGE_NAME}"
167169
openstack image create --disk-format qcow2 \
@@ -195,9 +197,10 @@ install_prereqs() {
195197
#curl https://bazel.build/bazel-release.pub.gpg | sudo apt-key add -
196198
#echo "deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8" | sudo tee /etc/apt/sources.list.d/bazel.list
197199
#sudo apt update && sudo apt install bazel
198-
wget -q https://github.com/bazelbuild/bazel/releases/download/0.28.1/bazel-0.28.1-installer-linux-x86_64.sh
199-
chmod +x bazel-0.28.1-installer-linux-x86_64.sh
200-
./bazel-0.28.1-installer-linux-x86_64.sh --user
200+
bazel_version=0.28.1
201+
wget -q https://github.com/bazelbuild/bazel/releases/download/${bazel_version}/bazel-${bazel_version}-installer-linux-x86_64.sh
202+
chmod +x bazel-${bazel_version}-installer-linux-x86_64.sh
203+
./bazel-${bazel_version}-installer-linux-x86_64.sh --user
201204

202205
# Bazel is installed in /root/bin
203206
export PATH="/root/bin:${PATH}"
@@ -227,6 +230,8 @@ build() {
227230
# ensure the e2e script will find our binaries ...
228231
mkdir -p "${PWD}/_output/bin/"
229232
rm -f "${PWD}/_output/bin/e2e.test"
233+
234+
# use go build for local execution if no bazel version is installed which is that old
230235
if bazel --version | grep "0.28.1"
231236
then
232237
bazel build //test/e2e:e2e.test
@@ -285,6 +290,8 @@ create_cluster() {
285290
OPENSTACK_EXTERNAL_NETWORK_ID=$(openstack network show "public" -f value -c id) \
286291
OPENSTACK_IMAGE_NAME=${OPENSTACK_IMAGE_NAME} \
287292
OPENSTACK_SSH_AUTHORIZED_KEY="$(cat ${OPENSTACK_SSH_AUTHORIZED_KEY_PATH})" \
293+
OPENSTACK_CONTROLPLANE_IP=${OPENSTACK_CONTROLPLANE_IP} \
294+
OPENSTACK_DNS_NAMESERVERS=${OPENSTACK_DNS_NAMESERVERS} \
288295
KUBERNETES_VERSION=${KUBERNETES_VERSION} \
289296
make create-cluster
290297

metadata.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
2+
kind: Metadata
3+
releaseSeries:
4+
- major: 0
5+
minor: 3
6+
contract: v1alpha3

0 commit comments

Comments
 (0)