diff --git a/config/crd/bases/tenant.otterscale.io_workspaces.yaml b/config/crd/bases/tenant.otterscale.io_workspaces.yaml index cce3965..57f4120 100644 --- a/config/crd/bases/tenant.otterscale.io_workspaces.yaml +++ b/config/crd/bases/tenant.otterscale.io_workspaces.yaml @@ -224,22 +224,6 @@ spec: is enabled rule: '!has(self.allowedNamespaces) || size(self.allowedNamespaces) == 0 || self.enabled' - rancherProjectID: - description: |- - RancherProjectID is the full Rancher Project identifier copied from - the managed cluster configuration, in ":" form. - maxLength: 317 - pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?:[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$ - type: string - x-kubernetes-validations: - - message: rancherProjectID cluster ID must not exceed 63 characters - rule: self.split(':').size() == 2 && self.split(':')[0].size() <= - 63 - - message: rancherProjectID project name must not exceed 253 characters - rule: self.split(':').size() == 2 && self.split(':')[1].size() <= - 253 - - message: rancherProjectID is immutable - rule: self == oldSelf resourceQuota: description: ResourceQuota defines the compute resource constraints (CPU, Memory, etc.) applied to the underlying namespace. diff --git a/link/v1/link.connect.go b/link/v1/link.connect.go index 86e490f..5d49f93 100644 --- a/link/v1/link.connect.go +++ b/link/v1/link.connect.go @@ -39,9 +39,6 @@ const ( // LinkServiceGetAgentManifestProcedure is the fully-qualified name of the LinkService's // GetAgentManifest RPC. LinkServiceGetAgentManifestProcedure = "/otterscale.link.v1.LinkService/GetAgentManifest" - // LinkServiceListRancherProjectsProcedure is the fully-qualified name of the LinkService's - // ListRancherProjects RPC. - LinkServiceListRancherProjectsProcedure = "/otterscale.link.v1.LinkService/ListRancherProjects" ) // LinkServiceClient is a client for the otterscale.link.v1.LinkService service. @@ -59,9 +56,6 @@ type LinkServiceClient interface { // includes a Namespace, ServiceAccount, ClusterRoleBinding (binding the // caller to cluster-admin), and a Deployment running the agent. GetAgentManifest(context.Context, *GetAgentManifestRequest) (*GetAgentManifestResponse, error) - // ListRancherProjects returns Rancher Projects available for cluster - // registration. - ListRancherProjects(context.Context, *ListRancherProjectsRequest) (*ListRancherProjectsResponse, error) } // NewLinkServiceClient constructs a client for the otterscale.link.v1.LinkService service. By @@ -94,21 +88,14 @@ func NewLinkServiceClient(httpClient connect.HTTPClient, baseURL string, opts .. connect.WithIdempotency(connect.IdempotencyNoSideEffects), connect.WithClientOptions(opts...), ), - listRancherProjects: connect.NewClient[ListRancherProjectsRequest, ListRancherProjectsResponse]( - httpClient, - baseURL+LinkServiceListRancherProjectsProcedure, - connect.WithSchema(linkServiceMethods.ByName("ListRancherProjects")), - connect.WithClientOptions(opts...), - ), } } // linkServiceClient implements LinkServiceClient. type linkServiceClient struct { - listLinks *connect.Client[ListLinksRequest, ListLinksResponse] - register *connect.Client[RegisterRequest, RegisterResponse] - getAgentManifest *connect.Client[GetAgentManifestRequest, GetAgentManifestResponse] - listRancherProjects *connect.Client[ListRancherProjectsRequest, ListRancherProjectsResponse] + listLinks *connect.Client[ListLinksRequest, ListLinksResponse] + register *connect.Client[RegisterRequest, RegisterResponse] + getAgentManifest *connect.Client[GetAgentManifestRequest, GetAgentManifestResponse] } // ListLinks calls otterscale.link.v1.LinkService.ListLinks. @@ -138,15 +125,6 @@ func (c *linkServiceClient) GetAgentManifest(ctx context.Context, req *GetAgentM return nil, err } -// ListRancherProjects calls otterscale.link.v1.LinkService.ListRancherProjects. -func (c *linkServiceClient) ListRancherProjects(ctx context.Context, req *ListRancherProjectsRequest) (*ListRancherProjectsResponse, error) { - response, err := c.listRancherProjects.CallUnary(ctx, connect.NewRequest(req)) - if response != nil { - return response.Msg, err - } - return nil, err -} - // LinkServiceHandler is an implementation of the otterscale.link.v1.LinkService service. type LinkServiceHandler interface { // ListLinks returns all cluster identifiers that the current agent @@ -162,9 +140,6 @@ type LinkServiceHandler interface { // includes a Namespace, ServiceAccount, ClusterRoleBinding (binding the // caller to cluster-admin), and a Deployment running the agent. GetAgentManifest(context.Context, *GetAgentManifestRequest) (*GetAgentManifestResponse, error) - // ListRancherProjects returns Rancher Projects available for cluster - // registration. - ListRancherProjects(context.Context, *ListRancherProjectsRequest) (*ListRancherProjectsResponse, error) } // NewLinkServiceHandler builds an HTTP handler from the service implementation. It returns the path @@ -193,12 +168,6 @@ func NewLinkServiceHandler(svc LinkServiceHandler, opts ...connect.HandlerOption connect.WithIdempotency(connect.IdempotencyNoSideEffects), connect.WithHandlerOptions(opts...), ) - linkServiceListRancherProjectsHandler := connect.NewUnaryHandlerSimple( - LinkServiceListRancherProjectsProcedure, - svc.ListRancherProjects, - connect.WithSchema(linkServiceMethods.ByName("ListRancherProjects")), - connect.WithHandlerOptions(opts...), - ) return "/otterscale.link.v1.LinkService/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { switch r.URL.Path { case LinkServiceListLinksProcedure: @@ -207,8 +176,6 @@ func NewLinkServiceHandler(svc LinkServiceHandler, opts ...connect.HandlerOption linkServiceRegisterHandler.ServeHTTP(w, r) case LinkServiceGetAgentManifestProcedure: linkServiceGetAgentManifestHandler.ServeHTTP(w, r) - case LinkServiceListRancherProjectsProcedure: - linkServiceListRancherProjectsHandler.ServeHTTP(w, r) default: http.NotFound(w, r) } @@ -229,7 +196,3 @@ func (UnimplementedLinkServiceHandler) Register(context.Context, *RegisterReques func (UnimplementedLinkServiceHandler) GetAgentManifest(context.Context, *GetAgentManifestRequest) (*GetAgentManifestResponse, error) { return nil, connect.NewError(connect.CodeUnimplemented, errors.New("otterscale.link.v1.LinkService.GetAgentManifest is not implemented")) } - -func (UnimplementedLinkServiceHandler) ListRancherProjects(context.Context, *ListRancherProjectsRequest) (*ListRancherProjectsResponse, error) { - return nil, connect.NewError(connect.CodeUnimplemented, errors.New("otterscale.link.v1.LinkService.ListRancherProjects is not implemented")) -} diff --git a/link/v1/link.pb.go b/link/v1/link.pb.go index dbd623b..9239087 100644 --- a/link/v1/link.pb.go +++ b/link/v1/link.pb.go @@ -22,14 +22,13 @@ const ( ) type Link struct { - state protoimpl.MessageState `protogen:"opaque.v1"` - xxx_hidden_Cluster *string `protobuf:"bytes,1,opt,name=cluster"` - xxx_hidden_AgentVersion *string `protobuf:"bytes,2,opt,name=agent_version,json=agentVersion"` - xxx_hidden_RancherProjectId *string `protobuf:"bytes,3,opt,name=rancher_project_id,json=rancherProjectId"` - XXX_raceDetectHookData protoimpl.RaceDetectHookData - XXX_presence [1]uint32 - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"opaque.v1"` + xxx_hidden_Cluster *string `protobuf:"bytes,1,opt,name=cluster"` + xxx_hidden_AgentVersion *string `protobuf:"bytes,2,opt,name=agent_version,json=agentVersion"` + XXX_raceDetectHookData protoimpl.RaceDetectHookData + XXX_presence [1]uint32 + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Link) Reset() { @@ -77,29 +76,14 @@ func (x *Link) GetAgentVersion() string { return "" } -func (x *Link) GetRancherProjectId() string { - if x != nil { - if x.xxx_hidden_RancherProjectId != nil { - return *x.xxx_hidden_RancherProjectId - } - return "" - } - return "" -} - func (x *Link) SetCluster(v string) { x.xxx_hidden_Cluster = &v - protoimpl.X.SetPresent(&(x.XXX_presence[0]), 0, 3) + protoimpl.X.SetPresent(&(x.XXX_presence[0]), 0, 2) } func (x *Link) SetAgentVersion(v string) { x.xxx_hidden_AgentVersion = &v - protoimpl.X.SetPresent(&(x.XXX_presence[0]), 1, 3) -} - -func (x *Link) SetRancherProjectId(v string) { - x.xxx_hidden_RancherProjectId = &v - protoimpl.X.SetPresent(&(x.XXX_presence[0]), 2, 3) + protoimpl.X.SetPresent(&(x.XXX_presence[0]), 1, 2) } func (x *Link) HasCluster() bool { @@ -116,13 +100,6 @@ func (x *Link) HasAgentVersion() bool { return protoimpl.X.Present(&(x.XXX_presence[0]), 1) } -func (x *Link) HasRancherProjectId() bool { - if x == nil { - return false - } - return protoimpl.X.Present(&(x.XXX_presence[0]), 2) -} - func (x *Link) ClearCluster() { protoimpl.X.ClearPresent(&(x.XXX_presence[0]), 0) x.xxx_hidden_Cluster = nil @@ -133,11 +110,6 @@ func (x *Link) ClearAgentVersion() { x.xxx_hidden_AgentVersion = nil } -func (x *Link) ClearRancherProjectId() { - protoimpl.X.ClearPresent(&(x.XXX_presence[0]), 2) - x.xxx_hidden_RancherProjectId = nil -} - type Link_builder struct { _ [0]func() // Prevents comparability and use of unkeyed literals for the builder. @@ -145,8 +117,6 @@ type Link_builder struct { Cluster *string // The version of the agent binary (e.g. "v1.2.3"), set at build time. AgentVersion *string - // The full Rancher Project identifier in ":" form. - RancherProjectId *string } func (b0 Link_builder) Build() *Link { @@ -154,238 +124,13 @@ func (b0 Link_builder) Build() *Link { b, x := &b0, m0 _, _ = b, x if b.Cluster != nil { - protoimpl.X.SetPresentNonAtomic(&(x.XXX_presence[0]), 0, 3) + protoimpl.X.SetPresentNonAtomic(&(x.XXX_presence[0]), 0, 2) x.xxx_hidden_Cluster = b.Cluster } if b.AgentVersion != nil { - protoimpl.X.SetPresentNonAtomic(&(x.XXX_presence[0]), 1, 3) - x.xxx_hidden_AgentVersion = b.AgentVersion - } - if b.RancherProjectId != nil { - protoimpl.X.SetPresentNonAtomic(&(x.XXX_presence[0]), 2, 3) - x.xxx_hidden_RancherProjectId = b.RancherProjectId - } - return m0 -} - -// RancherProject identifies a Rancher Project available for cluster -// registration. -type RancherProject struct { - state protoimpl.MessageState `protogen:"opaque.v1"` - xxx_hidden_Id *string `protobuf:"bytes,1,opt,name=id"` - xxx_hidden_DisplayName *string `protobuf:"bytes,2,opt,name=display_name,json=displayName"` - XXX_raceDetectHookData protoimpl.RaceDetectHookData - XXX_presence [1]uint32 - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache -} - -func (x *RancherProject) Reset() { - *x = RancherProject{} - mi := &file_link_v1_link_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *RancherProject) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RancherProject) ProtoMessage() {} - -func (x *RancherProject) ProtoReflect() protoreflect.Message { - mi := &file_link_v1_link_proto_msgTypes[1] - if x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -func (x *RancherProject) GetId() string { - if x != nil { - if x.xxx_hidden_Id != nil { - return *x.xxx_hidden_Id - } - return "" - } - return "" -} - -func (x *RancherProject) GetDisplayName() string { - if x != nil { - if x.xxx_hidden_DisplayName != nil { - return *x.xxx_hidden_DisplayName - } - return "" - } - return "" -} - -func (x *RancherProject) SetId(v string) { - x.xxx_hidden_Id = &v - protoimpl.X.SetPresent(&(x.XXX_presence[0]), 0, 2) -} - -func (x *RancherProject) SetDisplayName(v string) { - x.xxx_hidden_DisplayName = &v - protoimpl.X.SetPresent(&(x.XXX_presence[0]), 1, 2) -} - -func (x *RancherProject) HasId() bool { - if x == nil { - return false - } - return protoimpl.X.Present(&(x.XXX_presence[0]), 0) -} - -func (x *RancherProject) HasDisplayName() bool { - if x == nil { - return false - } - return protoimpl.X.Present(&(x.XXX_presence[0]), 1) -} - -func (x *RancherProject) ClearId() { - protoimpl.X.ClearPresent(&(x.XXX_presence[0]), 0) - x.xxx_hidden_Id = nil -} - -func (x *RancherProject) ClearDisplayName() { - protoimpl.X.ClearPresent(&(x.XXX_presence[0]), 1) - x.xxx_hidden_DisplayName = nil -} - -type RancherProject_builder struct { - _ [0]func() // Prevents comparability and use of unkeyed literals for the builder. - - // The full Rancher Project identifier in ":" form. - Id *string - // The human-readable Rancher Project name. - DisplayName *string -} - -func (b0 RancherProject_builder) Build() *RancherProject { - m0 := &RancherProject{} - b, x := &b0, m0 - _, _ = b, x - if b.Id != nil { - protoimpl.X.SetPresentNonAtomic(&(x.XXX_presence[0]), 0, 2) - x.xxx_hidden_Id = b.Id - } - if b.DisplayName != nil { protoimpl.X.SetPresentNonAtomic(&(x.XXX_presence[0]), 1, 2) - x.xxx_hidden_DisplayName = b.DisplayName - } - return m0 -} - -// ListRancherProjectsRequest is an empty request message for listing Rancher -// Projects. -type ListRancherProjectsRequest struct { - state protoimpl.MessageState `protogen:"opaque.v1"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache -} - -func (x *ListRancherProjectsRequest) Reset() { - *x = ListRancherProjectsRequest{} - mi := &file_link_v1_link_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *ListRancherProjectsRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ListRancherProjectsRequest) ProtoMessage() {} - -func (x *ListRancherProjectsRequest) ProtoReflect() protoreflect.Message { - mi := &file_link_v1_link_proto_msgTypes[2] - if x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -type ListRancherProjectsRequest_builder struct { - _ [0]func() // Prevents comparability and use of unkeyed literals for the builder. - -} - -func (b0 ListRancherProjectsRequest_builder) Build() *ListRancherProjectsRequest { - m0 := &ListRancherProjectsRequest{} - b, x := &b0, m0 - _, _ = b, x - return m0 -} - -// ListRancherProjectsResponse contains the available Rancher Projects. -type ListRancherProjectsResponse struct { - state protoimpl.MessageState `protogen:"opaque.v1"` - xxx_hidden_Projects *[]*RancherProject `protobuf:"bytes,1,rep,name=projects"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache -} - -func (x *ListRancherProjectsResponse) Reset() { - *x = ListRancherProjectsResponse{} - mi := &file_link_v1_link_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *ListRancherProjectsResponse) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ListRancherProjectsResponse) ProtoMessage() {} - -func (x *ListRancherProjectsResponse) ProtoReflect() protoreflect.Message { - mi := &file_link_v1_link_proto_msgTypes[3] - if x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -func (x *ListRancherProjectsResponse) GetProjects() []*RancherProject { - if x != nil { - if x.xxx_hidden_Projects != nil { - return *x.xxx_hidden_Projects - } + x.xxx_hidden_AgentVersion = b.AgentVersion } - return nil -} - -func (x *ListRancherProjectsResponse) SetProjects(v []*RancherProject) { - x.xxx_hidden_Projects = &v -} - -type ListRancherProjectsResponse_builder struct { - _ [0]func() // Prevents comparability and use of unkeyed literals for the builder. - - // The available Rancher Projects. - Projects []*RancherProject -} - -func (b0 ListRancherProjectsResponse_builder) Build() *ListRancherProjectsResponse { - m0 := &ListRancherProjectsResponse{} - b, x := &b0, m0 - _, _ = b, x - x.xxx_hidden_Projects = &b.Projects return m0 } @@ -398,7 +143,7 @@ type ListLinksRequest struct { func (x *ListLinksRequest) Reset() { *x = ListLinksRequest{} - mi := &file_link_v1_link_proto_msgTypes[4] + mi := &file_link_v1_link_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -410,7 +155,7 @@ func (x *ListLinksRequest) String() string { func (*ListLinksRequest) ProtoMessage() {} func (x *ListLinksRequest) ProtoReflect() protoreflect.Message { - mi := &file_link_v1_link_proto_msgTypes[4] + mi := &file_link_v1_link_proto_msgTypes[1] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -443,7 +188,7 @@ type ListLinksResponse struct { func (x *ListLinksResponse) Reset() { *x = ListLinksResponse{} - mi := &file_link_v1_link_proto_msgTypes[5] + mi := &file_link_v1_link_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -455,7 +200,7 @@ func (x *ListLinksResponse) String() string { func (*ListLinksResponse) ProtoMessage() {} func (x *ListLinksResponse) ProtoReflect() protoreflect.Message { - mi := &file_link_v1_link_proto_msgTypes[5] + mi := &file_link_v1_link_proto_msgTypes[2] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -497,21 +242,20 @@ func (b0 ListLinksResponse_builder) Build() *ListLinksResponse { // RegisterRequest contains the agent's cluster identity and a CSR for // mTLS certificate issuance. type RegisterRequest struct { - state protoimpl.MessageState `protogen:"opaque.v1"` - xxx_hidden_Cluster *string `protobuf:"bytes,1,opt,name=cluster"` - xxx_hidden_Csr []byte `protobuf:"bytes,2,opt,name=csr"` - xxx_hidden_AgentId *string `protobuf:"bytes,3,opt,name=agent_id,json=agentId"` - xxx_hidden_AgentVersion *string `protobuf:"bytes,4,opt,name=agent_version,json=agentVersion"` - xxx_hidden_RancherProjectId *string `protobuf:"bytes,5,opt,name=rancher_project_id,json=rancherProjectId"` - XXX_raceDetectHookData protoimpl.RaceDetectHookData - XXX_presence [1]uint32 - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"opaque.v1"` + xxx_hidden_Cluster *string `protobuf:"bytes,1,opt,name=cluster"` + xxx_hidden_Csr []byte `protobuf:"bytes,2,opt,name=csr"` + xxx_hidden_AgentId *string `protobuf:"bytes,3,opt,name=agent_id,json=agentId"` + xxx_hidden_AgentVersion *string `protobuf:"bytes,4,opt,name=agent_version,json=agentVersion"` + XXX_raceDetectHookData protoimpl.RaceDetectHookData + XXX_presence [1]uint32 + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *RegisterRequest) Reset() { *x = RegisterRequest{} - mi := &file_link_v1_link_proto_msgTypes[6] + mi := &file_link_v1_link_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -523,7 +267,7 @@ func (x *RegisterRequest) String() string { func (*RegisterRequest) ProtoMessage() {} func (x *RegisterRequest) ProtoReflect() protoreflect.Message { - mi := &file_link_v1_link_proto_msgTypes[6] + mi := &file_link_v1_link_proto_msgTypes[3] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -571,19 +315,9 @@ func (x *RegisterRequest) GetAgentVersion() string { return "" } -func (x *RegisterRequest) GetRancherProjectId() string { - if x != nil { - if x.xxx_hidden_RancherProjectId != nil { - return *x.xxx_hidden_RancherProjectId - } - return "" - } - return "" -} - func (x *RegisterRequest) SetCluster(v string) { x.xxx_hidden_Cluster = &v - protoimpl.X.SetPresent(&(x.XXX_presence[0]), 0, 5) + protoimpl.X.SetPresent(&(x.XXX_presence[0]), 0, 4) } func (x *RegisterRequest) SetCsr(v []byte) { @@ -591,22 +325,17 @@ func (x *RegisterRequest) SetCsr(v []byte) { v = []byte{} } x.xxx_hidden_Csr = v - protoimpl.X.SetPresent(&(x.XXX_presence[0]), 1, 5) + protoimpl.X.SetPresent(&(x.XXX_presence[0]), 1, 4) } func (x *RegisterRequest) SetAgentId(v string) { x.xxx_hidden_AgentId = &v - protoimpl.X.SetPresent(&(x.XXX_presence[0]), 2, 5) + protoimpl.X.SetPresent(&(x.XXX_presence[0]), 2, 4) } func (x *RegisterRequest) SetAgentVersion(v string) { x.xxx_hidden_AgentVersion = &v - protoimpl.X.SetPresent(&(x.XXX_presence[0]), 3, 5) -} - -func (x *RegisterRequest) SetRancherProjectId(v string) { - x.xxx_hidden_RancherProjectId = &v - protoimpl.X.SetPresent(&(x.XXX_presence[0]), 4, 5) + protoimpl.X.SetPresent(&(x.XXX_presence[0]), 3, 4) } func (x *RegisterRequest) HasCluster() bool { @@ -637,13 +366,6 @@ func (x *RegisterRequest) HasAgentVersion() bool { return protoimpl.X.Present(&(x.XXX_presence[0]), 3) } -func (x *RegisterRequest) HasRancherProjectId() bool { - if x == nil { - return false - } - return protoimpl.X.Present(&(x.XXX_presence[0]), 4) -} - func (x *RegisterRequest) ClearCluster() { protoimpl.X.ClearPresent(&(x.XXX_presence[0]), 0) x.xxx_hidden_Cluster = nil @@ -664,11 +386,6 @@ func (x *RegisterRequest) ClearAgentVersion() { x.xxx_hidden_AgentVersion = nil } -func (x *RegisterRequest) ClearRancherProjectId() { - protoimpl.X.ClearPresent(&(x.XXX_presence[0]), 4) - x.xxx_hidden_RancherProjectId = nil -} - type RegisterRequest_builder struct { _ [0]func() // Prevents comparability and use of unkeyed literals for the builder. @@ -681,8 +398,6 @@ type RegisterRequest_builder struct { AgentId *string // The version of the agent binary (e.g. "v1.2.3"), set at build time. AgentVersion *string - // The full Rancher Project identifier in ":" form. - RancherProjectId *string } func (b0 RegisterRequest_builder) Build() *RegisterRequest { @@ -690,25 +405,21 @@ func (b0 RegisterRequest_builder) Build() *RegisterRequest { b, x := &b0, m0 _, _ = b, x if b.Cluster != nil { - protoimpl.X.SetPresentNonAtomic(&(x.XXX_presence[0]), 0, 5) + protoimpl.X.SetPresentNonAtomic(&(x.XXX_presence[0]), 0, 4) x.xxx_hidden_Cluster = b.Cluster } if b.Csr != nil { - protoimpl.X.SetPresentNonAtomic(&(x.XXX_presence[0]), 1, 5) + protoimpl.X.SetPresentNonAtomic(&(x.XXX_presence[0]), 1, 4) x.xxx_hidden_Csr = b.Csr } if b.AgentId != nil { - protoimpl.X.SetPresentNonAtomic(&(x.XXX_presence[0]), 2, 5) + protoimpl.X.SetPresentNonAtomic(&(x.XXX_presence[0]), 2, 4) x.xxx_hidden_AgentId = b.AgentId } if b.AgentVersion != nil { - protoimpl.X.SetPresentNonAtomic(&(x.XXX_presence[0]), 3, 5) + protoimpl.X.SetPresentNonAtomic(&(x.XXX_presence[0]), 3, 4) x.xxx_hidden_AgentVersion = b.AgentVersion } - if b.RancherProjectId != nil { - protoimpl.X.SetPresentNonAtomic(&(x.XXX_presence[0]), 4, 5) - x.xxx_hidden_RancherProjectId = b.RancherProjectId - } return m0 } @@ -728,7 +439,7 @@ type RegisterResponse struct { func (x *RegisterResponse) Reset() { *x = RegisterResponse{} - mi := &file_link_v1_link_proto_msgTypes[7] + mi := &file_link_v1_link_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -740,7 +451,7 @@ func (x *RegisterResponse) String() string { func (*RegisterResponse) ProtoMessage() {} func (x *RegisterResponse) ProtoReflect() protoreflect.Message { - mi := &file_link_v1_link_proto_msgTypes[7] + mi := &file_link_v1_link_proto_msgTypes[4] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -900,19 +611,18 @@ func (b0 RegisterResponse_builder) Build() *RegisterResponse { // GetAgentManifestRequest identifies the target cluster for which // the agent installation manifest should be generated. type GetAgentManifestRequest struct { - state protoimpl.MessageState `protogen:"opaque.v1"` - xxx_hidden_Cluster *string `protobuf:"bytes,1,opt,name=cluster"` - xxx_hidden_ExtraUsers []string `protobuf:"bytes,2,rep,name=extra_users,json=extraUsers"` - xxx_hidden_RancherProjectId *string `protobuf:"bytes,3,opt,name=rancher_project_id,json=rancherProjectId"` - XXX_raceDetectHookData protoimpl.RaceDetectHookData - XXX_presence [1]uint32 - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"opaque.v1"` + xxx_hidden_Cluster *string `protobuf:"bytes,1,opt,name=cluster"` + xxx_hidden_ExtraUsers []string `protobuf:"bytes,2,rep,name=extra_users,json=extraUsers"` + XXX_raceDetectHookData protoimpl.RaceDetectHookData + XXX_presence [1]uint32 + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *GetAgentManifestRequest) Reset() { *x = GetAgentManifestRequest{} - mi := &file_link_v1_link_proto_msgTypes[8] + mi := &file_link_v1_link_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -924,7 +634,7 @@ func (x *GetAgentManifestRequest) String() string { func (*GetAgentManifestRequest) ProtoMessage() {} func (x *GetAgentManifestRequest) ProtoReflect() protoreflect.Message { - mi := &file_link_v1_link_proto_msgTypes[8] + mi := &file_link_v1_link_proto_msgTypes[5] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -952,30 +662,15 @@ func (x *GetAgentManifestRequest) GetExtraUsers() []string { return nil } -func (x *GetAgentManifestRequest) GetRancherProjectId() string { - if x != nil { - if x.xxx_hidden_RancherProjectId != nil { - return *x.xxx_hidden_RancherProjectId - } - return "" - } - return "" -} - func (x *GetAgentManifestRequest) SetCluster(v string) { x.xxx_hidden_Cluster = &v - protoimpl.X.SetPresent(&(x.XXX_presence[0]), 0, 3) + protoimpl.X.SetPresent(&(x.XXX_presence[0]), 0, 2) } func (x *GetAgentManifestRequest) SetExtraUsers(v []string) { x.xxx_hidden_ExtraUsers = v } -func (x *GetAgentManifestRequest) SetRancherProjectId(v string) { - x.xxx_hidden_RancherProjectId = &v - protoimpl.X.SetPresent(&(x.XXX_presence[0]), 2, 3) -} - func (x *GetAgentManifestRequest) HasCluster() bool { if x == nil { return false @@ -983,23 +678,11 @@ func (x *GetAgentManifestRequest) HasCluster() bool { return protoimpl.X.Present(&(x.XXX_presence[0]), 0) } -func (x *GetAgentManifestRequest) HasRancherProjectId() bool { - if x == nil { - return false - } - return protoimpl.X.Present(&(x.XXX_presence[0]), 2) -} - func (x *GetAgentManifestRequest) ClearCluster() { protoimpl.X.ClearPresent(&(x.XXX_presence[0]), 0) x.xxx_hidden_Cluster = nil } -func (x *GetAgentManifestRequest) ClearRancherProjectId() { - protoimpl.X.ClearPresent(&(x.XXX_presence[0]), 2) - x.xxx_hidden_RancherProjectId = nil -} - type GetAgentManifestRequest_builder struct { _ [0]func() // Prevents comparability and use of unkeyed literals for the builder. @@ -1009,8 +692,6 @@ type GetAgentManifestRequest_builder struct { // otterscale-cluster-admin ClusterRoleBinding, in addition to the // authenticated caller. ExtraUsers []string - // The full Rancher Project identifier in ":" form. - RancherProjectId *string } func (b0 GetAgentManifestRequest_builder) Build() *GetAgentManifestRequest { @@ -1018,14 +699,10 @@ func (b0 GetAgentManifestRequest_builder) Build() *GetAgentManifestRequest { b, x := &b0, m0 _, _ = b, x if b.Cluster != nil { - protoimpl.X.SetPresentNonAtomic(&(x.XXX_presence[0]), 0, 3) + protoimpl.X.SetPresentNonAtomic(&(x.XXX_presence[0]), 0, 2) x.xxx_hidden_Cluster = b.Cluster } x.xxx_hidden_ExtraUsers = b.ExtraUsers - if b.RancherProjectId != nil { - protoimpl.X.SetPresentNonAtomic(&(x.XXX_presence[0]), 2, 3) - x.xxx_hidden_RancherProjectId = b.RancherProjectId - } return m0 } @@ -1043,7 +720,7 @@ type GetAgentManifestResponse struct { func (x *GetAgentManifestResponse) Reset() { *x = GetAgentManifestResponse{} - mi := &file_link_v1_link_proto_msgTypes[9] + mi := &file_link_v1_link_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1055,7 +732,7 @@ func (x *GetAgentManifestResponse) String() string { func (*GetAgentManifestResponse) ProtoMessage() {} func (x *GetAgentManifestResponse) ProtoReflect() protoreflect.Message { - mi := &file_link_v1_link_proto_msgTypes[9] + mi := &file_link_v1_link_proto_msgTypes[6] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1150,78 +827,61 @@ var File_link_v1_link_proto protoreflect.FileDescriptor const file_link_v1_link_proto_rawDesc = "" + "\n" + - "\x12link/v1/link.proto\x12\x12otterscale.link.v1\x1a\rfeature.proto\"s\n" + + "\x12link/v1/link.proto\x12\x12otterscale.link.v1\x1a\rfeature.proto\"E\n" + "\x04Link\x12\x18\n" + "\acluster\x18\x01 \x01(\tR\acluster\x12#\n" + - "\ragent_version\x18\x02 \x01(\tR\fagentVersion\x12,\n" + - "\x12rancher_project_id\x18\x03 \x01(\tR\x10rancherProjectId\"C\n" + - "\x0eRancherProject\x12\x0e\n" + - "\x02id\x18\x01 \x01(\tR\x02id\x12!\n" + - "\fdisplay_name\x18\x02 \x01(\tR\vdisplayName\"\x1c\n" + - "\x1aListRancherProjectsRequest\"]\n" + - "\x1bListRancherProjectsResponse\x12>\n" + - "\bprojects\x18\x01 \x03(\v2\".otterscale.link.v1.RancherProjectR\bprojects\"\x12\n" + + "\ragent_version\x18\x02 \x01(\tR\fagentVersion\"\x12\n" + "\x10ListLinksRequest\"C\n" + "\x11ListLinksResponse\x12.\n" + - "\x05links\x18\x01 \x03(\v2\x18.otterscale.link.v1.LinkR\x05links\"\xab\x01\n" + + "\x05links\x18\x01 \x03(\v2\x18.otterscale.link.v1.LinkR\x05links\"}\n" + "\x0fRegisterRequest\x12\x18\n" + "\acluster\x18\x01 \x01(\tR\acluster\x12\x10\n" + "\x03csr\x18\x02 \x01(\fR\x03csr\x12\x19\n" + "\bagent_id\x18\x03 \x01(\tR\aagentId\x12#\n" + - "\ragent_version\x18\x04 \x01(\tR\fagentVersion\x12,\n" + - "\x12rancher_project_id\x18\x05 \x01(\tR\x10rancherProjectId\"\x9e\x01\n" + + "\ragent_version\x18\x04 \x01(\tR\fagentVersion\"\x9e\x01\n" + "\x10RegisterResponse\x12\x1a\n" + "\bendpoint\x18\x01 \x01(\tR\bendpoint\x12 \n" + "\vcertificate\x18\x02 \x01(\fR\vcertificate\x12%\n" + "\x0eca_certificate\x18\x03 \x01(\fR\rcaCertificate\x12%\n" + - "\x0eserver_version\x18\x04 \x01(\tR\rserverVersion\"\x82\x01\n" + + "\x0eserver_version\x18\x04 \x01(\tR\rserverVersion\"T\n" + "\x17GetAgentManifestRequest\x12\x18\n" + "\acluster\x18\x01 \x01(\tR\acluster\x12\x1f\n" + "\vextra_users\x18\x02 \x03(\tR\n" + - "extraUsers\x12,\n" + - "\x12rancher_project_id\x18\x03 \x01(\tR\x10rancherProjectId\"H\n" + + "extraUsers\"H\n" + "\x18GetAgentManifestResponse\x12\x1a\n" + "\bmanifest\x18\x01 \x01(\tR\bmanifest\x12\x10\n" + - "\x03url\x18\x02 \x01(\tR\x03url2\xfe\x03\n" + + "\x03url\x18\x02 \x01(\tR\x03url2\xf0\x02\n" + "\vLinkService\x12m\n" + "\tListLinks\x12$.otterscale.link.v1.ListLinksRequest\x1a%.otterscale.link.v1.ListLinksResponse\"\x13\x8a\xdf\xd5\x1d\x0e\n" + "\flink-enabled\x12j\n" + "\bRegister\x12#.otterscale.link.v1.RegisterRequest\x1a$.otterscale.link.v1.RegisterResponse\"\x13\x8a\xdf\xd5\x1d\x0e\n" + "\flink-enabled\x12\x85\x01\n" + "\x10GetAgentManifest\x12+.otterscale.link.v1.GetAgentManifestRequest\x1a,.otterscale.link.v1.GetAgentManifestResponse\"\x16\x8a\xdf\xd5\x1d\x0e\n" + - "\flink-enabled\x90\x02\x01\x12\x8b\x01\n" + - "\x13ListRancherProjects\x12..otterscale.link.v1.ListRancherProjectsRequest\x1a/.otterscale.link.v1.ListRancherProjectsResponse\"\x13\x8a\xdf\xd5\x1d\x0e\n" + - "\flink-enabledB*Z(github.com/otterscale/api/link/v1;linkv1b\beditionsp\xe8\a" + "\flink-enabled\x90\x02\x01B*Z(github.com/otterscale/api/link/v1;linkv1b\beditionsp\xe8\a" -var file_link_v1_link_proto_msgTypes = make([]protoimpl.MessageInfo, 10) +var file_link_v1_link_proto_msgTypes = make([]protoimpl.MessageInfo, 7) var file_link_v1_link_proto_goTypes = []any{ - (*Link)(nil), // 0: otterscale.link.v1.Link - (*RancherProject)(nil), // 1: otterscale.link.v1.RancherProject - (*ListRancherProjectsRequest)(nil), // 2: otterscale.link.v1.ListRancherProjectsRequest - (*ListRancherProjectsResponse)(nil), // 3: otterscale.link.v1.ListRancherProjectsResponse - (*ListLinksRequest)(nil), // 4: otterscale.link.v1.ListLinksRequest - (*ListLinksResponse)(nil), // 5: otterscale.link.v1.ListLinksResponse - (*RegisterRequest)(nil), // 6: otterscale.link.v1.RegisterRequest - (*RegisterResponse)(nil), // 7: otterscale.link.v1.RegisterResponse - (*GetAgentManifestRequest)(nil), // 8: otterscale.link.v1.GetAgentManifestRequest - (*GetAgentManifestResponse)(nil), // 9: otterscale.link.v1.GetAgentManifestResponse + (*Link)(nil), // 0: otterscale.link.v1.Link + (*ListLinksRequest)(nil), // 1: otterscale.link.v1.ListLinksRequest + (*ListLinksResponse)(nil), // 2: otterscale.link.v1.ListLinksResponse + (*RegisterRequest)(nil), // 3: otterscale.link.v1.RegisterRequest + (*RegisterResponse)(nil), // 4: otterscale.link.v1.RegisterResponse + (*GetAgentManifestRequest)(nil), // 5: otterscale.link.v1.GetAgentManifestRequest + (*GetAgentManifestResponse)(nil), // 6: otterscale.link.v1.GetAgentManifestResponse } var file_link_v1_link_proto_depIdxs = []int32{ - 1, // 0: otterscale.link.v1.ListRancherProjectsResponse.projects:type_name -> otterscale.link.v1.RancherProject - 0, // 1: otterscale.link.v1.ListLinksResponse.links:type_name -> otterscale.link.v1.Link - 4, // 2: otterscale.link.v1.LinkService.ListLinks:input_type -> otterscale.link.v1.ListLinksRequest - 6, // 3: otterscale.link.v1.LinkService.Register:input_type -> otterscale.link.v1.RegisterRequest - 8, // 4: otterscale.link.v1.LinkService.GetAgentManifest:input_type -> otterscale.link.v1.GetAgentManifestRequest - 2, // 5: otterscale.link.v1.LinkService.ListRancherProjects:input_type -> otterscale.link.v1.ListRancherProjectsRequest - 5, // 6: otterscale.link.v1.LinkService.ListLinks:output_type -> otterscale.link.v1.ListLinksResponse - 7, // 7: otterscale.link.v1.LinkService.Register:output_type -> otterscale.link.v1.RegisterResponse - 9, // 8: otterscale.link.v1.LinkService.GetAgentManifest:output_type -> otterscale.link.v1.GetAgentManifestResponse - 3, // 9: otterscale.link.v1.LinkService.ListRancherProjects:output_type -> otterscale.link.v1.ListRancherProjectsResponse - 6, // [6:10] is the sub-list for method output_type - 2, // [2:6] is the sub-list for method input_type - 2, // [2:2] is the sub-list for extension type_name - 2, // [2:2] is the sub-list for extension extendee - 0, // [0:2] is the sub-list for field type_name + 0, // 0: otterscale.link.v1.ListLinksResponse.links:type_name -> otterscale.link.v1.Link + 1, // 1: otterscale.link.v1.LinkService.ListLinks:input_type -> otterscale.link.v1.ListLinksRequest + 3, // 2: otterscale.link.v1.LinkService.Register:input_type -> otterscale.link.v1.RegisterRequest + 5, // 3: otterscale.link.v1.LinkService.GetAgentManifest:input_type -> otterscale.link.v1.GetAgentManifestRequest + 2, // 4: otterscale.link.v1.LinkService.ListLinks:output_type -> otterscale.link.v1.ListLinksResponse + 4, // 5: otterscale.link.v1.LinkService.Register:output_type -> otterscale.link.v1.RegisterResponse + 6, // 6: otterscale.link.v1.LinkService.GetAgentManifest:output_type -> otterscale.link.v1.GetAgentManifestResponse + 4, // [4:7] is the sub-list for method output_type + 1, // [1:4] is the sub-list for method input_type + 1, // [1:1] is the sub-list for extension type_name + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name } func init() { file_link_v1_link_proto_init() } @@ -1235,7 +895,7 @@ func file_link_v1_link_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: unsafe.Slice(unsafe.StringData(file_link_v1_link_proto_rawDesc), len(file_link_v1_link_proto_rawDesc)), NumEnums: 0, - NumMessages: 10, + NumMessages: 7, NumExtensions: 0, NumServices: 1, }, diff --git a/openapi/openapi.yaml b/openapi/openapi.yaml index ac5f958..cf58877 100644 --- a/openapi/openapi.yaml +++ b/openapi/openapi.yaml @@ -146,44 +146,6 @@ paths: application/json: schema: $ref: '#/components/schemas/otterscale.link.v1.ListLinksResponse' - /otterscale.link.v1.LinkService/ListRancherProjects: - post: - tags: - - LinkService - summary: ListRancherProjects - description: |- - ListRancherProjects returns Rancher Projects available for cluster - registration. - operationId: LinkService_ListRancherProjects - parameters: - - name: Connect-Protocol-Version - in: header - required: true - schema: - $ref: '#/components/schemas/connect-protocol-version' - - name: Connect-Timeout-Ms - in: header - schema: - $ref: '#/components/schemas/connect-timeout-header' - requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/otterscale.link.v1.ListRancherProjectsRequest' - required: true - responses: - default: - description: Error - content: - application/json: - schema: - $ref: '#/components/schemas/connect.error' - "200": - description: Success - content: - application/json: - schema: - $ref: '#/components/schemas/otterscale.link.v1.ListRancherProjectsResponse' /otterscale.link.v1.LinkService/Register: post: tags: @@ -1706,10 +1668,6 @@ components: Additional user identities to be granted cluster-admin via the otterscale-cluster-admin ClusterRoleBinding, in addition to the authenticated caller. - rancherProjectId: - type: string - title: rancher_project_id - description: The full Rancher Project identifier in ":" form. title: GetAgentManifestRequest additionalProperties: false description: |- @@ -1746,10 +1704,6 @@ components: type: string title: agent_version description: The version of the agent binary (e.g. "v1.2.3"), set at build time. - rancherProjectId: - type: string - title: rancher_project_id - description: The full Rancher Project identifier in ":" form. title: Link additionalProperties: false otterscale.link.v1.ListLinksRequest: @@ -1769,41 +1723,6 @@ components: title: ListLinksResponse additionalProperties: false description: ListLinksResponse contains the list of links the agent is registered to. - otterscale.link.v1.ListRancherProjectsRequest: - type: object - title: ListRancherProjectsRequest - additionalProperties: false - description: |- - ListRancherProjectsRequest is an empty request message for listing Rancher - Projects. - otterscale.link.v1.ListRancherProjectsResponse: - type: object - properties: - projects: - type: array - items: - $ref: '#/components/schemas/otterscale.link.v1.RancherProject' - title: projects - description: The available Rancher Projects. - title: ListRancherProjectsResponse - additionalProperties: false - description: ListRancherProjectsResponse contains the available Rancher Projects. - otterscale.link.v1.RancherProject: - type: object - properties: - id: - type: string - title: id - description: The full Rancher Project identifier in ":" form. - displayName: - type: string - title: display_name - description: The human-readable Rancher Project name. - title: RancherProject - additionalProperties: false - description: |- - RancherProject identifies a Rancher Project available for cluster - registration. otterscale.link.v1.RegisterRequest: type: object properties: @@ -1826,10 +1745,6 @@ components: type: string title: agent_version description: The version of the agent binary (e.g. "v1.2.3"), set at build time. - rancherProjectId: - type: string - title: rancher_project_id - description: The full Rancher Project identifier in ":" form. title: RegisterRequest additionalProperties: false description: |- diff --git a/proto/link/v1/link.proto b/proto/link/v1/link.proto index 8b8e631..aa760d1 100644 --- a/proto/link/v1/link.proto +++ b/proto/link/v1/link.proto @@ -31,12 +31,6 @@ service LinkService { option idempotency_level = NO_SIDE_EFFECTS; option (otterscale.api.feature) = {name: "link-enabled"}; } - - // ListRancherProjects returns Rancher Projects available for cluster - // registration. - rpc ListRancherProjects(ListRancherProjectsRequest) returns (ListRancherProjectsResponse) { - option (otterscale.api.feature) = {name: "link-enabled"}; - } } message Link { @@ -45,29 +39,6 @@ message Link { // The version of the agent binary (e.g. "v1.2.3"), set at build time. string agent_version = 2; - - // The full Rancher Project identifier in ":" form. - string rancher_project_id = 3; -} - -// RancherProject identifies a Rancher Project available for cluster -// registration. -message RancherProject { - // The full Rancher Project identifier in ":" form. - string id = 1; - - // The human-readable Rancher Project name. - string display_name = 2; -} - -// ListRancherProjectsRequest is an empty request message for listing Rancher -// Projects. -message ListRancherProjectsRequest {} - -// ListRancherProjectsResponse contains the available Rancher Projects. -message ListRancherProjectsResponse { - // The available Rancher Projects. - repeated RancherProject projects = 1; } // ListLinksRequest is an empty request message for listing links. @@ -94,9 +65,6 @@ message RegisterRequest { // The version of the agent binary (e.g. "v1.2.3"), set at build time. string agent_version = 4; - - // The full Rancher Project identifier in ":" form. - string rancher_project_id = 5; } // RegisterResponse contains a CA-signed certificate and the CA @@ -127,9 +95,6 @@ message GetAgentManifestRequest { // otterscale-cluster-admin ClusterRoleBinding, in addition to the // authenticated caller. repeated string extra_users = 2; - - // The full Rancher Project identifier in ":" form. - string rancher_project_id = 3; } // GetAgentManifestResponse contains the multi-document YAML manifest diff --git a/tenant/v1alpha1/workspace_types.go b/tenant/v1alpha1/workspace_types.go index 671b933..0f5815c 100644 --- a/tenant/v1alpha1/workspace_types.go +++ b/tenant/v1alpha1/workspace_types.go @@ -101,16 +101,6 @@ type WorkspaceSpec struct { // +optional Namespace string `json:"namespace,omitempty"` - // RancherProjectID is the full Rancher Project identifier copied from - // the managed cluster configuration, in ":" form. - // +kubebuilder:validation:MaxLength=317 - // +kubebuilder:validation:Pattern=`^[a-z0-9]([-a-z0-9]*[a-z0-9])?:[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$` - // +kubebuilder:validation:XValidation:rule="self.split(':').size() == 2 && self.split(':')[0].size() <= 63",message="rancherProjectID cluster ID must not exceed 63 characters" - // +kubebuilder:validation:XValidation:rule="self.split(':').size() == 2 && self.split(':')[1].size() <= 253",message="rancherProjectID project name must not exceed 253 characters" - // +kubebuilder:validation:XValidation:rule="self == oldSelf",message="rancherProjectID is immutable" - // +optional - RancherProjectID string `json:"rancherProjectID,omitempty"` - // Members is the list of members granted access to this workspace. // +listType=atomic // +kubebuilder:validation:MinItems=1 diff --git a/ts/src/link/v1/link_pb.d.ts b/ts/src/link/v1/link_pb.d.ts index b307b02..1300890 100644 --- a/ts/src/link/v1/link_pb.d.ts +++ b/ts/src/link/v1/link_pb.d.ts @@ -27,13 +27,6 @@ export declare type Link = Message<"otterscale.link.v1.Link"> & { * @generated from field: string agent_version = 2; */ agentVersion: string; - - /** - * The full Rancher Project identifier in ":" form. - * - * @generated from field: string rancher_project_id = 3; - */ - rancherProjectId: string; }; /** @@ -42,69 +35,6 @@ export declare type Link = Message<"otterscale.link.v1.Link"> & { */ export declare const LinkSchema: GenMessage; -/** - * RancherProject identifies a Rancher Project available for cluster - * registration. - * - * @generated from message otterscale.link.v1.RancherProject - */ -export declare type RancherProject = Message<"otterscale.link.v1.RancherProject"> & { - /** - * The full Rancher Project identifier in ":" form. - * - * @generated from field: string id = 1; - */ - id: string; - - /** - * The human-readable Rancher Project name. - * - * @generated from field: string display_name = 2; - */ - displayName: string; -}; - -/** - * Describes the message otterscale.link.v1.RancherProject. - * Use `create(RancherProjectSchema)` to create a new message. - */ -export declare const RancherProjectSchema: GenMessage; - -/** - * ListRancherProjectsRequest is an empty request message for listing Rancher - * Projects. - * - * @generated from message otterscale.link.v1.ListRancherProjectsRequest - */ -export declare type ListRancherProjectsRequest = Message<"otterscale.link.v1.ListRancherProjectsRequest"> & { -}; - -/** - * Describes the message otterscale.link.v1.ListRancherProjectsRequest. - * Use `create(ListRancherProjectsRequestSchema)` to create a new message. - */ -export declare const ListRancherProjectsRequestSchema: GenMessage; - -/** - * ListRancherProjectsResponse contains the available Rancher Projects. - * - * @generated from message otterscale.link.v1.ListRancherProjectsResponse - */ -export declare type ListRancherProjectsResponse = Message<"otterscale.link.v1.ListRancherProjectsResponse"> & { - /** - * The available Rancher Projects. - * - * @generated from field: repeated otterscale.link.v1.RancherProject projects = 1; - */ - projects: RancherProject[]; -}; - -/** - * Describes the message otterscale.link.v1.ListRancherProjectsResponse. - * Use `create(ListRancherProjectsResponseSchema)` to create a new message. - */ -export declare const ListRancherProjectsResponseSchema: GenMessage; - /** * ListLinksRequest is an empty request message for listing links. * @@ -174,13 +104,6 @@ export declare type RegisterRequest = Message<"otterscale.link.v1.RegisterReques * @generated from field: string agent_version = 4; */ agentVersion: string; - - /** - * The full Rancher Project identifier in ":" form. - * - * @generated from field: string rancher_project_id = 5; - */ - rancherProjectId: string; }; /** @@ -255,13 +178,6 @@ export declare type GetAgentManifestRequest = Message<"otterscale.link.v1.GetAge * @generated from field: repeated string extra_users = 2; */ extraUsers: string[]; - - /** - * The full Rancher Project identifier in ":" form. - * - * @generated from field: string rancher_project_id = 3; - */ - rancherProjectId: string; }; /** @@ -344,16 +260,5 @@ export declare const LinkService: GenService<{ input: typeof GetAgentManifestRequestSchema; output: typeof GetAgentManifestResponseSchema; }, - /** - * ListRancherProjects returns Rancher Projects available for cluster - * registration. - * - * @generated from rpc otterscale.link.v1.LinkService.ListRancherProjects - */ - listRancherProjects: { - methodKind: "unary"; - input: typeof ListRancherProjectsRequestSchema; - output: typeof ListRancherProjectsResponseSchema; - }, }>; diff --git a/ts/src/link/v1/link_pb.js b/ts/src/link/v1/link_pb.js index 833be56..292658e 100644 --- a/ts/src/link/v1/link_pb.js +++ b/ts/src/link/v1/link_pb.js @@ -9,7 +9,7 @@ import { file_feature } from "../../feature_pb.js"; * Describes the file link/v1/link.proto. */ export const file_link_v1_link = /*@__PURE__*/ - fileDesc("ChJsaW5rL3YxL2xpbmsucHJvdG8SEm90dGVyc2NhbGUubGluay52MSJKCgRMaW5rEg8KB2NsdXN0ZXIYASABKAkSFQoNYWdlbnRfdmVyc2lvbhgCIAEoCRIaChJyYW5jaGVyX3Byb2plY3RfaWQYAyABKAkiMgoOUmFuY2hlclByb2plY3QSCgoCaWQYASABKAkSFAoMZGlzcGxheV9uYW1lGAIgASgJIhwKGkxpc3RSYW5jaGVyUHJvamVjdHNSZXF1ZXN0IlMKG0xpc3RSYW5jaGVyUHJvamVjdHNSZXNwb25zZRI0Cghwcm9qZWN0cxgBIAMoCzIiLm90dGVyc2NhbGUubGluay52MS5SYW5jaGVyUHJvamVjdCISChBMaXN0TGlua3NSZXF1ZXN0IjwKEUxpc3RMaW5rc1Jlc3BvbnNlEicKBWxpbmtzGAEgAygLMhgub3R0ZXJzY2FsZS5saW5rLnYxLkxpbmsidAoPUmVnaXN0ZXJSZXF1ZXN0Eg8KB2NsdXN0ZXIYASABKAkSCwoDY3NyGAIgASgMEhAKCGFnZW50X2lkGAMgASgJEhUKDWFnZW50X3ZlcnNpb24YBCABKAkSGgoScmFuY2hlcl9wcm9qZWN0X2lkGAUgASgJImkKEFJlZ2lzdGVyUmVzcG9uc2USEAoIZW5kcG9pbnQYASABKAkSEwoLY2VydGlmaWNhdGUYAiABKAwSFgoOY2FfY2VydGlmaWNhdGUYAyABKAwSFgoOc2VydmVyX3ZlcnNpb24YBCABKAkiWwoXR2V0QWdlbnRNYW5pZmVzdFJlcXVlc3QSDwoHY2x1c3RlchgBIAEoCRITCgtleHRyYV91c2VycxgCIAMoCRIaChJyYW5jaGVyX3Byb2plY3RfaWQYAyABKAkiOQoYR2V0QWdlbnRNYW5pZmVzdFJlc3BvbnNlEhAKCG1hbmlmZXN0GAEgASgJEgsKA3VybBgCIAEoCTL+AwoLTGlua1NlcnZpY2USbQoJTGlzdExpbmtzEiQub3R0ZXJzY2FsZS5saW5rLnYxLkxpc3RMaW5rc1JlcXVlc3QaJS5vdHRlcnNjYWxlLmxpbmsudjEuTGlzdExpbmtzUmVzcG9uc2UiE4rf1R0OCgxsaW5rLWVuYWJsZWQSagoIUmVnaXN0ZXISIy5vdHRlcnNjYWxlLmxpbmsudjEuUmVnaXN0ZXJSZXF1ZXN0GiQub3R0ZXJzY2FsZS5saW5rLnYxLlJlZ2lzdGVyUmVzcG9uc2UiE4rf1R0OCgxsaW5rLWVuYWJsZWQShQEKEEdldEFnZW50TWFuaWZlc3QSKy5vdHRlcnNjYWxlLmxpbmsudjEuR2V0QWdlbnRNYW5pZmVzdFJlcXVlc3QaLC5vdHRlcnNjYWxlLmxpbmsudjEuR2V0QWdlbnRNYW5pZmVzdFJlc3BvbnNlIhaQAgGK39UdDgoMbGluay1lbmFibGVkEosBChNMaXN0UmFuY2hlclByb2plY3RzEi4ub3R0ZXJzY2FsZS5saW5rLnYxLkxpc3RSYW5jaGVyUHJvamVjdHNSZXF1ZXN0Gi8ub3R0ZXJzY2FsZS5saW5rLnYxLkxpc3RSYW5jaGVyUHJvamVjdHNSZXNwb25zZSITit/VHQ4KDGxpbmstZW5hYmxlZEIqWihnaXRodWIuY29tL290dGVyc2NhbGUvYXBpL2xpbmsvdjE7bGlua3YxYghlZGl0aW9uc3DoBw", [file_feature]); + fileDesc("ChJsaW5rL3YxL2xpbmsucHJvdG8SEm90dGVyc2NhbGUubGluay52MSIuCgRMaW5rEg8KB2NsdXN0ZXIYASABKAkSFQoNYWdlbnRfdmVyc2lvbhgCIAEoCSISChBMaXN0TGlua3NSZXF1ZXN0IjwKEUxpc3RMaW5rc1Jlc3BvbnNlEicKBWxpbmtzGAEgAygLMhgub3R0ZXJzY2FsZS5saW5rLnYxLkxpbmsiWAoPUmVnaXN0ZXJSZXF1ZXN0Eg8KB2NsdXN0ZXIYASABKAkSCwoDY3NyGAIgASgMEhAKCGFnZW50X2lkGAMgASgJEhUKDWFnZW50X3ZlcnNpb24YBCABKAkiaQoQUmVnaXN0ZXJSZXNwb25zZRIQCghlbmRwb2ludBgBIAEoCRITCgtjZXJ0aWZpY2F0ZRgCIAEoDBIWCg5jYV9jZXJ0aWZpY2F0ZRgDIAEoDBIWCg5zZXJ2ZXJfdmVyc2lvbhgEIAEoCSI/ChdHZXRBZ2VudE1hbmlmZXN0UmVxdWVzdBIPCgdjbHVzdGVyGAEgASgJEhMKC2V4dHJhX3VzZXJzGAIgAygJIjkKGEdldEFnZW50TWFuaWZlc3RSZXNwb25zZRIQCghtYW5pZmVzdBgBIAEoCRILCgN1cmwYAiABKAky8AIKC0xpbmtTZXJ2aWNlEm0KCUxpc3RMaW5rcxIkLm90dGVyc2NhbGUubGluay52MS5MaXN0TGlua3NSZXF1ZXN0GiUub3R0ZXJzY2FsZS5saW5rLnYxLkxpc3RMaW5rc1Jlc3BvbnNlIhOK39UdDgoMbGluay1lbmFibGVkEmoKCFJlZ2lzdGVyEiMub3R0ZXJzY2FsZS5saW5rLnYxLlJlZ2lzdGVyUmVxdWVzdBokLm90dGVyc2NhbGUubGluay52MS5SZWdpc3RlclJlc3BvbnNlIhOK39UdDgoMbGluay1lbmFibGVkEoUBChBHZXRBZ2VudE1hbmlmZXN0Eisub3R0ZXJzY2FsZS5saW5rLnYxLkdldEFnZW50TWFuaWZlc3RSZXF1ZXN0Giwub3R0ZXJzY2FsZS5saW5rLnYxLkdldEFnZW50TWFuaWZlc3RSZXNwb25zZSIWkAIBit/VHQ4KDGxpbmstZW5hYmxlZEIqWihnaXRodWIuY29tL290dGVyc2NhbGUvYXBpL2xpbmsvdjE7bGlua3YxYghlZGl0aW9uc3DoBw", [file_feature]); /** * Describes the message otterscale.link.v1.Link. @@ -18,68 +18,47 @@ export const file_link_v1_link = /*@__PURE__*/ export const LinkSchema = /*@__PURE__*/ messageDesc(file_link_v1_link, 0); -/** - * Describes the message otterscale.link.v1.RancherProject. - * Use `create(RancherProjectSchema)` to create a new message. - */ -export const RancherProjectSchema = /*@__PURE__*/ - messageDesc(file_link_v1_link, 1); - -/** - * Describes the message otterscale.link.v1.ListRancherProjectsRequest. - * Use `create(ListRancherProjectsRequestSchema)` to create a new message. - */ -export const ListRancherProjectsRequestSchema = /*@__PURE__*/ - messageDesc(file_link_v1_link, 2); - -/** - * Describes the message otterscale.link.v1.ListRancherProjectsResponse. - * Use `create(ListRancherProjectsResponseSchema)` to create a new message. - */ -export const ListRancherProjectsResponseSchema = /*@__PURE__*/ - messageDesc(file_link_v1_link, 3); - /** * Describes the message otterscale.link.v1.ListLinksRequest. * Use `create(ListLinksRequestSchema)` to create a new message. */ export const ListLinksRequestSchema = /*@__PURE__*/ - messageDesc(file_link_v1_link, 4); + messageDesc(file_link_v1_link, 1); /** * Describes the message otterscale.link.v1.ListLinksResponse. * Use `create(ListLinksResponseSchema)` to create a new message. */ export const ListLinksResponseSchema = /*@__PURE__*/ - messageDesc(file_link_v1_link, 5); + messageDesc(file_link_v1_link, 2); /** * Describes the message otterscale.link.v1.RegisterRequest. * Use `create(RegisterRequestSchema)` to create a new message. */ export const RegisterRequestSchema = /*@__PURE__*/ - messageDesc(file_link_v1_link, 6); + messageDesc(file_link_v1_link, 3); /** * Describes the message otterscale.link.v1.RegisterResponse. * Use `create(RegisterResponseSchema)` to create a new message. */ export const RegisterResponseSchema = /*@__PURE__*/ - messageDesc(file_link_v1_link, 7); + messageDesc(file_link_v1_link, 4); /** * Describes the message otterscale.link.v1.GetAgentManifestRequest. * Use `create(GetAgentManifestRequestSchema)` to create a new message. */ export const GetAgentManifestRequestSchema = /*@__PURE__*/ - messageDesc(file_link_v1_link, 8); + messageDesc(file_link_v1_link, 5); /** * Describes the message otterscale.link.v1.GetAgentManifestResponse. * Use `create(GetAgentManifestResponseSchema)` to create a new message. */ export const GetAgentManifestResponseSchema = /*@__PURE__*/ - messageDesc(file_link_v1_link, 9); + messageDesc(file_link_v1_link, 6); /** * LinkService manages the lifecycle of agent-to-server tunnel connections,