Merge openshift/installer for 4.1.0-rc.3

CHANGELOG.md

@@ -963,7 +963,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - etcd discovery now happens via `SRV` records.  On libvirt, this
   requires a new Terraform provider, so users with older providers
   should [install a newer
-  version](docs/dev/libvirt-howto.md#install-the-terraform-provider).
+  version](docs/dev/libvirt/README.md#install-the-terraform-provider).
   This also allows all masters to use a single Ignition file.
 - On AWS, the API and service load balancers have been changed from
   [classic load balancers][aws-elb] to [network load
@@ -1162,7 +1162,7 @@ The configuration and command-line interface are quite different, so
 previous `tectonic` users are encouraged to start from scratch when
 getting acquainted with `openshift-install`.  AWS users should look
 [here](README.md#quick-start).  Libvirt users should look
-[here](docs/dev/libvirt-howto.md).  The new `openshift-install` also
+[here](docs/dev/libvirt/README.md).  The new `openshift-install` also
 includes an interactive configuration generator, so you can launch the
 installer and follow along as it guides you through the process.
 

Gopkg.toml

@@ -61,9 +61,9 @@ required = [
   name = "k8s.io/client-go"
   version = "9.0.0"
 
-[[constraint]]
+[[override]]
   name = "github.com/openshift/cluster-api"
-  revision = "91fca585a85b163ddfd119fd09c128c9feadddca"
+  revision = "d8958b539e331bf5ebb056b7f872541e13fb8e01"
 
 [[constraint]]
   name = "sigs.k8s.io/cluster-api-provider-aws"
@@ -100,6 +100,6 @@ required = [
   source = "https://github.com/openshift/cluster-api-provider-openstack.git"
 
 [[constraint]]
-  branch = "openshiftnocluster"
+  branch = "master"
   name = "sigs.k8s.io/cluster-api-provider-azure"
-  source = "https://github.com/awesomenix/cluster-api-provider-azure.git"
+  source = "https://github.com/openshift/cluster-api-provider-azure.git"

OWNERS

@@ -3,6 +3,5 @@
 
 approvers:
   - installer-approvers
-  - openstack-approvers
 reviewers:
   - installer-reviewers

OWNERS_ALIASES

@@ -2,20 +2,31 @@
 
 aliases:
   installer-approvers:
-    - aaronlevy
     - abhinavdahiya
     - crawford
     - smarterclayton
     - staebler
     - steveeJ
     - wking
   installer-reviewers:
-    - vikramsk
+    - jcpowermac
+    - jhixson74
+    - jstuever
+    - mtnbikenc
+    - patrickdillon
+    - vrutkovs
+  libvirt-approvers:
+    - abhinavdahiya
+    - enxebre
+    - praveenkumar
+    - zeenix
+  libvirt-reviewers:
   openstack-approvers:
     - flaper87
     - tomassedovic
     - hardys
     - russellb
+    - trown
   vsphere-approvers:
     - abhinavdahiya
     - dav1x

README.md

@@ -19,6 +19,9 @@ provision the cluster.
 
 ## Supported Platforms
 
+* [AWS](docs/user/aws/README.md)
+* [Libvirt with KVM](docs/dev/libvirt/README.md) (development only)
+* [OpenStack (experimental)](docs/user/openstack/README.md)
 * [Bare-metal](docs/dev/baremetal.md)
 
 ## Quick Start

cmd/kni-install/create.go

@@ -96,6 +96,9 @@ var (
 
 				err = waitForBootstrapComplete(ctx, config, rootOpts.dir)
 				if err != nil {
+					if err2 := runGatherBootstrapCmd(rootOpts.dir); err2 != nil {
+						logrus.Error(err2)
+					}
 					logrus.Fatal(err)
 				}
 
@@ -272,40 +275,46 @@ func waitForBootstrapComplete(ctx context.Context, config *rest.Config, director
 		return errors.Wrap(err, "waiting for Kubernetes API")
 	}
 
-	eventTimeout := 60 * time.Minute
-	logrus.Infof("Waiting up to %v for the bootstrap-complete event...", eventTimeout)
-	return waitForEvent(ctx, client.CoreV1().RESTClient(), "bootstrap-complete", eventTimeout)
+	return waitForBootstrapConfigMap(ctx, client)
 }
 
-// waitForEvent watches the events in the kube-system namespace, waits
-// for the event of the given name, and prints out all other events on
-// the way.
-func waitForEvent(ctx context.Context, client cache.Getter, name string, timeout time.Duration) error {
+// waitForBootstrapConfigMap watches the configmaps in the kube-system namespace
+// and waits for the bootstrap configmap to report that bootstrapping has
+// completed.
+func waitForBootstrapConfigMap(ctx context.Context, client *kubernetes.Clientset) error {
+	timeout := 30 * time.Minute
+	logrus.Infof("Waiting up to %v for bootstrapping to complete...", timeout)
+
 	waitCtx, cancel := context.WithTimeout(ctx, timeout)
 	defer cancel()
 
-	resource := "events"
-	namespace := "kube-system"
-
 	_, err := clientwatch.UntilWithSync(
 		waitCtx,
-		cache.NewListWatchFromClient(client, resource, namespace, fields.Everything()),
-		&corev1.Event{},
+		cache.NewListWatchFromClient(client.CoreV1().RESTClient(), "configmaps", "kube-system", fields.OneTermEqualSelector("metadata.name", "bootstrap")),
+		&corev1.ConfigMap{},
 		nil,
 		func(event watch.Event) (bool, error) {
-			ev, ok := event.Object.(*corev1.Event)
+			switch event.Type {
+			case watch.Added, watch.Modified:
+			default:
+				return false, nil
+			}
+			cm, ok := event.Object.(*corev1.ConfigMap)
 			if !ok {
-				logrus.Warnf("Expected a core/v1.Event object but got a %q object instead", event.Object.GetObjectKind().GroupVersionKind())
+				logrus.Warnf("Expected a core/v1.ConfigMap object but got a %q object instead", event.Object.GetObjectKind().GroupVersionKind())
 				return false, nil
 			}
-
-			logrus.Debugf("%s %s: %s", strings.ToLower(string(event.Type)), ev.Name, ev.Message)
-			found := ev.Name == name && (event.Type == watch.Added || event.Type == watch.Modified)
-			return found, nil
+			status, ok := cm.Data["status"]
+			if !ok {
+				logrus.Debugf("No status found in bootstrap configmap")
+				return false, nil
+			}
+			logrus.Debugf("Bootstrap status: %v", status)
+			return status == "complete", nil
 		},
 	)
 
-	return errors.Wrapf(err, "failed to wait for %s event", name)
+	return errors.Wrap(err, "failed to wait for bootstrapping to complete")
 }
 
 // waitForInitializedCluster watches the ClusterVersion waiting for confirmation
@@ -320,6 +329,7 @@ func waitForInitializedCluster(ctx context.Context, config *rest.Config) error {
 	clusterVersionContext, cancel := context.WithTimeout(ctx, timeout)
 	defer cancel()
 
+	failing := configv1.ClusterStatusConditionType("Failing")
 	var lastError string
 	_, err = clientwatch.UntilWithSync(
 		clusterVersionContext,
@@ -337,8 +347,8 @@ func waitForInitializedCluster(ctx context.Context, config *rest.Config) error {
 				if cov1helpers.IsStatusConditionTrue(cv.Status.Conditions, configv1.OperatorAvailable) {
 					return true, nil
 				}
-				if cov1helpers.IsStatusConditionTrue(cv.Status.Conditions, configv1.OperatorFailing) {
-					lastError = cov1helpers.FindStatusCondition(cv.Status.Conditions, configv1.OperatorFailing).Message
+				if cov1helpers.IsStatusConditionTrue(cv.Status.Conditions, failing) {
+					lastError = cov1helpers.FindStatusCondition(cv.Status.Conditions, failing).Message
 				} else if cov1helpers.IsStatusConditionTrue(cv.Status.Conditions, configv1.OperatorProgressing) {
 					lastError = cov1helpers.FindStatusCondition(cv.Status.Conditions, configv1.OperatorProgressing).Message
 				}