mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-03 19:58:17 +00:00 
			
		
		
		
	Merge pull request #18349 from mesosphere/sttts-workaround-kube-ui-condition-order-assumption
Auto commit by PR queue bot
This commit is contained in:
		@@ -21,13 +21,13 @@ import (
 | 
			
		||||
	"reflect"
 | 
			
		||||
	"strconv"
 | 
			
		||||
	"strings"
 | 
			
		||||
 | 
			
		||||
	"time"
 | 
			
		||||
 | 
			
		||||
	log "github.com/golang/glog"
 | 
			
		||||
	mesos "github.com/mesos/mesos-go/mesosproto"
 | 
			
		||||
	"k8s.io/kubernetes/pkg/api"
 | 
			
		||||
	"k8s.io/kubernetes/pkg/api/errors"
 | 
			
		||||
	"k8s.io/kubernetes/pkg/api/unversioned"
 | 
			
		||||
	client "k8s.io/kubernetes/pkg/client/unversioned"
 | 
			
		||||
	"k8s.io/kubernetes/pkg/util/validation"
 | 
			
		||||
)
 | 
			
		||||
@@ -55,6 +55,19 @@ func Create(
 | 
			
		||||
		},
 | 
			
		||||
		Status: api.NodeStatus{
 | 
			
		||||
			Phase: api.NodePending,
 | 
			
		||||
			// WORKAROUND(sttts): make sure that the Ready condition is the
 | 
			
		||||
			// first one. The kube-ui v3 depends on this assumption.
 | 
			
		||||
			// TODO(sttts): remove this workaround when kube-ui v4 is used or we
 | 
			
		||||
			//              merge this with the statusupdate in the controller manager.
 | 
			
		||||
			Conditions: []api.NodeCondition{
 | 
			
		||||
				{
 | 
			
		||||
					Type:              api.NodeReady,
 | 
			
		||||
					Status:            api.ConditionTrue,
 | 
			
		||||
					Reason:            slaveReadyReason,
 | 
			
		||||
					Message:           slaveReadyMessage,
 | 
			
		||||
					LastHeartbeatTime: unversioned.Now(),
 | 
			
		||||
				},
 | 
			
		||||
			},
 | 
			
		||||
		},
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user