diff --git a/go/config/edge_node_cluster.pb.go b/go/config/edge_node_cluster.pb.go index 10e7b6ed..6acab7eb 100644 --- a/go/config/edge_node_cluster.pb.go +++ b/go/config/edge_node_cluster.pb.go @@ -262,6 +262,13 @@ type EdgeNodeCluster struct { HaScheme HAScheme `protobuf:"varint,11,opt,name=ha_scheme,json=haScheme,proto3,enum=org.lfedge.eve.config.HAScheme" json:"ha_scheme,omitempty"` // Optional load balancer service configuration. LoadBalancerService *LoadBalancerService `protobuf:"bytes,12,opt,name=load_balancer_service,json=loadBalancerService,proto3" json:"load_balancer_service,omitempty"` + // UUIDs of all designated master/control-plane nodes in the cluster, + // as known to the controller. The elected kube-stats leader among + // surviving EVE nodes uses this list to prune k8s Node objects (and + // thereby k3s embedded etcd members) for masters the controller has + // removed (e.g. after a "replace node" operation in the UI). + // Workers are not listed here. + MasterNodeUuids []string `protobuf:"bytes,13,rep,name=master_node_uuids,json=masterNodeUuids,proto3" json:"master_node_uuids,omitempty"` } func (x *EdgeNodeCluster) Reset() { @@ -373,6 +380,13 @@ func (x *EdgeNodeCluster) GetLoadBalancerService() *LoadBalancerService { return nil } +func (x *EdgeNodeCluster) GetMasterNodeUuids() []string { + if x != nil { + return x.MasterNodeUuids + } + return nil +} + var File_config_edge_node_cluster_proto protoreflect.FileDescriptor var file_config_edge_node_cluster_proto_rawDesc = []byte{ @@ -393,8 +407,8 @@ var file_config_edge_node_cluster_proto_rawDesc = []byte{ 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x6f, 0x72, 0x67, 0x2e, 0x6c, 0x66, 0x65, 0x64, 0x67, 0x65, 0x2e, 0x65, 0x76, 0x65, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, - 0x63, 0x65, 0x52, 0x0a, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x22, 0xe8, - 0x04, 0x0a, 0x0f, 0x45, 0x64, 0x67, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, + 0x63, 0x65, 0x52, 0x0a, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x22, 0x94, + 0x05, 0x0a, 0x0f, 0x45, 0x64, 0x67, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, @@ -432,24 +446,27 @@ var file_config_edge_node_cluster_proto_rawDesc = []byte{ 0x66, 0x65, 0x64, 0x67, 0x65, 0x2e, 0x65, 0x76, 0x65, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x13, 0x6c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, - 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2a, 0x84, 0x01, 0x0a, 0x0b, 0x43, 0x6c, - 0x75, 0x73, 0x74, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x18, 0x43, 0x4c, 0x55, - 0x53, 0x54, 0x45, 0x52, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, - 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x15, 0x43, 0x4c, 0x55, 0x53, 0x54, - 0x45, 0x52, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4b, 0x33, 0x53, 0x5f, 0x42, 0x41, 0x53, 0x45, - 0x10, 0x01, 0x12, 0x23, 0x0a, 0x1f, 0x43, 0x4c, 0x55, 0x53, 0x54, 0x45, 0x52, 0x5f, 0x54, 0x59, - 0x50, 0x45, 0x5f, 0x52, 0x45, 0x50, 0x4c, 0x49, 0x43, 0x41, 0x54, 0x45, 0x44, 0x5f, 0x53, 0x54, - 0x4f, 0x52, 0x41, 0x47, 0x45, 0x10, 0x02, 0x12, 0x17, 0x0a, 0x0f, 0x43, 0x4c, 0x55, 0x53, 0x54, - 0x45, 0x52, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x48, 0x41, 0x10, 0x03, 0x1a, 0x02, 0x08, 0x01, - 0x2a, 0x41, 0x0a, 0x08, 0x48, 0x41, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x65, 0x12, 0x19, 0x0a, 0x15, - 0x48, 0x41, 0x5f, 0x53, 0x43, 0x48, 0x45, 0x4d, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, - 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1a, 0x0a, 0x16, 0x48, 0x41, 0x5f, 0x53, 0x43, - 0x48, 0x45, 0x4d, 0x45, 0x5f, 0x4b, 0x33, 0x53, 0x5f, 0x45, 0x4d, 0x42, 0x45, 0x44, 0x44, 0x45, - 0x44, 0x10, 0x01, 0x42, 0x3d, 0x0a, 0x15, 0x6f, 0x72, 0x67, 0x2e, 0x6c, 0x66, 0x65, 0x64, 0x67, - 0x65, 0x2e, 0x65, 0x76, 0x65, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5a, 0x24, 0x67, 0x69, - 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6c, 0x66, 0x2d, 0x65, 0x64, 0x67, 0x65, - 0x2f, 0x65, 0x76, 0x65, 0x2d, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x63, 0x6f, 0x6e, 0x66, - 0x69, 0x67, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x2a, 0x0a, 0x11, 0x6d, 0x61, 0x73, + 0x74, 0x65, 0x72, 0x5f, 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x75, 0x75, 0x69, 0x64, 0x73, 0x18, 0x0d, + 0x20, 0x03, 0x28, 0x09, 0x52, 0x0f, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x64, 0x65, + 0x55, 0x75, 0x69, 0x64, 0x73, 0x2a, 0x84, 0x01, 0x0a, 0x0b, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, + 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x18, 0x43, 0x4c, 0x55, 0x53, 0x54, 0x45, 0x52, + 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, + 0x44, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x15, 0x43, 0x4c, 0x55, 0x53, 0x54, 0x45, 0x52, 0x5f, 0x54, + 0x59, 0x50, 0x45, 0x5f, 0x4b, 0x33, 0x53, 0x5f, 0x42, 0x41, 0x53, 0x45, 0x10, 0x01, 0x12, 0x23, + 0x0a, 0x1f, 0x43, 0x4c, 0x55, 0x53, 0x54, 0x45, 0x52, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x52, + 0x45, 0x50, 0x4c, 0x49, 0x43, 0x41, 0x54, 0x45, 0x44, 0x5f, 0x53, 0x54, 0x4f, 0x52, 0x41, 0x47, + 0x45, 0x10, 0x02, 0x12, 0x17, 0x0a, 0x0f, 0x43, 0x4c, 0x55, 0x53, 0x54, 0x45, 0x52, 0x5f, 0x54, + 0x59, 0x50, 0x45, 0x5f, 0x48, 0x41, 0x10, 0x03, 0x1a, 0x02, 0x08, 0x01, 0x2a, 0x41, 0x0a, 0x08, + 0x48, 0x41, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x65, 0x12, 0x19, 0x0a, 0x15, 0x48, 0x41, 0x5f, 0x53, + 0x43, 0x48, 0x45, 0x4d, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, + 0x44, 0x10, 0x00, 0x12, 0x1a, 0x0a, 0x16, 0x48, 0x41, 0x5f, 0x53, 0x43, 0x48, 0x45, 0x4d, 0x45, + 0x5f, 0x4b, 0x33, 0x53, 0x5f, 0x45, 0x4d, 0x42, 0x45, 0x44, 0x44, 0x45, 0x44, 0x10, 0x01, 0x42, + 0x3d, 0x0a, 0x15, 0x6f, 0x72, 0x67, 0x2e, 0x6c, 0x66, 0x65, 0x64, 0x67, 0x65, 0x2e, 0x65, 0x76, + 0x65, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5a, 0x24, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, + 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6c, 0x66, 0x2d, 0x65, 0x64, 0x67, 0x65, 0x2f, 0x65, 0x76, 0x65, + 0x2d, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/images/devconfig.svg b/images/devconfig.svg index 4cff910b..64d136e6 100644 --- a/images/devconfig.svg +++ b/images/devconfig.svg @@ -12,30 +12,6 @@ org.lfedge.eve.config - -cluster_c75e6f3a3956 - - -org.lfedge.eve.common - - - - -cluster_087a8b768833 - - -netconfig.proto - - - - -cluster_a1a638239bbb - - -edgeview.proto - - - cluster_ed03ba9919d5 @@ -84,6 +60,38 @@ + +cluster_c75e6f3a3956 + + +org.lfedge.eve.common + + + + +cluster_087a8b768833 + + +netconfig.proto + + + + +cluster_a1a638239bbb + + +edgeview.proto + + + + +cluster_f89bbdbe2429 + + +netinst.proto + + + cluster_0eca8c4caf24 @@ -116,14 +124,6 @@ - -cluster_f89bbdbe2429 - - -netinst.proto - - - cluster_c4848830929a diff --git a/proto/config/edge_node_cluster.proto b/proto/config/edge_node_cluster.proto index 09681762..100c6afc 100644 --- a/proto/config/edge_node_cluster.proto +++ b/proto/config/edge_node_cluster.proto @@ -78,4 +78,12 @@ message EdgeNodeCluster { // Optional load balancer service configuration. LoadBalancerService load_balancer_service = 12; + + // UUIDs of all designated master/control-plane nodes in the cluster, + // as known to the controller. The elected kube-stats leader among + // surviving EVE nodes uses this list to prune k8s Node objects (and + // thereby k3s embedded etcd members) for masters the controller has + // removed (e.g. after a "replace node" operation in the UI). + // Workers are not listed here. + repeated string master_node_uuids = 13; } diff --git a/python/config/edge_node_cluster_pb2.py b/python/config/edge_node_cluster_pb2.py index ccd7d087..1bd4ca44 100644 --- a/python/config/edge_node_cluster_pb2.py +++ b/python/config/edge_node_cluster_pb2.py @@ -14,7 +14,7 @@ from evecommon import acipherinfo_pb2 as evecommon_dot_acipherinfo__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1e\x63onfig/edge_node_cluster.proto\x12\x15org.lfedge.eve.config\x1a\x1b\x65vecommon/acipherinfo.proto\"F\n\x15LoadBalancerInterface\x12\x16\n\x0einterface_name\x18\x01 \x01(\t\x12\x15\n\raddress_cidrs\x18\x02 \x03(\t\"W\n\x13LoadBalancerService\x12@\n\ninterfaces\x18\x01 \x03(\x0b\x32,.org.lfedge.eve.config.LoadBalancerInterface\"\xbc\x03\n\x0f\x45\x64geNodeCluster\x12\x14\n\x0c\x63luster_name\x18\x01 \x01(\t\x12\x12\n\ncluster_id\x18\x02 \x01(\t\x12\x19\n\x11\x63luster_interface\x18\x03 \x01(\t\x12\x19\n\x11\x63luster_ip_prefix\x18\x04 \x01(\t\x12\x16\n\x0eis_worker_node\x18\x05 \x01(\x08\x12\x16\n\x0ejoin_server_ip\x18\x06 \x01(\t\x12\x43\n\x17\x65ncrypted_cluster_token\x18\x07 \x01(\x0b\x32\".org.lfedge.eve.common.CipherBlock\x12\x38\n\x0c\x63luster_type\x18\x08 \x01(\x0e\x32\".org.lfedge.eve.config.ClusterType\x12\x1b\n\x13tie_breaker_node_id\x18\t \x01(\t\x12\x32\n\tha_scheme\x18\x0b \x01(\x0e\x32\x1f.org.lfedge.eve.config.HAScheme\x12I\n\x15load_balancer_service\x18\x0c \x01(\x0b\x32*.org.lfedge.eve.config.LoadBalancerService*\x84\x01\n\x0b\x43lusterType\x12\x1c\n\x18\x43LUSTER_TYPE_UNSPECIFIED\x10\x00\x12\x19\n\x15\x43LUSTER_TYPE_K3S_BASE\x10\x01\x12#\n\x1f\x43LUSTER_TYPE_REPLICATED_STORAGE\x10\x02\x12\x17\n\x0f\x43LUSTER_TYPE_HA\x10\x03\x1a\x02\x08\x01*A\n\x08HAScheme\x12\x19\n\x15HA_SCHEME_UNSPECIFIED\x10\x00\x12\x1a\n\x16HA_SCHEME_K3S_EMBEDDED\x10\x01\x42=\n\x15org.lfedge.eve.configZ$github.com/lf-edge/eve-api/go/configb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1e\x63onfig/edge_node_cluster.proto\x12\x15org.lfedge.eve.config\x1a\x1b\x65vecommon/acipherinfo.proto\"F\n\x15LoadBalancerInterface\x12\x16\n\x0einterface_name\x18\x01 \x01(\t\x12\x15\n\raddress_cidrs\x18\x02 \x03(\t\"W\n\x13LoadBalancerService\x12@\n\ninterfaces\x18\x01 \x03(\x0b\x32,.org.lfedge.eve.config.LoadBalancerInterface\"\xd7\x03\n\x0f\x45\x64geNodeCluster\x12\x14\n\x0c\x63luster_name\x18\x01 \x01(\t\x12\x12\n\ncluster_id\x18\x02 \x01(\t\x12\x19\n\x11\x63luster_interface\x18\x03 \x01(\t\x12\x19\n\x11\x63luster_ip_prefix\x18\x04 \x01(\t\x12\x16\n\x0eis_worker_node\x18\x05 \x01(\x08\x12\x16\n\x0ejoin_server_ip\x18\x06 \x01(\t\x12\x43\n\x17\x65ncrypted_cluster_token\x18\x07 \x01(\x0b\x32\".org.lfedge.eve.common.CipherBlock\x12\x38\n\x0c\x63luster_type\x18\x08 \x01(\x0e\x32\".org.lfedge.eve.config.ClusterType\x12\x1b\n\x13tie_breaker_node_id\x18\t \x01(\t\x12\x32\n\tha_scheme\x18\x0b \x01(\x0e\x32\x1f.org.lfedge.eve.config.HAScheme\x12I\n\x15load_balancer_service\x18\x0c \x01(\x0b\x32*.org.lfedge.eve.config.LoadBalancerService\x12\x19\n\x11master_node_uuids\x18\r \x03(\t*\x84\x01\n\x0b\x43lusterType\x12\x1c\n\x18\x43LUSTER_TYPE_UNSPECIFIED\x10\x00\x12\x19\n\x15\x43LUSTER_TYPE_K3S_BASE\x10\x01\x12#\n\x1f\x43LUSTER_TYPE_REPLICATED_STORAGE\x10\x02\x12\x17\n\x0f\x43LUSTER_TYPE_HA\x10\x03\x1a\x02\x08\x01*A\n\x08HAScheme\x12\x19\n\x15HA_SCHEME_UNSPECIFIED\x10\x00\x12\x1a\n\x16HA_SCHEME_K3S_EMBEDDED\x10\x01\x42=\n\x15org.lfedge.eve.configZ$github.com/lf-edge/eve-api/go/configb\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -25,14 +25,14 @@ DESCRIPTOR._serialized_options = b'\n\025org.lfedge.eve.configZ$github.com/lf-edge/eve-api/go/config' _CLUSTERTYPE.values_by_name["CLUSTER_TYPE_HA"]._options = None _CLUSTERTYPE.values_by_name["CLUSTER_TYPE_HA"]._serialized_options = b'\010\001' - _globals['_CLUSTERTYPE']._serialized_start=695 - _globals['_CLUSTERTYPE']._serialized_end=827 - _globals['_HASCHEME']._serialized_start=829 - _globals['_HASCHEME']._serialized_end=894 + _globals['_CLUSTERTYPE']._serialized_start=722 + _globals['_CLUSTERTYPE']._serialized_end=854 + _globals['_HASCHEME']._serialized_start=856 + _globals['_HASCHEME']._serialized_end=921 _globals['_LOADBALANCERINTERFACE']._serialized_start=86 _globals['_LOADBALANCERINTERFACE']._serialized_end=156 _globals['_LOADBALANCERSERVICE']._serialized_start=158 _globals['_LOADBALANCERSERVICE']._serialized_end=245 _globals['_EDGENODECLUSTER']._serialized_start=248 - _globals['_EDGENODECLUSTER']._serialized_end=692 + _globals['_EDGENODECLUSTER']._serialized_end=719 # @@protoc_insertion_point(module_scope)