Merge pull request #38 from chuckha/ready

Use a ready/bool instead of phase

Author: k8s-ci-robot

api/v1alpha1/kubeadmbootstrapconfig_types.go

@@ -21,15 +21,6 @@ import (
 	kubeadmv1beta1 "sigs.k8s.io/cluster-api-bootstrap-provider-kubeadm/kubeadm/v1beta1"
 )
 
-// Phase defines KubeadmBootstrapConfig phases
-type Phase string
-
-// Ready defines the KubeadmBootstrapConfig Ready Phase
-const (
-	// Ready indicates the config is ready to be used by a Machine.
-	Ready Phase = "Ready"
-)
-
 // KubeadmBootstrapConfigSpec defines the desired state of KubeadmBootstrapConfig
 type KubeadmBootstrapConfigSpec struct {
 	ClusterConfiguration kubeadmv1beta1.ClusterConfiguration `json:"clusterConfiguration"`
@@ -39,8 +30,8 @@ type KubeadmBootstrapConfigSpec struct {
 
 // KubeadmBootstrapConfigStatus defines the observed state of KubeadmBootstrapConfig
 type KubeadmBootstrapConfigStatus struct {
-	// Phase is the state of the KubeadmBootstrapConfig object
-	Phase Phase `json:"phase"`
+	// Ready indicates the BootstrapData field is ready to be consumed
+	Ready bool `json:"phase,omitempty"`
 
 	// BootstrapData will be a cloud-init script for now
 	// +optional

config/crd/bases/kubeadm.bootstrap.cluster.sigs.k8s.io_kubeadmbootstrapconfigs.yaml

@@ -1059,10 +1059,9 @@ spec:
               format: byte
               type: string
             phase:
-              description: Phase is the state of the KubeadmBootstrapConfig object
-              type: string
-          required:
-          - phase
+              description: Ready indicates the BootstrapData field is ready to be
+                consumed
+              type: boolean
           type: object
       type: object
   versions:

go.mod

@@ -12,6 +12,7 @@ require (
 	k8s.io/apimachinery v0.0.0-20190704094733-8f6ac2502e51
 	k8s.io/client-go v11.0.1-0.20190704100234-640d9f240853+incompatible
 	k8s.io/cluster-bootstrap v0.0.0-20190703212826-5ad085674a4f
+	k8s.io/klog v0.3.1
 	k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a // indirect
 	sigs.k8s.io/cluster-api v0.0.0-20190711133056-09e491e49d7c
 	sigs.k8s.io/controller-runtime v0.2.0-beta.4