Merge branch 'master' into ssh_key_name

Author: hidekazuna

.zuul/playbooks/run.yaml

@@ -73,7 +73,6 @@
         cat /tmp/clouds.yaml
 
         export ARTIFACTS=/home/zuul/workspace/logs/_artifacts
-        export KUBERNETES_VERSION_SERIES={{ k8s_version_series }}
         export OPENSTACK_DNS_NAMESERVERS=8.8.8.8
         export CONTROL_PLANE_MACHINE_COUNT=1
         export WORKER_MACHINE_COUNT=1

Makefile

@@ -333,7 +333,7 @@ create-cluster: $(CLUSTERCTL) $(KUSTOMIZE) $(ENVSUBST) ## Create a development K
 
 	# (Re-)install Core providers
 	$(CLUSTERCTL) delete --all
-	$(CLUSTERCTL) init --core cluster-api:v0.3.5 --bootstrap kubeadm:v0.3.5 --control-plane kubeadm:v0.3.5
+	$(CLUSTERCTL) init --core cluster-api:v0.3.8 --bootstrap kubeadm:v0.3.8 --control-plane kubeadm:v0.3.8
 
 	# (Re-)deploy CAPO provider
 	MANIFEST_IMG=$(CONTROLLER_IMG)-$(ARCH) MANIFEST_TAG=$(TAG) $(MAKE) set-manifest-image
@@ -379,8 +379,6 @@ create-cluster: $(CLUSTERCTL) $(KUSTOMIZE) $(ENVSUBST) ## Create a development K
 
     # Patch Kubernetes version
 	cat ./hack/ci/e2e-conformance/e2e-conformance_patch.yaml.tpl | \
-	  sed "s|\$${OPENSTACK_CLOUD_PROVIDER_CONF_B64}|$(OPENSTACK_CLOUD_PROVIDER_CONF_B64)|" | \
-	  sed "s|\$${OPENSTACK_CLOUD_CACERT_B64}|$(OPENSTACK_CLOUD_CACERT_B64)|" | \
 	  sed "s|\$${KUBERNETES_VERSION}|$(KUBERNETES_VERSION)|" | \
 	  sed "s|\$${CLUSTER_NAME}|$(CLUSTER_NAME)|"  \
 	   > ./hack/ci/e2e-conformance/e2e-conformance_patch.yaml

go.mod

@@ -6,15 +6,15 @@ require (
 	github.com/go-logr/logr v0.1.0
 	github.com/gophercloud/gophercloud v0.8.0
 	github.com/gophercloud/utils v0.0.0-20200302155035-0565566533e4
-	github.com/onsi/ginkgo v1.12.0
-	github.com/onsi/gomega v1.9.0
+	github.com/onsi/ginkgo v1.12.1
+	github.com/onsi/gomega v1.10.1
 	github.com/pkg/errors v0.9.1
-	gopkg.in/yaml.v2 v2.2.8
-	k8s.io/api v0.17.2
-	k8s.io/apimachinery v0.17.2
-	k8s.io/client-go v0.17.2
+	gopkg.in/yaml.v2 v2.3.0
+	k8s.io/api v0.17.8
+	k8s.io/apimachinery v0.17.8
+	k8s.io/client-go v0.17.8
 	k8s.io/klog v1.0.0
-	k8s.io/utils v0.0.0-20200229041039-0a110f9eb7ab
-	sigs.k8s.io/cluster-api v0.3.5
-	sigs.k8s.io/controller-runtime v0.5.2
+	k8s.io/utils v0.0.0-20200619165400-6e3d28b6ed19
+	sigs.k8s.io/cluster-api v0.3.8
+	sigs.k8s.io/controller-runtime v0.5.9
 )