diff --git a/controller/cache/cluster.go b/controller/cache/cluster.go index 7a7c7adfdb..11165ea95b 100644 --- a/controller/cache/cluster.go +++ b/controller/cache/cluster.go @@ -183,7 +183,7 @@ func ownerRefGV(ownerRef metav1.OwnerReference) schema.GroupVersion { } func (c *clusterInfo) delete(obj *unstructured.Unstructured) error { - err := c.kubectl.DeleteResource(c.cluster.RESTConfig(), obj.GroupVersionKind(), obj.GetName(), obj.GetNamespace(), false, nil) + err := c.kubectl.DeleteResource(c.cluster.RESTConfig(), obj.GroupVersionKind(), obj.GetName(), obj.GetNamespace(), false) err = c.handleError(obj.GroupVersionKind(), obj.GetNamespace(), obj.GetName(), err) if err != nil && errors.IsNotFound(err) { err = nil diff --git a/controller/services/application.pb.go b/controller/services/application.pb.go index 7d7181b9f6..e91b8a9808 100644 --- a/controller/services/application.pb.go +++ b/controller/services/application.pb.go @@ -35,7 +35,7 @@ func (m *ResourcesQuery) Reset() { *m = ResourcesQuery{} } func (m *ResourcesQuery) String() string { return proto.CompactTextString(m) } func (*ResourcesQuery) ProtoMessage() {} func (*ResourcesQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_application_22f1e591d294b941, []int{0} + return fileDescriptor_application_9e06f70e07dd0483, []int{0} } func (m *ResourcesQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -82,7 +82,7 @@ func (m *ResourceTreeResponse) Reset() { *m = ResourceTreeResponse{} } func (m *ResourceTreeResponse) String() string { return proto.CompactTextString(m) } func (*ResourceTreeResponse) ProtoMessage() {} func (*ResourceTreeResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_application_22f1e591d294b941, []int{1} + return fileDescriptor_application_9e06f70e07dd0483, []int{1} } func (m *ResourceTreeResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -129,7 +129,7 @@ func (m *ManagedResourcesResponse) Reset() { *m = ManagedResourcesRespon func (m *ManagedResourcesResponse) String() string { return proto.CompactTextString(m) } func (*ManagedResourcesResponse) ProtoMessage() {} func (*ManagedResourcesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_application_22f1e591d294b941, []int{2} + return fileDescriptor_application_9e06f70e07dd0483, []int{2} } func (m *ManagedResourcesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -784,10 +784,10 @@ var ( ) func init() { - proto.RegisterFile("controller/services/application.proto", fileDescriptor_application_22f1e591d294b941) + proto.RegisterFile("controller/services/application.proto", fileDescriptor_application_9e06f70e07dd0483) } -var fileDescriptor_application_22f1e591d294b941 = []byte{ +var fileDescriptor_application_9e06f70e07dd0483 = []byte{ // 337 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x53, 0xcd, 0x4a, 0x33, 0x31, 0x14, 0x6d, 0xbe, 0x0f, 0x05, 0xa3, 0xa8, 0x04, 0x17, 0xa5, 0x8b, 0x52, 0x06, 0x84, 0x6e, 0x4c, diff --git a/controller/sync.go b/controller/sync.go index 45e9af70a5..f43edb4c20 100644 --- a/controller/sync.go +++ b/controller/sync.go @@ -388,7 +388,7 @@ func (sc *syncContext) pruneObject(liveObj *unstructured.Unstructured, prune, dr resDetails.Message = "pruned (dry run)" resDetails.Status = appv1.ResultCodePruned } else { - err := sc.kubectl.DeleteResource(sc.config, liveObj.GroupVersionKind(), liveObj.GetName(), liveObj.GetNamespace(), false, nil) + err := sc.kubectl.DeleteResource(sc.config, liveObj.GroupVersionKind(), liveObj.GetName(), liveObj.GetNamespace(), false) if err != nil { resDetails.Message = err.Error() resDetails.Status = appv1.ResultCodeSyncFailed diff --git a/pkg/apis/application/v1alpha1/generated.pb.go b/pkg/apis/application/v1alpha1/generated.pb.go index fd7be7cccd..e6c61cc032 100644 --- a/pkg/apis/application/v1alpha1/generated.pb.go +++ b/pkg/apis/application/v1alpha1/generated.pb.go @@ -30,7 +30,7 @@ const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package func (m *AWSAuthConfig) Reset() { *m = AWSAuthConfig{} } func (*AWSAuthConfig) ProtoMessage() {} func (*AWSAuthConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{0} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{0} } func (m *AWSAuthConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -58,7 +58,7 @@ var xxx_messageInfo_AWSAuthConfig proto.InternalMessageInfo func (m *AppProject) Reset() { *m = AppProject{} } func (*AppProject) ProtoMessage() {} func (*AppProject) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{1} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{1} } func (m *AppProject) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -86,7 +86,7 @@ var xxx_messageInfo_AppProject proto.InternalMessageInfo func (m *AppProjectList) Reset() { *m = AppProjectList{} } func (*AppProjectList) ProtoMessage() {} func (*AppProjectList) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{2} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{2} } func (m *AppProjectList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -114,7 +114,7 @@ var xxx_messageInfo_AppProjectList proto.InternalMessageInfo func (m *AppProjectSpec) Reset() { *m = AppProjectSpec{} } func (*AppProjectSpec) ProtoMessage() {} func (*AppProjectSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{3} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{3} } func (m *AppProjectSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -142,7 +142,7 @@ var xxx_messageInfo_AppProjectSpec proto.InternalMessageInfo func (m *Application) Reset() { *m = Application{} } func (*Application) ProtoMessage() {} func (*Application) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{4} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{4} } func (m *Application) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -170,7 +170,7 @@ var xxx_messageInfo_Application proto.InternalMessageInfo func (m *ApplicationCondition) Reset() { *m = ApplicationCondition{} } func (*ApplicationCondition) ProtoMessage() {} func (*ApplicationCondition) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{5} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{5} } func (m *ApplicationCondition) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -198,7 +198,7 @@ var xxx_messageInfo_ApplicationCondition proto.InternalMessageInfo func (m *ApplicationDestination) Reset() { *m = ApplicationDestination{} } func (*ApplicationDestination) ProtoMessage() {} func (*ApplicationDestination) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{6} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{6} } func (m *ApplicationDestination) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -226,7 +226,7 @@ var xxx_messageInfo_ApplicationDestination proto.InternalMessageInfo func (m *ApplicationList) Reset() { *m = ApplicationList{} } func (*ApplicationList) ProtoMessage() {} func (*ApplicationList) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{7} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{7} } func (m *ApplicationList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -254,7 +254,7 @@ var xxx_messageInfo_ApplicationList proto.InternalMessageInfo func (m *ApplicationSource) Reset() { *m = ApplicationSource{} } func (*ApplicationSource) ProtoMessage() {} func (*ApplicationSource) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{8} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{8} } func (m *ApplicationSource) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -282,7 +282,7 @@ var xxx_messageInfo_ApplicationSource proto.InternalMessageInfo func (m *ApplicationSourceHelm) Reset() { *m = ApplicationSourceHelm{} } func (*ApplicationSourceHelm) ProtoMessage() {} func (*ApplicationSourceHelm) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{9} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{9} } func (m *ApplicationSourceHelm) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -310,7 +310,7 @@ var xxx_messageInfo_ApplicationSourceHelm proto.InternalMessageInfo func (m *ApplicationSourceKsonnet) Reset() { *m = ApplicationSourceKsonnet{} } func (*ApplicationSourceKsonnet) ProtoMessage() {} func (*ApplicationSourceKsonnet) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{10} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{10} } func (m *ApplicationSourceKsonnet) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -338,7 +338,7 @@ var xxx_messageInfo_ApplicationSourceKsonnet proto.InternalMessageInfo func (m *ApplicationSourceKustomize) Reset() { *m = ApplicationSourceKustomize{} } func (*ApplicationSourceKustomize) ProtoMessage() {} func (*ApplicationSourceKustomize) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{11} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{11} } func (m *ApplicationSourceKustomize) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -366,7 +366,7 @@ var xxx_messageInfo_ApplicationSourceKustomize proto.InternalMessageInfo func (m *ApplicationSpec) Reset() { *m = ApplicationSpec{} } func (*ApplicationSpec) ProtoMessage() {} func (*ApplicationSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{12} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{12} } func (m *ApplicationSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -394,7 +394,7 @@ var xxx_messageInfo_ApplicationSpec proto.InternalMessageInfo func (m *ApplicationStatus) Reset() { *m = ApplicationStatus{} } func (*ApplicationStatus) ProtoMessage() {} func (*ApplicationStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{13} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{13} } func (m *ApplicationStatus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -422,7 +422,7 @@ var xxx_messageInfo_ApplicationStatus proto.InternalMessageInfo func (m *ApplicationWatchEvent) Reset() { *m = ApplicationWatchEvent{} } func (*ApplicationWatchEvent) ProtoMessage() {} func (*ApplicationWatchEvent) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{14} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{14} } func (m *ApplicationWatchEvent) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -450,7 +450,7 @@ var xxx_messageInfo_ApplicationWatchEvent proto.InternalMessageInfo func (m *Cluster) Reset() { *m = Cluster{} } func (*Cluster) ProtoMessage() {} func (*Cluster) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{15} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{15} } func (m *Cluster) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -478,7 +478,7 @@ var xxx_messageInfo_Cluster proto.InternalMessageInfo func (m *ClusterConfig) Reset() { *m = ClusterConfig{} } func (*ClusterConfig) ProtoMessage() {} func (*ClusterConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{16} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{16} } func (m *ClusterConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -506,7 +506,7 @@ var xxx_messageInfo_ClusterConfig proto.InternalMessageInfo func (m *ClusterList) Reset() { *m = ClusterList{} } func (*ClusterList) ProtoMessage() {} func (*ClusterList) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{17} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{17} } func (m *ClusterList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -534,7 +534,7 @@ var xxx_messageInfo_ClusterList proto.InternalMessageInfo func (m *ComponentParameter) Reset() { *m = ComponentParameter{} } func (*ComponentParameter) ProtoMessage() {} func (*ComponentParameter) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{18} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{18} } func (m *ComponentParameter) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -562,7 +562,7 @@ var xxx_messageInfo_ComponentParameter proto.InternalMessageInfo func (m *ConnectionState) Reset() { *m = ConnectionState{} } func (*ConnectionState) ProtoMessage() {} func (*ConnectionState) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{19} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{19} } func (m *ConnectionState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -590,7 +590,7 @@ var xxx_messageInfo_ConnectionState proto.InternalMessageInfo func (m *HealthStatus) Reset() { *m = HealthStatus{} } func (*HealthStatus) ProtoMessage() {} func (*HealthStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{20} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{20} } func (m *HealthStatus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -618,7 +618,7 @@ var xxx_messageInfo_HealthStatus proto.InternalMessageInfo func (m *HelmRepository) Reset() { *m = HelmRepository{} } func (*HelmRepository) ProtoMessage() {} func (*HelmRepository) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{21} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{21} } func (m *HelmRepository) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -646,7 +646,7 @@ var xxx_messageInfo_HelmRepository proto.InternalMessageInfo func (m *JWTToken) Reset() { *m = JWTToken{} } func (*JWTToken) ProtoMessage() {} func (*JWTToken) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{22} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{22} } func (m *JWTToken) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -674,7 +674,7 @@ var xxx_messageInfo_JWTToken proto.InternalMessageInfo func (m *Operation) Reset() { *m = Operation{} } func (*Operation) ProtoMessage() {} func (*Operation) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{23} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{23} } func (m *Operation) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -702,7 +702,7 @@ var xxx_messageInfo_Operation proto.InternalMessageInfo func (m *OperationState) Reset() { *m = OperationState{} } func (*OperationState) ProtoMessage() {} func (*OperationState) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{24} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{24} } func (m *OperationState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -730,7 +730,7 @@ var xxx_messageInfo_OperationState proto.InternalMessageInfo func (m *ParameterOverrides) Reset() { *m = ParameterOverrides{} } func (*ParameterOverrides) ProtoMessage() {} func (*ParameterOverrides) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{25} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{25} } func (m *ParameterOverrides) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -758,7 +758,7 @@ var xxx_messageInfo_ParameterOverrides proto.InternalMessageInfo func (m *ProjectRole) Reset() { *m = ProjectRole{} } func (*ProjectRole) ProtoMessage() {} func (*ProjectRole) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{26} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{26} } func (m *ProjectRole) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -786,7 +786,7 @@ var xxx_messageInfo_ProjectRole proto.InternalMessageInfo func (m *Repository) Reset() { *m = Repository{} } func (*Repository) ProtoMessage() {} func (*Repository) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{27} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{27} } func (m *Repository) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -814,7 +814,7 @@ var xxx_messageInfo_Repository proto.InternalMessageInfo func (m *RepositoryList) Reset() { *m = RepositoryList{} } func (*RepositoryList) ProtoMessage() {} func (*RepositoryList) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{28} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{28} } func (m *RepositoryList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -842,7 +842,7 @@ var xxx_messageInfo_RepositoryList proto.InternalMessageInfo func (m *ResourceDiff) Reset() { *m = ResourceDiff{} } func (*ResourceDiff) ProtoMessage() {} func (*ResourceDiff) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{29} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{29} } func (m *ResourceDiff) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -870,7 +870,7 @@ var xxx_messageInfo_ResourceDiff proto.InternalMessageInfo func (m *ResourceNode) Reset() { *m = ResourceNode{} } func (*ResourceNode) ProtoMessage() {} func (*ResourceNode) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{30} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{30} } func (m *ResourceNode) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -898,7 +898,7 @@ var xxx_messageInfo_ResourceNode proto.InternalMessageInfo func (m *ResourceResult) Reset() { *m = ResourceResult{} } func (*ResourceResult) ProtoMessage() {} func (*ResourceResult) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{31} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{31} } func (m *ResourceResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -926,7 +926,7 @@ var xxx_messageInfo_ResourceResult proto.InternalMessageInfo func (m *ResourceStatus) Reset() { *m = ResourceStatus{} } func (*ResourceStatus) ProtoMessage() {} func (*ResourceStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{32} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{32} } func (m *ResourceStatus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -954,7 +954,7 @@ var xxx_messageInfo_ResourceStatus proto.InternalMessageInfo func (m *RevisionHistory) Reset() { *m = RevisionHistory{} } func (*RevisionHistory) ProtoMessage() {} func (*RevisionHistory) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{33} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{33} } func (m *RevisionHistory) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -982,7 +982,7 @@ var xxx_messageInfo_RevisionHistory proto.InternalMessageInfo func (m *SyncOperation) Reset() { *m = SyncOperation{} } func (*SyncOperation) ProtoMessage() {} func (*SyncOperation) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{34} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{34} } func (m *SyncOperation) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1010,7 +1010,7 @@ var xxx_messageInfo_SyncOperation proto.InternalMessageInfo func (m *SyncOperationResource) Reset() { *m = SyncOperationResource{} } func (*SyncOperationResource) ProtoMessage() {} func (*SyncOperationResource) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{35} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{35} } func (m *SyncOperationResource) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1038,7 +1038,7 @@ var xxx_messageInfo_SyncOperationResource proto.InternalMessageInfo func (m *SyncOperationResult) Reset() { *m = SyncOperationResult{} } func (*SyncOperationResult) ProtoMessage() {} func (*SyncOperationResult) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{36} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{36} } func (m *SyncOperationResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1066,7 +1066,7 @@ var xxx_messageInfo_SyncOperationResult proto.InternalMessageInfo func (m *SyncPolicy) Reset() { *m = SyncPolicy{} } func (*SyncPolicy) ProtoMessage() {} func (*SyncPolicy) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{37} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{37} } func (m *SyncPolicy) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1094,7 +1094,7 @@ var xxx_messageInfo_SyncPolicy proto.InternalMessageInfo func (m *SyncPolicyAutomated) Reset() { *m = SyncPolicyAutomated{} } func (*SyncPolicyAutomated) ProtoMessage() {} func (*SyncPolicyAutomated) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{38} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{38} } func (m *SyncPolicyAutomated) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1122,7 +1122,7 @@ var xxx_messageInfo_SyncPolicyAutomated proto.InternalMessageInfo func (m *SyncStatus) Reset() { *m = SyncStatus{} } func (*SyncStatus) ProtoMessage() {} func (*SyncStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{39} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{39} } func (m *SyncStatus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1150,7 +1150,7 @@ var xxx_messageInfo_SyncStatus proto.InternalMessageInfo func (m *SyncStrategy) Reset() { *m = SyncStrategy{} } func (*SyncStrategy) ProtoMessage() {} func (*SyncStrategy) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{40} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{40} } func (m *SyncStrategy) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1178,7 +1178,7 @@ var xxx_messageInfo_SyncStrategy proto.InternalMessageInfo func (m *SyncStrategyApply) Reset() { *m = SyncStrategyApply{} } func (*SyncStrategyApply) ProtoMessage() {} func (*SyncStrategyApply) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{41} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{41} } func (m *SyncStrategyApply) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1206,7 +1206,7 @@ var xxx_messageInfo_SyncStrategyApply proto.InternalMessageInfo func (m *SyncStrategyHook) Reset() { *m = SyncStrategyHook{} } func (*SyncStrategyHook) ProtoMessage() {} func (*SyncStrategyHook) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{42} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{42} } func (m *SyncStrategyHook) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1234,7 +1234,7 @@ var xxx_messageInfo_SyncStrategyHook proto.InternalMessageInfo func (m *TLSClientConfig) Reset() { *m = TLSClientConfig{} } func (*TLSClientConfig) ProtoMessage() {} func (*TLSClientConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_f670483d27620011, []int{43} + return fileDescriptor_generated_4d424f5f52e2ab56, []int{43} } func (m *TLSClientConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -11322,10 +11322,10 @@ var ( ) func init() { - proto.RegisterFile("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1/generated.proto", fileDescriptor_generated_f670483d27620011) + proto.RegisterFile("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1/generated.proto", fileDescriptor_generated_4d424f5f52e2ab56) } -var fileDescriptor_generated_f670483d27620011 = []byte{ +var fileDescriptor_generated_4d424f5f52e2ab56 = []byte{ // 2983 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x1a, 0x4b, 0x8c, 0x1c, 0x57, 0x71, 0x7b, 0x7b, 0x66, 0x67, 0xa6, 0x66, 0x77, 0x1d, 0xbf, 0x7c, 0x18, 0x36, 0x61, 0x77, 0xd5, diff --git a/reposerver/repository/repository.pb.go b/reposerver/repository/repository.pb.go index d5ae5729d4..4b83807cf5 100644 --- a/reposerver/repository/repository.pb.go +++ b/reposerver/repository/repository.pb.go @@ -45,7 +45,7 @@ func (m *ManifestRequest) Reset() { *m = ManifestRequest{} } func (m *ManifestRequest) String() string { return proto.CompactTextString(m) } func (*ManifestRequest) ProtoMessage() {} func (*ManifestRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_b87553671d2c4b16, []int{0} + return fileDescriptor_repository_47857c07b7787e09, []int{0} } func (m *ManifestRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -138,7 +138,7 @@ func (m *ManifestResponse) Reset() { *m = ManifestResponse{} } func (m *ManifestResponse) String() string { return proto.CompactTextString(m) } func (*ManifestResponse) ProtoMessage() {} func (*ManifestResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_b87553671d2c4b16, []int{1} + return fileDescriptor_repository_47857c07b7787e09, []int{1} } func (m *ManifestResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -216,7 +216,7 @@ func (m *ListDirRequest) Reset() { *m = ListDirRequest{} } func (m *ListDirRequest) String() string { return proto.CompactTextString(m) } func (*ListDirRequest) ProtoMessage() {} func (*ListDirRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_b87553671d2c4b16, []int{2} + return fileDescriptor_repository_47857c07b7787e09, []int{2} } func (m *ListDirRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -278,7 +278,7 @@ func (m *FileList) Reset() { *m = FileList{} } func (m *FileList) String() string { return proto.CompactTextString(m) } func (*FileList) ProtoMessage() {} func (*FileList) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_b87553671d2c4b16, []int{3} + return fileDescriptor_repository_47857c07b7787e09, []int{3} } func (m *FileList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -328,7 +328,7 @@ func (m *GetFileRequest) Reset() { *m = GetFileRequest{} } func (m *GetFileRequest) String() string { return proto.CompactTextString(m) } func (*GetFileRequest) ProtoMessage() {} func (*GetFileRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_b87553671d2c4b16, []int{4} + return fileDescriptor_repository_47857c07b7787e09, []int{4} } func (m *GetFileRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -390,7 +390,7 @@ func (m *GetFileResponse) Reset() { *m = GetFileResponse{} } func (m *GetFileResponse) String() string { return proto.CompactTextString(m) } func (*GetFileResponse) ProtoMessage() {} func (*GetFileResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_b87553671d2c4b16, []int{5} + return fileDescriptor_repository_47857c07b7787e09, []int{5} } func (m *GetFileResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2059,10 +2059,10 @@ var ( ) func init() { - proto.RegisterFile("reposerver/repository/repository.proto", fileDescriptor_repository_b87553671d2c4b16) + proto.RegisterFile("reposerver/repository/repository.proto", fileDescriptor_repository_47857c07b7787e09) } -var fileDescriptor_repository_b87553671d2c4b16 = []byte{ +var fileDescriptor_repository_47857c07b7787e09 = []byte{ // 602 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x55, 0xcf, 0x6e, 0xd3, 0x4e, 0x10, 0xae, 0xdb, 0x34, 0x6d, 0x36, 0x3f, 0xfd, 0xda, 0xae, 0x22, 0x64, 0x39, 0x51, 0x14, 0x59, diff --git a/server/account/account.pb.go b/server/account/account.pb.go index 116230533b..17aef183e7 100644 --- a/server/account/account.pb.go +++ b/server/account/account.pb.go @@ -37,7 +37,7 @@ func (m *UpdatePasswordRequest) Reset() { *m = UpdatePasswordRequest{} } func (m *UpdatePasswordRequest) String() string { return proto.CompactTextString(m) } func (*UpdatePasswordRequest) ProtoMessage() {} func (*UpdatePasswordRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_account_c12a236fbb4926f3, []int{0} + return fileDescriptor_account_3e64cf795478a98b, []int{0} } func (m *UpdatePasswordRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -90,7 +90,7 @@ func (m *UpdatePasswordResponse) Reset() { *m = UpdatePasswordResponse{} func (m *UpdatePasswordResponse) String() string { return proto.CompactTextString(m) } func (*UpdatePasswordResponse) ProtoMessage() {} func (*UpdatePasswordResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_account_c12a236fbb4926f3, []int{1} + return fileDescriptor_account_3e64cf795478a98b, []int{1} } func (m *UpdatePasswordResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -566,10 +566,10 @@ var ( ) func init() { - proto.RegisterFile("server/account/account.proto", fileDescriptor_account_c12a236fbb4926f3) + proto.RegisterFile("server/account/account.proto", fileDescriptor_account_3e64cf795478a98b) } -var fileDescriptor_account_c12a236fbb4926f3 = []byte{ +var fileDescriptor_account_3e64cf795478a98b = []byte{ // 268 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x29, 0x4e, 0x2d, 0x2a, 0x4b, 0x2d, 0xd2, 0x4f, 0x4c, 0x4e, 0xce, 0x2f, 0xcd, 0x2b, 0x81, 0xd1, 0x7a, 0x05, 0x45, 0xf9, diff --git a/server/application/application.go b/server/application/application.go index dc532a6b72..849a957029 100644 --- a/server/application/application.go +++ b/server/application/application.go @@ -511,11 +511,11 @@ func (s *Server) DeleteResource(ctx context.Context, q *ApplicationResourceDelet if !s.enf.Enforce(ctx.Value("claims"), rbacpolicy.ResourceApplications, rbacpolicy.ActionDelete, appRBACName(*a)) { return nil, grpc.ErrPermissionDenied } - var forceDelete bool - if q.ForceDeleted != nil { - forceDelete = *q.ForceDeleted + var force bool + if q.Force != nil { + force = *q.Force } - err = s.kubectl.DeleteResource(config, res.GroupKindVersion(), res.Name, res.Namespace, forceDelete, q.GracePeriod) + err = s.kubectl.DeleteResource(config, res.GroupKindVersion(), res.Name, res.Namespace, force) if err != nil { return nil, err } diff --git a/server/application/application.pb.go b/server/application/application.pb.go index 7374be3496..fa705f364c 100644 --- a/server/application/application.pb.go +++ b/server/application/application.pb.go @@ -52,7 +52,7 @@ func (m *ApplicationQuery) Reset() { *m = ApplicationQuery{} } func (m *ApplicationQuery) String() string { return proto.CompactTextString(m) } func (*ApplicationQuery) ProtoMessage() {} func (*ApplicationQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_application_718661e6808263d4, []int{0} + return fileDescriptor_application_1f706f7a3fcdb3d9, []int{0} } func (m *ApplicationQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -117,7 +117,7 @@ func (m *ApplicationResourceEventsQuery) Reset() { *m = ApplicationResou func (m *ApplicationResourceEventsQuery) String() string { return proto.CompactTextString(m) } func (*ApplicationResourceEventsQuery) ProtoMessage() {} func (*ApplicationResourceEventsQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_application_718661e6808263d4, []int{1} + return fileDescriptor_application_1f706f7a3fcdb3d9, []int{1} } func (m *ApplicationResourceEventsQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -187,7 +187,7 @@ func (m *ApplicationManifestQuery) Reset() { *m = ApplicationManifestQue func (m *ApplicationManifestQuery) String() string { return proto.CompactTextString(m) } func (*ApplicationManifestQuery) ProtoMessage() {} func (*ApplicationManifestQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_application_718661e6808263d4, []int{2} + return fileDescriptor_application_1f706f7a3fcdb3d9, []int{2} } func (m *ApplicationManifestQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -240,7 +240,7 @@ func (m *ApplicationResponse) Reset() { *m = ApplicationResponse{} } func (m *ApplicationResponse) String() string { return proto.CompactTextString(m) } func (*ApplicationResponse) ProtoMessage() {} func (*ApplicationResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_application_718661e6808263d4, []int{3} + return fileDescriptor_application_1f706f7a3fcdb3d9, []int{3} } func (m *ApplicationResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -281,7 +281,7 @@ func (m *ApplicationCreateRequest) Reset() { *m = ApplicationCreateReque func (m *ApplicationCreateRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationCreateRequest) ProtoMessage() {} func (*ApplicationCreateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_application_718661e6808263d4, []int{4} + return fileDescriptor_application_1f706f7a3fcdb3d9, []int{4} } func (m *ApplicationCreateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -335,7 +335,7 @@ func (m *ApplicationUpdateRequest) Reset() { *m = ApplicationUpdateReque func (m *ApplicationUpdateRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationUpdateRequest) ProtoMessage() {} func (*ApplicationUpdateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_application_718661e6808263d4, []int{5} + return fileDescriptor_application_1f706f7a3fcdb3d9, []int{5} } func (m *ApplicationUpdateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -383,7 +383,7 @@ func (m *ApplicationDeleteRequest) Reset() { *m = ApplicationDeleteReque func (m *ApplicationDeleteRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationDeleteRequest) ProtoMessage() {} func (*ApplicationDeleteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_application_718661e6808263d4, []int{6} + return fileDescriptor_application_1f706f7a3fcdb3d9, []int{6} } func (m *ApplicationDeleteRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -444,7 +444,7 @@ func (m *ApplicationSyncRequest) Reset() { *m = ApplicationSyncRequest{} func (m *ApplicationSyncRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationSyncRequest) ProtoMessage() {} func (*ApplicationSyncRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_application_718661e6808263d4, []int{7} + return fileDescriptor_application_1f706f7a3fcdb3d9, []int{7} } func (m *ApplicationSyncRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -535,7 +535,7 @@ func (m *ParameterOverrides) Reset() { *m = ParameterOverrides{} } func (m *ParameterOverrides) String() string { return proto.CompactTextString(m) } func (*ParameterOverrides) ProtoMessage() {} func (*ParameterOverrides) Descriptor() ([]byte, []int) { - return fileDescriptor_application_718661e6808263d4, []int{8} + return fileDescriptor_application_1f706f7a3fcdb3d9, []int{8} } func (m *ParameterOverrides) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -584,7 +584,7 @@ func (m *Parameter) Reset() { *m = Parameter{} } func (m *Parameter) String() string { return proto.CompactTextString(m) } func (*Parameter) ProtoMessage() {} func (*Parameter) Descriptor() ([]byte, []int) { - return fileDescriptor_application_718661e6808263d4, []int{9} + return fileDescriptor_application_1f706f7a3fcdb3d9, []int{9} } func (m *Parameter) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -647,7 +647,7 @@ func (m *ApplicationUpdateSpecRequest) Reset() { *m = ApplicationUpdateS func (m *ApplicationUpdateSpecRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationUpdateSpecRequest) ProtoMessage() {} func (*ApplicationUpdateSpecRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_application_718661e6808263d4, []int{10} + return fileDescriptor_application_1f706f7a3fcdb3d9, []int{10} } func (m *ApplicationUpdateSpecRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -704,7 +704,7 @@ func (m *ApplicationRollbackRequest) Reset() { *m = ApplicationRollbackR func (m *ApplicationRollbackRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationRollbackRequest) ProtoMessage() {} func (*ApplicationRollbackRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_application_718661e6808263d4, []int{11} + return fileDescriptor_application_1f706f7a3fcdb3d9, []int{11} } func (m *ApplicationRollbackRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -777,7 +777,7 @@ func (m *ApplicationResourceRequest) Reset() { *m = ApplicationResourceR func (m *ApplicationResourceRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationResourceRequest) ProtoMessage() {} func (*ApplicationResourceRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_application_718661e6808263d4, []int{12} + return fileDescriptor_application_1f706f7a3fcdb3d9, []int{12} } func (m *ApplicationResourceRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -855,8 +855,7 @@ type ApplicationResourceDeleteRequest struct { Version string `protobuf:"bytes,4,req,name=version" json:"version"` Group string `protobuf:"bytes,5,req,name=group" json:"group"` Kind string `protobuf:"bytes,6,req,name=kind" json:"kind"` - ForceDeleted *bool `protobuf:"varint,7,opt,name=forceDeleted" json:"forceDeleted,omitempty"` - GracePeriod *int64 `protobuf:"varint,8,opt,name=gracePeriod" json:"gracePeriod,omitempty"` + Force *bool `protobuf:"varint,7,opt,name=force" json:"force,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -866,7 +865,7 @@ func (m *ApplicationResourceDeleteRequest) Reset() { *m = ApplicationRes func (m *ApplicationResourceDeleteRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationResourceDeleteRequest) ProtoMessage() {} func (*ApplicationResourceDeleteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_application_718661e6808263d4, []int{13} + return fileDescriptor_application_1f706f7a3fcdb3d9, []int{13} } func (m *ApplicationResourceDeleteRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -937,20 +936,13 @@ func (m *ApplicationResourceDeleteRequest) GetKind() string { return "" } -func (m *ApplicationResourceDeleteRequest) GetForceDeleted() bool { - if m != nil && m.ForceDeleted != nil { - return *m.ForceDeleted +func (m *ApplicationResourceDeleteRequest) GetForce() bool { + if m != nil && m.Force != nil { + return *m.Force } return false } -func (m *ApplicationResourceDeleteRequest) GetGracePeriod() int64 { - if m != nil && m.GracePeriod != nil { - return *m.GracePeriod - } - return 0 -} - type ApplicationResourceResponse struct { Manifest string `protobuf:"bytes,1,req,name=manifest" json:"manifest"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -962,7 +954,7 @@ func (m *ApplicationResourceResponse) Reset() { *m = ApplicationResource func (m *ApplicationResourceResponse) String() string { return proto.CompactTextString(m) } func (*ApplicationResourceResponse) ProtoMessage() {} func (*ApplicationResourceResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_application_718661e6808263d4, []int{14} + return fileDescriptor_application_1f706f7a3fcdb3d9, []int{14} } func (m *ApplicationResourceResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1016,7 +1008,7 @@ func (m *ApplicationPodLogsQuery) Reset() { *m = ApplicationPodLogsQuery func (m *ApplicationPodLogsQuery) String() string { return proto.CompactTextString(m) } func (*ApplicationPodLogsQuery) ProtoMessage() {} func (*ApplicationPodLogsQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_application_718661e6808263d4, []int{15} + return fileDescriptor_application_1f706f7a3fcdb3d9, []int{15} } func (m *ApplicationPodLogsQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1113,7 +1105,7 @@ func (m *LogEntry) Reset() { *m = LogEntry{} } func (m *LogEntry) String() string { return proto.CompactTextString(m) } func (*LogEntry) ProtoMessage() {} func (*LogEntry) Descriptor() ([]byte, []int) { - return fileDescriptor_application_718661e6808263d4, []int{16} + return fileDescriptor_application_1f706f7a3fcdb3d9, []int{16} } func (m *LogEntry) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1167,7 +1159,7 @@ func (m *OperationTerminateRequest) Reset() { *m = OperationTerminateReq func (m *OperationTerminateRequest) String() string { return proto.CompactTextString(m) } func (*OperationTerminateRequest) ProtoMessage() {} func (*OperationTerminateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_application_718661e6808263d4, []int{17} + return fileDescriptor_application_1f706f7a3fcdb3d9, []int{17} } func (m *OperationTerminateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1213,7 +1205,7 @@ func (m *OperationTerminateResponse) Reset() { *m = OperationTerminateRe func (m *OperationTerminateResponse) String() string { return proto.CompactTextString(m) } func (*OperationTerminateResponse) ProtoMessage() {} func (*OperationTerminateResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_application_718661e6808263d4, []int{18} + return fileDescriptor_application_1f706f7a3fcdb3d9, []int{18} } func (m *OperationTerminateResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2529,21 +2521,16 @@ func (m *ApplicationResourceDeleteRequest) MarshalTo(dAtA []byte) (int, error) { i++ i = encodeVarintApplication(dAtA, i, uint64(len(m.Kind))) i += copy(dAtA[i:], m.Kind) - if m.ForceDeleted != nil { + if m.Force != nil { dAtA[i] = 0x38 i++ - if *m.ForceDeleted { + if *m.Force { dAtA[i] = 1 } else { dAtA[i] = 0 } i++ } - if m.GracePeriod != nil { - dAtA[i] = 0x40 - i++ - i = encodeVarintApplication(dAtA, i, uint64(*m.GracePeriod)) - } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) } @@ -2974,12 +2961,9 @@ func (m *ApplicationResourceDeleteRequest) Size() (n int) { n += 1 + l + sovApplication(uint64(l)) l = len(m.Kind) n += 1 + l + sovApplication(uint64(l)) - if m.ForceDeleted != nil { + if m.Force != nil { n += 2 } - if m.GracePeriod != nil { - n += 1 + sovApplication(uint64(*m.GracePeriod)) - } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -5067,7 +5051,7 @@ func (m *ApplicationResourceDeleteRequest) Unmarshal(dAtA []byte) error { hasFields[0] |= uint64(0x00000020) case 7: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ForceDeleted", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Force", wireType) } var v int for shift := uint(0); ; shift += 7 { @@ -5085,27 +5069,7 @@ func (m *ApplicationResourceDeleteRequest) Unmarshal(dAtA []byte) error { } } b := bool(v != 0) - m.ForceDeleted = &b - case 8: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field GracePeriod", wireType) - } - var v int64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowApplication - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= (int64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - m.GracePeriod = &v + m.Force = &b default: iNdEx = preIndex skippy, err := skipApplication(dAtA[iNdEx:]) @@ -5882,113 +5846,112 @@ var ( ) func init() { - proto.RegisterFile("server/application/application.proto", fileDescriptor_application_718661e6808263d4) + proto.RegisterFile("server/application/application.proto", fileDescriptor_application_1f706f7a3fcdb3d9) } -var fileDescriptor_application_718661e6808263d4 = []byte{ - // 1653 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0xcd, 0x6f, 0x14, 0x47, - 0x16, 0xdf, 0x9a, 0xb1, 0x3d, 0x33, 0x65, 0x6b, 0xc5, 0xd6, 0x82, 0xb7, 0xb7, 0x31, 0xf6, 0xa8, - 0x30, 0x66, 0x30, 0xeb, 0x6e, 0x6c, 0xa1, 0x5d, 0x64, 0xb1, 0x62, 0xf1, 0xe2, 0x35, 0x46, 0x06, - 0xbc, 0x63, 0x50, 0xa4, 0x5c, 0xa2, 0xa2, 0xbb, 0xdc, 0xee, 0x78, 0xa6, 0xab, 0x53, 0xdd, 0x33, - 0xd1, 0x04, 0x71, 0x08, 0x8a, 0x72, 0x8a, 0x82, 0xa2, 0xe4, 0x90, 0x5b, 0x22, 0xce, 0xdc, 0x72, - 0xcb, 0x21, 0xb7, 0x48, 0x9c, 0xa2, 0x48, 0xe1, 0x8c, 0x90, 0x95, 0x3f, 0x24, 0xaa, 0xea, 0xaf, - 0x6a, 0x7b, 0xa6, 0x07, 0xc3, 0xe4, 0x90, 0x5b, 0xf7, 0xab, 0x57, 0xef, 0xfd, 0xde, 0x67, 0xbf, - 0xd7, 0x70, 0x3e, 0xa0, 0xbc, 0x4b, 0xb9, 0x49, 0x7c, 0xbf, 0xe5, 0x5a, 0x24, 0x74, 0x99, 0xa7, - 0x3e, 0x1b, 0x3e, 0x67, 0x21, 0x43, 0x93, 0x0a, 0x49, 0x3f, 0xe9, 0x30, 0x87, 0x49, 0xba, 0x29, - 0x9e, 0x22, 0x16, 0x7d, 0xc6, 0x61, 0xcc, 0x69, 0x51, 0x93, 0xf8, 0xae, 0x49, 0x3c, 0x8f, 0x85, - 0x92, 0x39, 0x88, 0x4f, 0xf1, 0xfe, 0x95, 0xc0, 0x70, 0x99, 0x3c, 0xb5, 0x18, 0xa7, 0x66, 0x77, - 0xd9, 0x74, 0xa8, 0x47, 0x39, 0x09, 0xa9, 0x1d, 0xf3, 0x5c, 0xce, 0x78, 0xda, 0xc4, 0xda, 0x73, - 0x3d, 0xca, 0x7b, 0xa6, 0xbf, 0xef, 0x08, 0x42, 0x60, 0xb6, 0x69, 0x48, 0xfa, 0xdd, 0xda, 0x74, - 0xdc, 0x70, 0xaf, 0xf3, 0xc0, 0xb0, 0x58, 0xdb, 0x24, 0x5c, 0x02, 0x7b, 0x5f, 0x3e, 0x2c, 0x59, - 0x76, 0x76, 0x5b, 0x35, 0xaf, 0xbb, 0x4c, 0x5a, 0xfe, 0x1e, 0x39, 0x2a, 0x6a, 0xad, 0x48, 0x14, - 0xa7, 0x3e, 0x8b, 0x7d, 0x25, 0x1f, 0xdd, 0x90, 0xf1, 0x9e, 0xf2, 0x18, 0xcb, 0xb8, 0x5e, 0x24, - 0xc3, 0x62, 0x5e, 0xc8, 0x59, 0xab, 0x45, 0xb9, 0x29, 0x44, 0xb9, 0x16, 0x0d, 0x8e, 0x3a, 0x1b, - 0x7b, 0xf0, 0xc4, 0xf5, 0x8c, 0xf8, 0xff, 0x0e, 0xe5, 0x3d, 0x84, 0xe0, 0x98, 0x47, 0xda, 0x54, - 0x03, 0x75, 0xd0, 0xa8, 0x35, 0xe5, 0x33, 0x9a, 0x85, 0x15, 0x4e, 0x77, 0x39, 0x0d, 0xf6, 0xb4, - 0x52, 0x1d, 0x34, 0xaa, 0x6b, 0x63, 0xcf, 0x5f, 0xce, 0xfd, 0xa9, 0x99, 0x10, 0xd1, 0x02, 0xac, - 0x08, 0xed, 0xd4, 0x0a, 0xb5, 0x72, 0xbd, 0xdc, 0xa8, 0xad, 0x4d, 0x1d, 0xbc, 0x9c, 0xab, 0x6e, - 0x47, 0xa4, 0xa0, 0x99, 0x1c, 0xe2, 0xef, 0x01, 0x9c, 0x55, 0x14, 0x36, 0x69, 0xc0, 0x3a, 0xdc, - 0xa2, 0xeb, 0x5d, 0xea, 0x85, 0xc1, 0x61, 0xf5, 0xa5, 0x54, 0xfd, 0x0a, 0xfc, 0x0b, 0x8f, 0x59, - 0xef, 0x90, 0x36, 0x0d, 0x7c, 0x62, 0x51, 0xad, 0x24, 0x18, 0x62, 0x20, 0x47, 0x8f, 0x51, 0x03, - 0x4e, 0xa9, 0x44, 0xad, 0xac, 0xb0, 0xe7, 0x4e, 0xd0, 0x02, 0x9c, 0x4c, 0xde, 0xef, 0x6f, 0xde, - 0xd0, 0xc6, 0x14, 0x46, 0xf5, 0x00, 0x6f, 0x43, 0x4d, 0xc1, 0x7e, 0x9b, 0x78, 0xee, 0x2e, 0x0d, - 0xc2, 0xc1, 0xa8, 0xeb, 0xb0, 0xca, 0x69, 0xd7, 0x0d, 0x5c, 0xe6, 0x49, 0xaf, 0x25, 0x42, 0x53, - 0x2a, 0x3e, 0x05, 0xff, 0x9a, 0xf7, 0x86, 0xcf, 0xbc, 0x80, 0xe2, 0xa7, 0x20, 0xa7, 0xe9, 0xbf, - 0x9c, 0x92, 0x90, 0x36, 0xe9, 0x07, 0x1d, 0x1a, 0x84, 0xc8, 0x83, 0x6a, 0x85, 0x48, 0x85, 0x93, - 0x2b, 0xff, 0x33, 0xb2, 0x5c, 0x30, 0x92, 0x5c, 0x90, 0x0f, 0xef, 0x59, 0xb6, 0xe1, 0xef, 0x3b, - 0x86, 0x48, 0x4d, 0x43, 0x4d, 0x80, 0x24, 0x35, 0x0d, 0x45, 0x53, 0x62, 0xb5, 0xc2, 0x87, 0xa6, - 0xe1, 0x44, 0xc7, 0x0f, 0x28, 0x0f, 0xa3, 0xc8, 0x37, 0xe3, 0x37, 0xfc, 0x49, 0x1e, 0xe4, 0x7d, - 0xdf, 0x56, 0x40, 0xee, 0xfd, 0x8e, 0x20, 0x73, 0xf0, 0xf0, 0xcd, 0x1c, 0x8a, 0x1b, 0xb4, 0x45, - 0x33, 0x14, 0xfd, 0x82, 0xa2, 0xc1, 0x8a, 0x45, 0x02, 0x8b, 0xd8, 0x34, 0xb6, 0x27, 0x79, 0xc5, - 0x4f, 0xcb, 0x70, 0x5a, 0x11, 0xb5, 0xd3, 0xf3, 0xac, 0x22, 0x41, 0x43, 0xa3, 0x8b, 0x66, 0xe0, - 0x84, 0xcd, 0x7b, 0xcd, 0x8e, 0xa7, 0x95, 0x95, 0x9a, 0x89, 0x69, 0x48, 0x87, 0xe3, 0x3e, 0xef, - 0x78, 0x54, 0x1b, 0x53, 0x0e, 0x23, 0x12, 0xb2, 0x60, 0x35, 0x08, 0x45, 0xbb, 0x70, 0x7a, 0xda, - 0x78, 0x1d, 0x34, 0x26, 0x57, 0x36, 0xde, 0xc2, 0x77, 0xc2, 0x92, 0x9d, 0x58, 0x5c, 0x33, 0x15, - 0x8c, 0xfe, 0x0d, 0x6b, 0x3e, 0xe1, 0xa4, 0x4d, 0x43, 0xca, 0xb5, 0x09, 0xa9, 0x65, 0x2e, 0x27, - 0x60, 0x3b, 0x39, 0xbd, 0xdb, 0xa5, 0x9c, 0xbb, 0x36, 0x0d, 0x9a, 0xd9, 0x0d, 0x14, 0xc2, 0x5a, - 0x52, 0x1c, 0x81, 0x56, 0xa9, 0x97, 0x1b, 0x93, 0x2b, 0xdb, 0x6f, 0x09, 0xf2, 0xae, 0x2f, 0x7a, - 0xa4, 0xd2, 0x17, 0x62, 0xaf, 0x64, 0x8a, 0xf0, 0x2d, 0x88, 0x8e, 0xc2, 0x42, 0x97, 0x61, 0x8d, - 0x25, 0x2f, 0x1a, 0x90, 0x58, 0xa6, 0xfb, 0x9b, 0xd2, 0xcc, 0x18, 0x31, 0x85, 0xb5, 0x94, 0x8e, - 0x34, 0x35, 0xc4, 0xb1, 0xde, 0x28, 0xd0, 0x3a, 0x1c, 0xef, 0x92, 0x56, 0x87, 0xe6, 0xa2, 0x1c, - 0x91, 0x10, 0x86, 0x35, 0x8b, 0xb5, 0x7d, 0xe6, 0x51, 0x2f, 0x94, 0x51, 0x4e, 0xce, 0x33, 0x32, - 0xfe, 0x1a, 0xc0, 0x99, 0x23, 0x85, 0xb2, 0xe3, 0xd3, 0xc2, 0xec, 0xb2, 0xe1, 0x58, 0xe0, 0x53, - 0x4b, 0x36, 0xb9, 0xc9, 0x95, 0x5b, 0xa3, 0xa9, 0x1c, 0xa1, 0x34, 0x31, 0x4d, 0x48, 0xc7, 0x9f, - 0x02, 0xa8, 0xab, 0x95, 0xc5, 0x5a, 0xad, 0x07, 0xc4, 0xda, 0x2f, 0x02, 0xa6, 0xc3, 0x92, 0x6b, - 0x4b, 0x58, 0xe5, 0x35, 0x28, 0x44, 0x1d, 0xbc, 0x9c, 0x2b, 0x6d, 0xde, 0x68, 0x96, 0x5c, 0xfb, - 0xcd, 0x13, 0x1e, 0xbf, 0x38, 0x04, 0x24, 0x8e, 0x77, 0x11, 0x10, 0x0c, 0x6b, 0x5e, 0xdf, 0x6f, - 0x41, 0x46, 0x3e, 0xc6, 0x37, 0x60, 0x16, 0x56, 0xba, 0x94, 0xcb, 0x62, 0x56, 0xfb, 0x7f, 0x42, - 0x14, 0xe0, 0x1d, 0xce, 0x3a, 0xbe, 0x36, 0xae, 0x9c, 0x46, 0x24, 0x91, 0x3a, 0xfb, 0xae, 0x67, - 0x6b, 0x13, 0x6a, 0xea, 0x08, 0x0a, 0x7e, 0x56, 0x82, 0xf5, 0x3e, 0x66, 0x0d, 0xef, 0x52, 0x7f, - 0x00, 0xe3, 0x84, 0xfe, 0x5d, 0x96, 0x5a, 0x63, 0x6b, 0x95, 0x34, 0xac, 0xa0, 0x99, 0x3b, 0x11, - 0x1f, 0x58, 0x87, 0x13, 0x8b, 0x6e, 0x53, 0xee, 0x32, 0x5b, 0xab, 0xd6, 0x41, 0xa3, 0x1c, 0x33, - 0xaa, 0x07, 0xf8, 0x1a, 0x3c, 0xdd, 0x37, 0x09, 0xa2, 0xcf, 0xa2, 0xe8, 0xb8, 0xed, 0xf8, 0xa3, - 0x9b, 0x2b, 0xd3, 0x94, 0x8a, 0x7f, 0x2c, 0xc1, 0xbf, 0x29, 0x12, 0xb6, 0x99, 0xbd, 0xc5, 0x9c, - 0x82, 0xb9, 0xe2, 0x75, 0xdc, 0xac, 0xc1, 0x8a, 0xcf, 0xec, 0xcc, 0xc3, 0xcd, 0xe4, 0x35, 0x2a, - 0x7e, 0x2f, 0x24, 0x62, 0x7a, 0xcc, 0x39, 0x36, 0x23, 0x0b, 0x27, 0x05, 0xae, 0x67, 0xd1, 0x1d, - 0x6a, 0x31, 0xcf, 0x0e, 0xa4, 0x87, 0xcb, 0x49, 0x90, 0xd4, 0x13, 0x74, 0x13, 0xd6, 0xe4, 0xfb, - 0x3d, 0xb7, 0x4d, 0xe3, 0x76, 0xbc, 0x68, 0x44, 0x63, 0xaa, 0xa1, 0x8e, 0xa9, 0x59, 0xb9, 0x8b, - 0x31, 0xd5, 0xe8, 0x2e, 0x1b, 0xe2, 0x46, 0x33, 0xbb, 0x2c, 0x70, 0x85, 0xc4, 0x6d, 0x6d, 0xb9, - 0x9e, 0xec, 0xcc, 0x99, 0xc2, 0x8c, 0x2c, 0x4a, 0x75, 0x97, 0xb5, 0x5a, 0xec, 0x43, 0xad, 0x5a, - 0x2f, 0x65, 0xa5, 0x1a, 0xd1, 0xf0, 0x47, 0xb0, 0xba, 0xc5, 0x9c, 0x75, 0x2f, 0xe4, 0x3d, 0x91, - 0x3c, 0xc2, 0x1c, 0xd1, 0xe0, 0x54, 0xa7, 0x27, 0x44, 0x74, 0x07, 0xd6, 0x42, 0xb7, 0x4d, 0x77, - 0x42, 0xd2, 0xf6, 0xe3, 0x76, 0x75, 0x0c, 0xdc, 0x29, 0xb2, 0x44, 0x04, 0x36, 0xe1, 0xdf, 0xd3, - 0xef, 0xc0, 0x3d, 0xca, 0xdb, 0xae, 0x47, 0x0a, 0x6b, 0x05, 0xcf, 0x40, 0xbd, 0xdf, 0x85, 0x28, - 0x69, 0x56, 0x7e, 0x3a, 0x05, 0x91, 0xda, 0x02, 0xa3, 0x59, 0x18, 0x3d, 0x01, 0x70, 0x6c, 0xcb, - 0x0d, 0x42, 0x74, 0x26, 0xd7, 0x35, 0x0f, 0x0f, 0xc3, 0xfa, 0x88, 0x3a, 0xaf, 0x50, 0x85, 0x67, - 0x1e, 0xff, 0xf2, 0xeb, 0x97, 0xa5, 0x69, 0x74, 0x52, 0xae, 0x26, 0xdd, 0x65, 0x75, 0x1e, 0x0f, - 0xd0, 0x67, 0x00, 0x22, 0xc1, 0x96, 0x9f, 0x89, 0xd1, 0xc5, 0x41, 0xf8, 0xfa, 0xcc, 0xce, 0xfa, - 0x19, 0xc5, 0xf1, 0x86, 0xd8, 0x7d, 0x84, 0x9b, 0x25, 0x83, 0x04, 0xb0, 0x28, 0x01, 0xcc, 0x23, - 0xdc, 0x0f, 0x80, 0xf9, 0x50, 0x78, 0xf3, 0x91, 0x49, 0x23, 0xbd, 0xdf, 0x00, 0x38, 0xfe, 0x0e, - 0x09, 0xad, 0xbd, 0x61, 0x1e, 0xda, 0x1e, 0x8d, 0x87, 0xa4, 0x2e, 0x09, 0x15, 0x9f, 0x95, 0x30, - 0xcf, 0xa0, 0xd3, 0x09, 0xcc, 0x20, 0xe4, 0x94, 0xb4, 0x73, 0x68, 0x2f, 0x01, 0xf4, 0x14, 0xc0, - 0x89, 0x68, 0x34, 0x46, 0xe7, 0x06, 0x41, 0xcc, 0x8d, 0xce, 0xfa, 0x88, 0x06, 0x50, 0x7c, 0x41, - 0x02, 0x3c, 0x8b, 0xfb, 0x06, 0x72, 0x35, 0x37, 0x3d, 0x7f, 0x01, 0x60, 0x79, 0x83, 0x0e, 0x4d, - 0xb3, 0x51, 0x21, 0x3b, 0xe2, 0xba, 0x3e, 0x11, 0x46, 0x8f, 0x01, 0x9c, 0xda, 0xa0, 0x61, 0xb2, - 0xc0, 0x04, 0x83, 0xdd, 0x97, 0xdb, 0x71, 0xf4, 0x19, 0x43, 0x59, 0x41, 0x93, 0xa3, 0x74, 0x69, - 0x59, 0x92, 0xaa, 0xcf, 0xa3, 0x73, 0x45, 0xc9, 0xd5, 0x4e, 0x75, 0xfe, 0x00, 0xe0, 0x44, 0x34, - 0x0a, 0x0d, 0x56, 0x9f, 0xdb, 0x29, 0x46, 0xe6, 0xa3, 0x75, 0x09, 0xf4, 0x9a, 0x7e, 0xa9, 0x3f, - 0x50, 0xf5, 0xbe, 0xe8, 0x54, 0x36, 0x09, 0x89, 0x21, 0xd1, 0xe7, 0x23, 0xfb, 0x1d, 0x80, 0x30, - 0x9b, 0xe5, 0xd0, 0x85, 0x62, 0x23, 0x94, 0x79, 0x4f, 0x1f, 0xe1, 0x34, 0x87, 0x0d, 0x69, 0x4c, - 0x43, 0xaf, 0x17, 0x79, 0x5d, 0xcc, 0x7a, 0xab, 0x72, 0xe2, 0x43, 0x5d, 0x38, 0x11, 0x7d, 0x95, - 0x07, 0x7b, 0x3d, 0x37, 0x9d, 0xe8, 0xf5, 0x82, 0xfe, 0x13, 0x05, 0x3e, 0xce, 0xb9, 0xc5, 0xc2, - 0x9c, 0xfb, 0x16, 0xc0, 0x31, 0x31, 0xe2, 0xa3, 0xb3, 0x83, 0xe4, 0x29, 0xfb, 0xd6, 0xc8, 0x42, - 0x7d, 0x51, 0x42, 0x3b, 0x87, 0x8b, 0xbd, 0xd3, 0xf3, 0xac, 0x55, 0xb0, 0x88, 0x5e, 0x01, 0x78, - 0xe2, 0x36, 0xf1, 0x88, 0x43, 0xed, 0xa4, 0xb7, 0x06, 0xe8, 0x5a, 0x21, 0x92, 0xec, 0x27, 0x8b, - 0x91, 0xfc, 0x64, 0x31, 0xd2, 0xbb, 0x51, 0xd1, 0x6c, 0x1e, 0x5b, 0xc0, 0x61, 0x0c, 0xa9, 0xa3, - 0xff, 0x23, 0xad, 0x59, 0x45, 0x57, 0x86, 0x26, 0xee, 0x9d, 0xa4, 0xd8, 0x84, 0xa0, 0xa5, 0x74, - 0x7b, 0x42, 0x2f, 0x00, 0x9c, 0x4a, 0xe4, 0xde, 0xe3, 0x94, 0xbe, 0xbd, 0x79, 0xeb, 0x6f, 0x2c, - 0x40, 0xe8, 0x4f, 0x4d, 0xbb, 0x2a, 0x4d, 0xfb, 0x27, 0xba, 0xfc, 0x9a, 0xa6, 0x25, 0x26, 0x2d, - 0x85, 0xc2, 0x8a, 0x67, 0x00, 0x56, 0x93, 0xdd, 0x05, 0x9d, 0x1f, 0x98, 0xb0, 0xf9, 0xed, 0x66, - 0x64, 0x49, 0x66, 0x4a, 0xec, 0x17, 0xf0, 0x7c, 0x51, 0x92, 0xf1, 0x58, 0xb9, 0x48, 0xb4, 0xaf, - 0x00, 0x44, 0xe9, 0xa0, 0x92, 0x8e, 0x2e, 0x68, 0x21, 0xa7, 0x6a, 0xe0, 0x0c, 0xa4, 0x9f, 0x1f, - 0xca, 0x97, 0xef, 0xc8, 0x8b, 0x85, 0x1d, 0x99, 0xa5, 0xfa, 0x3f, 0x07, 0x70, 0x72, 0x83, 0xa6, - 0xf3, 0x47, 0x81, 0x23, 0xf3, 0xdb, 0x99, 0xde, 0x18, 0xce, 0x18, 0x23, 0xfa, 0x87, 0x44, 0xb4, - 0x80, 0x8a, 0x5d, 0x95, 0x00, 0x78, 0x02, 0xe0, 0x9f, 0x93, 0x66, 0x14, 0x93, 0x96, 0x86, 0xa9, - 0x3a, 0x6e, 0xf3, 0x8a, 0x11, 0x2d, 0xbe, 0x1e, 0xa2, 0x8f, 0x01, 0xac, 0xc4, 0x4b, 0x05, 0x9a, - 0x1f, 0x24, 0x5b, 0xdd, 0x3a, 0xf4, 0x53, 0x39, 0xae, 0x64, 0xa8, 0xc6, 0xff, 0x92, 0x6a, 0x97, - 0x91, 0x59, 0xa4, 0xd6, 0x67, 0x76, 0x60, 0x3e, 0x8c, 0xb7, 0x8d, 0x47, 0x66, 0x8b, 0x39, 0xc1, - 0x25, 0xb0, 0x76, 0xf5, 0xf9, 0xc1, 0x2c, 0xf8, 0xf9, 0x60, 0x16, 0xbc, 0x3a, 0x98, 0x05, 0xef, - 0x1a, 0x45, 0xff, 0x80, 0x8f, 0xfe, 0x6f, 0xff, 0x2d, 0x00, 0x00, 0xff, 0xff, 0xd5, 0x51, 0xd2, - 0x9e, 0x84, 0x17, 0x00, 0x00, +var fileDescriptor_application_1f706f7a3fcdb3d9 = []byte{ + // 1635 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0xcd, 0x6f, 0xdc, 0xc6, + 0x15, 0xef, 0xec, 0x4a, 0x5a, 0xed, 0x93, 0x50, 0xb8, 0x53, 0x5b, 0x65, 0x69, 0x59, 0x5a, 0xd0, + 0xb2, 0xbc, 0x96, 0x2b, 0xd2, 0x12, 0x8c, 0xd6, 0x10, 0x5c, 0xb8, 0x56, 0xad, 0xca, 0x32, 0x64, + 0x5b, 0x5d, 0xd9, 0x28, 0xd0, 0x4b, 0x31, 0x26, 0x47, 0x2b, 0x56, 0xbb, 0x1c, 0x76, 0xc8, 0xdd, + 0x62, 0x6b, 0xf8, 0x50, 0x23, 0xc8, 0x29, 0x88, 0x11, 0x24, 0x87, 0xdc, 0x12, 0xf8, 0x9c, 0x5b, + 0x6e, 0x39, 0xe4, 0x16, 0xc0, 0xa7, 0x20, 0x40, 0x7c, 0x36, 0x0c, 0x21, 0x7f, 0x43, 0xce, 0xc1, + 0x0c, 0xbf, 0x86, 0xd2, 0x2e, 0xd7, 0xb2, 0x37, 0x87, 0xdc, 0xc8, 0x37, 0x6f, 0xde, 0xfb, 0xbd, + 0x4f, 0xbe, 0x47, 0x58, 0x08, 0x28, 0xef, 0x52, 0x6e, 0x11, 0xdf, 0x6f, 0xb9, 0x36, 0x09, 0x5d, + 0xe6, 0xa9, 0xcf, 0xa6, 0xcf, 0x59, 0xc8, 0xf0, 0x94, 0x42, 0xd2, 0x4f, 0x37, 0x59, 0x93, 0x49, + 0xba, 0x25, 0x9e, 0x22, 0x16, 0x7d, 0xb6, 0xc9, 0x58, 0xb3, 0x45, 0x2d, 0xe2, 0xbb, 0x16, 0xf1, + 0x3c, 0x16, 0x4a, 0xe6, 0x20, 0x3e, 0x35, 0x0e, 0xae, 0x05, 0xa6, 0xcb, 0xe4, 0xa9, 0xcd, 0x38, + 0xb5, 0xba, 0x2b, 0x56, 0x93, 0x7a, 0x94, 0x93, 0x90, 0x3a, 0x31, 0xcf, 0xd5, 0x8c, 0xa7, 0x4d, + 0xec, 0x7d, 0xd7, 0xa3, 0xbc, 0x67, 0xf9, 0x07, 0x4d, 0x41, 0x08, 0xac, 0x36, 0x0d, 0x49, 0xbf, + 0x5b, 0x5b, 0x4d, 0x37, 0xdc, 0xef, 0x3c, 0x32, 0x6d, 0xd6, 0xb6, 0x08, 0x97, 0xc0, 0xfe, 0x2d, + 0x1f, 0x96, 0x6d, 0x27, 0xbb, 0xad, 0x9a, 0xd7, 0x5d, 0x21, 0x2d, 0x7f, 0x9f, 0x1c, 0x17, 0xb5, + 0x5e, 0x24, 0x8a, 0x53, 0x9f, 0xc5, 0xbe, 0x92, 0x8f, 0x6e, 0xc8, 0x78, 0x4f, 0x79, 0x8c, 0x65, + 0xdc, 0x2c, 0x92, 0x61, 0x33, 0x2f, 0xe4, 0xac, 0xd5, 0xa2, 0xdc, 0x12, 0xa2, 0x5c, 0x9b, 0x06, + 0xc7, 0x9d, 0x6d, 0x78, 0x70, 0xea, 0x66, 0x46, 0xfc, 0x7b, 0x87, 0xf2, 0x1e, 0xc6, 0x30, 0xe6, + 0x91, 0x36, 0xd5, 0x50, 0x0d, 0xd5, 0xab, 0x0d, 0xf9, 0x8c, 0xe7, 0xa0, 0xc2, 0xe9, 0x1e, 0xa7, + 0xc1, 0xbe, 0x56, 0xaa, 0xa1, 0xfa, 0xe4, 0xfa, 0xd8, 0x8b, 0x57, 0xf3, 0xbf, 0x6a, 0x24, 0x44, + 0xbc, 0x08, 0x15, 0xa1, 0x9d, 0xda, 0xa1, 0x56, 0xae, 0x95, 0xeb, 0xd5, 0xf5, 0xe9, 0xc3, 0x57, + 0xf3, 0x93, 0x3b, 0x11, 0x29, 0x68, 0x24, 0x87, 0xc6, 0x57, 0x08, 0xe6, 0x14, 0x85, 0x0d, 0x1a, + 0xb0, 0x0e, 0xb7, 0xe9, 0x46, 0x97, 0x7a, 0x61, 0x70, 0x54, 0x7d, 0x29, 0x55, 0xbf, 0x0a, 0xbf, + 0xe1, 0x31, 0xeb, 0x3d, 0xd2, 0xa6, 0x81, 0x4f, 0x6c, 0xaa, 0x95, 0x04, 0x43, 0x0c, 0xe4, 0xf8, + 0x31, 0xae, 0xc3, 0xb4, 0x4a, 0xd4, 0xca, 0x0a, 0x7b, 0xee, 0x04, 0x2f, 0xc2, 0x54, 0xf2, 0xfe, + 0x70, 0xeb, 0x96, 0x36, 0xa6, 0x30, 0xaa, 0x07, 0xc6, 0x0e, 0x68, 0x0a, 0xf6, 0xbb, 0xc4, 0x73, + 0xf7, 0x68, 0x10, 0x0e, 0x46, 0x5d, 0x83, 0x49, 0x4e, 0xbb, 0x6e, 0xe0, 0x32, 0x4f, 0x7a, 0x2d, + 0x11, 0x9a, 0x52, 0x8d, 0x33, 0xf0, 0xdb, 0xbc, 0x37, 0x7c, 0xe6, 0x05, 0xd4, 0x78, 0x8e, 0x72, + 0x9a, 0xfe, 0xca, 0x29, 0x09, 0x69, 0x83, 0xfe, 0xa7, 0x43, 0x83, 0x10, 0x7b, 0xa0, 0x56, 0x88, + 0x54, 0x38, 0xb5, 0xfa, 0x37, 0x33, 0xcb, 0x05, 0x33, 0xc9, 0x05, 0xf9, 0xf0, 0x2f, 0xdb, 0x31, + 0xfd, 0x83, 0xa6, 0x29, 0x52, 0xd3, 0x54, 0x13, 0x20, 0x49, 0x4d, 0x53, 0xd1, 0x94, 0x58, 0xad, + 0xf0, 0xe1, 0x19, 0x98, 0xe8, 0xf8, 0x01, 0xe5, 0x61, 0x14, 0xf9, 0x46, 0xfc, 0x66, 0xbc, 0x97, + 0x07, 0xf9, 0xd0, 0x77, 0x14, 0x90, 0xfb, 0x3f, 0x23, 0xc8, 0x1c, 0x3c, 0xe3, 0x76, 0x0e, 0xc5, + 0x2d, 0xda, 0xa2, 0x19, 0x8a, 0x7e, 0x41, 0xd1, 0xa0, 0x62, 0x93, 0xc0, 0x26, 0x0e, 0x8d, 0xed, + 0x49, 0x5e, 0x8d, 0xe7, 0x65, 0x98, 0x51, 0x44, 0xed, 0xf6, 0x3c, 0xbb, 0x48, 0xd0, 0xd0, 0xe8, + 0xe2, 0x59, 0x98, 0x70, 0x78, 0xaf, 0xd1, 0xf1, 0xb4, 0xb2, 0x52, 0x33, 0x31, 0x0d, 0xeb, 0x30, + 0xee, 0xf3, 0x8e, 0x47, 0xb5, 0x31, 0xe5, 0x30, 0x22, 0x61, 0x1b, 0x26, 0x83, 0x50, 0xb4, 0x8b, + 0x66, 0x4f, 0x1b, 0xaf, 0xa1, 0xfa, 0xd4, 0xea, 0xe6, 0x3b, 0xf8, 0x4e, 0x58, 0xb2, 0x1b, 0x8b, + 0x6b, 0xa4, 0x82, 0xf1, 0x9f, 0xa1, 0xea, 0x13, 0x4e, 0xda, 0x34, 0xa4, 0x5c, 0x9b, 0x90, 0x5a, + 0xe6, 0x73, 0x02, 0x76, 0x92, 0xd3, 0xfb, 0x5d, 0xca, 0xb9, 0xeb, 0xd0, 0xa0, 0x91, 0xdd, 0xc0, + 0x21, 0x54, 0x93, 0xe2, 0x08, 0xb4, 0x4a, 0xad, 0x5c, 0x9f, 0x5a, 0xdd, 0x79, 0x47, 0x90, 0xf7, + 0x7d, 0xd1, 0x23, 0x95, 0xbe, 0x10, 0x7b, 0x25, 0x53, 0x64, 0xdc, 0x01, 0x7c, 0x1c, 0x16, 0xbe, + 0x0a, 0x55, 0x96, 0xbc, 0x68, 0x48, 0x62, 0x99, 0xe9, 0x6f, 0x4a, 0x23, 0x63, 0x34, 0x28, 0x54, + 0x53, 0x3a, 0xd6, 0xd4, 0x10, 0xc7, 0x7a, 0xa3, 0x40, 0xeb, 0x30, 0xde, 0x25, 0xad, 0x0e, 0xcd, + 0x45, 0x39, 0x22, 0x61, 0x03, 0xaa, 0x36, 0x6b, 0xfb, 0xcc, 0xa3, 0x5e, 0x28, 0xa3, 0x9c, 0x9c, + 0x67, 0x64, 0xe3, 0x53, 0x04, 0xb3, 0xc7, 0x0a, 0x65, 0xd7, 0xa7, 0x85, 0xd9, 0xe5, 0xc0, 0x58, + 0xe0, 0x53, 0x5b, 0x36, 0xb9, 0xa9, 0xd5, 0x3b, 0xa3, 0xa9, 0x1c, 0xa1, 0x34, 0x31, 0x4d, 0x48, + 0x37, 0xde, 0x47, 0xa0, 0xab, 0x95, 0xc5, 0x5a, 0xad, 0x47, 0xc4, 0x3e, 0x28, 0x02, 0xa6, 0x43, + 0xc9, 0x75, 0x24, 0xac, 0xf2, 0x3a, 0x08, 0x51, 0x87, 0xaf, 0xe6, 0x4b, 0x5b, 0xb7, 0x1a, 0x25, + 0xd7, 0x79, 0xfb, 0x84, 0x37, 0x5e, 0x1e, 0x01, 0x12, 0xc7, 0xbb, 0x08, 0x88, 0x01, 0x55, 0xaf, + 0xef, 0xb7, 0x20, 0x23, 0x9f, 0xe0, 0x1b, 0x30, 0x07, 0x95, 0x2e, 0xe5, 0xb2, 0x98, 0xd5, 0xfe, + 0x9f, 0x10, 0x05, 0xf8, 0x26, 0x67, 0x1d, 0x5f, 0x1b, 0x57, 0x4e, 0x23, 0x92, 0x48, 0x9d, 0x03, + 0xd7, 0x73, 0xb4, 0x09, 0x35, 0x75, 0x04, 0xc5, 0xf8, 0x11, 0x41, 0xad, 0x8f, 0x59, 0xc3, 0xbb, + 0xd4, 0x2f, 0xc0, 0x38, 0x71, 0x6b, 0x8f, 0x71, 0x9b, 0x6a, 0x95, 0x34, 0x9e, 0xa8, 0x11, 0x91, + 0x8c, 0x1b, 0x70, 0xb6, 0x6f, 0x38, 0xa3, 0x0f, 0x9c, 0xe8, 0x9d, 0xed, 0xf8, 0xf3, 0x99, 0x2b, + 0xb8, 0x94, 0x6a, 0x7c, 0x53, 0x82, 0xdf, 0x29, 0x12, 0x76, 0x98, 0xb3, 0xcd, 0x9a, 0x05, 0x13, + 0xc2, 0x9b, 0x38, 0x4c, 0x83, 0x8a, 0xcf, 0x9c, 0xcc, 0x57, 0x8d, 0xe4, 0x35, 0x2a, 0x63, 0x2f, + 0x24, 0x62, 0x0e, 0xcc, 0xb9, 0x28, 0x23, 0x0b, 0x77, 0x07, 0xae, 0x67, 0xd3, 0x5d, 0x6a, 0x33, + 0xcf, 0x09, 0xa4, 0xaf, 0xca, 0x89, 0xbb, 0xd5, 0x13, 0x7c, 0x1b, 0xaa, 0xf2, 0xfd, 0x81, 0xdb, + 0xa6, 0x71, 0x63, 0x5d, 0x32, 0xa3, 0x81, 0xd3, 0x54, 0x07, 0xce, 0xac, 0x70, 0xc5, 0xc0, 0x69, + 0x76, 0x57, 0x4c, 0x71, 0xa3, 0x91, 0x5d, 0x16, 0xb8, 0x42, 0xe2, 0xb6, 0xb6, 0x5d, 0x4f, 0xf6, + 0xd8, 0x4c, 0x61, 0x46, 0x16, 0x45, 0xb7, 0xc7, 0x5a, 0x2d, 0xf6, 0x5f, 0x6d, 0xb2, 0x56, 0xca, + 0x8a, 0x2e, 0xa2, 0x19, 0xff, 0x83, 0xc9, 0x6d, 0xd6, 0xdc, 0xf0, 0x42, 0xde, 0x13, 0x69, 0x20, + 0xcc, 0x11, 0xad, 0x4a, 0x75, 0x7a, 0x42, 0xc4, 0xf7, 0xa0, 0x1a, 0xba, 0x6d, 0xba, 0x1b, 0x92, + 0xb6, 0x1f, 0x37, 0x9e, 0x13, 0xe0, 0x4e, 0x91, 0x25, 0x22, 0x0c, 0x0b, 0x7e, 0x9f, 0x76, 0xf4, + 0x07, 0x94, 0xb7, 0x5d, 0x8f, 0x14, 0x66, 0xbd, 0x31, 0x0b, 0x7a, 0xbf, 0x0b, 0x51, 0xd2, 0xac, + 0x7e, 0x7b, 0x06, 0xb0, 0xda, 0xcc, 0xa2, 0xa9, 0x16, 0x3f, 0x43, 0x30, 0xb6, 0xed, 0x06, 0x21, + 0x3e, 0x97, 0xeb, 0x7f, 0x47, 0xc7, 0x5a, 0x7d, 0x44, 0x3d, 0x54, 0xa8, 0x32, 0x66, 0x9f, 0x7e, + 0xff, 0xc3, 0xc7, 0xa5, 0x19, 0x7c, 0x5a, 0x2e, 0x19, 0xdd, 0x15, 0x75, 0xb2, 0x0e, 0xf0, 0x07, + 0x08, 0xb0, 0x60, 0xcb, 0x4f, 0xb7, 0xf8, 0xf2, 0x20, 0x7c, 0x7d, 0xa6, 0x60, 0xfd, 0x9c, 0xe2, + 0x78, 0x53, 0x6c, 0x31, 0xc2, 0xcd, 0x92, 0x41, 0x02, 0x58, 0x92, 0x00, 0x16, 0xb0, 0xd1, 0x0f, + 0x80, 0xf5, 0x58, 0x78, 0xf3, 0x89, 0x45, 0x23, 0xbd, 0x9f, 0x21, 0x18, 0xff, 0x07, 0x09, 0xed, + 0xfd, 0x61, 0x1e, 0xda, 0x19, 0x8d, 0x87, 0xa4, 0x2e, 0x09, 0xd5, 0x38, 0x2f, 0x61, 0x9e, 0xc3, + 0x67, 0x13, 0x98, 0x41, 0xc8, 0x29, 0x69, 0xe7, 0xd0, 0x5e, 0x41, 0xf8, 0x39, 0x82, 0x89, 0x68, + 0xc8, 0xc5, 0x17, 0x06, 0x41, 0xcc, 0x0d, 0xc1, 0xfa, 0x88, 0x46, 0x49, 0xe3, 0x92, 0x04, 0x78, + 0xde, 0xe8, 0x1b, 0xc8, 0xb5, 0xdc, 0x1c, 0xfc, 0x11, 0x82, 0xf2, 0x26, 0x1d, 0x9a, 0x66, 0xa3, + 0x42, 0x76, 0xcc, 0x75, 0x7d, 0x22, 0x8c, 0x9f, 0x22, 0x98, 0xde, 0xa4, 0x61, 0xb2, 0x8a, 0x04, + 0x83, 0xdd, 0x97, 0xdb, 0x56, 0xf4, 0x59, 0x53, 0x59, 0x26, 0x93, 0xa3, 0x74, 0xfd, 0x58, 0x96, + 0xaa, 0x2f, 0xe2, 0x0b, 0x45, 0xc9, 0xd5, 0x4e, 0x75, 0x7e, 0x8d, 0x60, 0x22, 0x1a, 0x6a, 0x06, + 0xab, 0xcf, 0x6d, 0x07, 0x23, 0xf3, 0xd1, 0x86, 0x04, 0x7a, 0x43, 0xbf, 0xd2, 0x1f, 0xa8, 0x7a, + 0x5f, 0x74, 0x2a, 0x87, 0x84, 0xc4, 0x94, 0xe8, 0xf3, 0x91, 0xfd, 0x12, 0x01, 0x64, 0x53, 0x19, + 0xbe, 0x54, 0x6c, 0x84, 0x32, 0xb9, 0xe9, 0x23, 0x9c, 0xcb, 0x0c, 0x53, 0x1a, 0x53, 0xd7, 0x6b, + 0x45, 0x5e, 0x17, 0x53, 0xdb, 0x9a, 0x9c, 0xdd, 0x70, 0x17, 0x26, 0xa2, 0x39, 0x62, 0xb0, 0xd7, + 0x73, 0x73, 0x86, 0x5e, 0x2b, 0xe8, 0x3f, 0x51, 0xe0, 0xe3, 0x9c, 0x5b, 0x2a, 0xcc, 0xb9, 0xcf, + 0x11, 0x8c, 0x89, 0x61, 0x1d, 0x9f, 0x1f, 0x24, 0x4f, 0xd9, 0x9c, 0x46, 0x16, 0xea, 0xcb, 0x12, + 0xda, 0x05, 0xa3, 0xd8, 0x3b, 0x3d, 0xcf, 0x5e, 0x43, 0x4b, 0xf8, 0x35, 0x82, 0x53, 0x77, 0x89, + 0x47, 0x9a, 0xd4, 0x49, 0x7a, 0x6b, 0x80, 0x6f, 0x14, 0x22, 0xc9, 0x7e, 0x97, 0x98, 0xc9, 0xef, + 0x12, 0x33, 0xbd, 0x1b, 0x15, 0xcd, 0xd6, 0x89, 0x05, 0x1c, 0xc5, 0x90, 0x3a, 0xfa, 0x2f, 0xd2, + 0x9a, 0x35, 0x7c, 0x6d, 0x68, 0xe2, 0xde, 0x4b, 0x8a, 0x4d, 0x08, 0x5a, 0x4e, 0xf7, 0x20, 0xfc, + 0x12, 0xc1, 0x74, 0x22, 0xf7, 0x01, 0xa7, 0xf4, 0xdd, 0xcd, 0xdb, 0x78, 0x6b, 0x01, 0x42, 0x7f, + 0x6a, 0xda, 0x75, 0x69, 0xda, 0x1f, 0xf1, 0xd5, 0x37, 0x34, 0x2d, 0x31, 0x69, 0x39, 0x14, 0x56, + 0x7c, 0x81, 0x60, 0x32, 0xd9, 0x42, 0xf0, 0xc5, 0x81, 0x09, 0x9b, 0xdf, 0x53, 0x46, 0x96, 0x64, + 0x96, 0xc4, 0x7e, 0xc9, 0x58, 0x28, 0x4a, 0x32, 0x1e, 0x2b, 0x17, 0x89, 0xf6, 0x09, 0x02, 0x9c, + 0x0e, 0x2a, 0xe9, 0xe8, 0x82, 0x17, 0x73, 0xaa, 0x06, 0xce, 0x40, 0xfa, 0xc5, 0xa1, 0x7c, 0xf9, + 0x8e, 0xbc, 0x54, 0xd8, 0x91, 0x59, 0xaa, 0xff, 0x43, 0x04, 0x53, 0x9b, 0x34, 0x9d, 0x3f, 0x0a, + 0x1c, 0x99, 0xdf, 0xb3, 0xf4, 0xfa, 0x70, 0xc6, 0x18, 0xd1, 0x1f, 0x24, 0xa2, 0x45, 0x5c, 0xec, + 0xaa, 0x04, 0xc0, 0x33, 0x04, 0xbf, 0x4e, 0x9a, 0x51, 0x4c, 0x5a, 0x1e, 0xa6, 0xea, 0xa4, 0xcd, + 0x2b, 0x46, 0xb4, 0xf4, 0x66, 0x88, 0xfe, 0x8f, 0xa0, 0x12, 0x2f, 0x15, 0x78, 0x61, 0x90, 0x6c, + 0x75, 0xeb, 0xd0, 0xcf, 0xe4, 0xb8, 0x92, 0xa1, 0xda, 0xf8, 0x93, 0x54, 0xbb, 0x82, 0xad, 0x22, + 0xb5, 0x3e, 0x73, 0x02, 0xeb, 0x71, 0xbc, 0x6d, 0x3c, 0xb1, 0x5a, 0xac, 0x19, 0x5c, 0x41, 0xeb, + 0xd7, 0x5f, 0x1c, 0xce, 0xa1, 0xef, 0x0e, 0xe7, 0xd0, 0xeb, 0xc3, 0x39, 0xf4, 0x4f, 0xb3, 0xe8, + 0x6f, 0xee, 0xf1, 0x3f, 0xe7, 0x3f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x69, 0x57, 0x6d, 0xdd, 0x4e, + 0x17, 0x00, 0x00, } diff --git a/server/application/application.proto b/server/application/application.proto index f3c37a22f5..48f02a85d6 100644 --- a/server/application/application.proto +++ b/server/application/application.proto @@ -104,8 +104,7 @@ message ApplicationResourceDeleteRequest { required string version = 4 [(gogoproto.nullable) = false]; required string group = 5 [(gogoproto.nullable) = false]; required string kind = 6 [(gogoproto.nullable) = false]; - optional bool forceDeleted = 7 [(gogoproto.nullable) = true]; - optional int64 gracePeriod = 8 [(gogoproto.nullable) = true]; + optional bool force = 7 [(gogoproto.nullable) = true]; } diff --git a/server/cluster/cluster.pb.go b/server/cluster/cluster.pb.go index 3b955688ba..fa4c2ba9eb 100644 --- a/server/cluster/cluster.pb.go +++ b/server/cluster/cluster.pb.go @@ -45,7 +45,7 @@ func (m *ClusterQuery) Reset() { *m = ClusterQuery{} } func (m *ClusterQuery) String() string { return proto.CompactTextString(m) } func (*ClusterQuery) ProtoMessage() {} func (*ClusterQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_cluster_0875510a34378ea0, []int{0} + return fileDescriptor_cluster_bf8d7367dfc95a3e, []int{0} } func (m *ClusterQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -91,7 +91,7 @@ func (m *ClusterResponse) Reset() { *m = ClusterResponse{} } func (m *ClusterResponse) String() string { return proto.CompactTextString(m) } func (*ClusterResponse) ProtoMessage() {} func (*ClusterResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_cluster_0875510a34378ea0, []int{1} + return fileDescriptor_cluster_bf8d7367dfc95a3e, []int{1} } func (m *ClusterResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -132,7 +132,7 @@ func (m *ClusterCreateRequest) Reset() { *m = ClusterCreateRequest{} } func (m *ClusterCreateRequest) String() string { return proto.CompactTextString(m) } func (*ClusterCreateRequest) ProtoMessage() {} func (*ClusterCreateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_cluster_0875510a34378ea0, []int{2} + return fileDescriptor_cluster_bf8d7367dfc95a3e, []int{2} } func (m *ClusterCreateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -189,7 +189,7 @@ func (m *ClusterCreateFromKubeConfigRequest) Reset() { *m = ClusterCreat func (m *ClusterCreateFromKubeConfigRequest) String() string { return proto.CompactTextString(m) } func (*ClusterCreateFromKubeConfigRequest) ProtoMessage() {} func (*ClusterCreateFromKubeConfigRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_cluster_0875510a34378ea0, []int{3} + return fileDescriptor_cluster_bf8d7367dfc95a3e, []int{3} } func (m *ClusterCreateFromKubeConfigRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -257,7 +257,7 @@ func (m *ClusterUpdateRequest) Reset() { *m = ClusterUpdateRequest{} } func (m *ClusterUpdateRequest) String() string { return proto.CompactTextString(m) } func (*ClusterUpdateRequest) ProtoMessage() {} func (*ClusterUpdateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_cluster_0875510a34378ea0, []int{4} + return fileDescriptor_cluster_bf8d7367dfc95a3e, []int{4} } func (m *ClusterUpdateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1393,10 +1393,10 @@ var ( ) func init() { - proto.RegisterFile("server/cluster/cluster.proto", fileDescriptor_cluster_0875510a34378ea0) + proto.RegisterFile("server/cluster/cluster.proto", fileDescriptor_cluster_bf8d7367dfc95a3e) } -var fileDescriptor_cluster_0875510a34378ea0 = []byte{ +var fileDescriptor_cluster_bf8d7367dfc95a3e = []byte{ // 564 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x95, 0xcd, 0x6e, 0x13, 0x31, 0x10, 0xc7, 0xe5, 0xb6, 0xda, 0x12, 0x83, 0xf8, 0xb0, 0x0a, 0x5a, 0xd2, 0x10, 0xa5, 0x3e, 0x54, diff --git a/server/project/project.pb.go b/server/project/project.pb.go index 492ce08be4..cb59249682 100644 --- a/server/project/project.pb.go +++ b/server/project/project.pb.go @@ -46,7 +46,7 @@ func (m *ProjectCreateRequest) Reset() { *m = ProjectCreateRequest{} } func (m *ProjectCreateRequest) String() string { return proto.CompactTextString(m) } func (*ProjectCreateRequest) ProtoMessage() {} func (*ProjectCreateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_project_082822b5d17b8c4e, []int{0} + return fileDescriptor_project_8d94583ca767d5b3, []int{0} } func (m *ProjectCreateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -96,7 +96,7 @@ func (m *ProjectTokenDeleteRequest) Reset() { *m = ProjectTokenDeleteReq func (m *ProjectTokenDeleteRequest) String() string { return proto.CompactTextString(m) } func (*ProjectTokenDeleteRequest) ProtoMessage() {} func (*ProjectTokenDeleteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_project_082822b5d17b8c4e, []int{1} + return fileDescriptor_project_8d94583ca767d5b3, []int{1} } func (m *ProjectTokenDeleteRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -162,7 +162,7 @@ func (m *ProjectTokenCreateRequest) Reset() { *m = ProjectTokenCreateReq func (m *ProjectTokenCreateRequest) String() string { return proto.CompactTextString(m) } func (*ProjectTokenCreateRequest) ProtoMessage() {} func (*ProjectTokenCreateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_project_082822b5d17b8c4e, []int{2} + return fileDescriptor_project_8d94583ca767d5b3, []int{2} } func (m *ProjectTokenCreateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -231,7 +231,7 @@ func (m *ProjectTokenResponse) Reset() { *m = ProjectTokenResponse{} } func (m *ProjectTokenResponse) String() string { return proto.CompactTextString(m) } func (*ProjectTokenResponse) ProtoMessage() {} func (*ProjectTokenResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_project_082822b5d17b8c4e, []int{3} + return fileDescriptor_project_8d94583ca767d5b3, []int{3} } func (m *ProjectTokenResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -279,7 +279,7 @@ func (m *ProjectQuery) Reset() { *m = ProjectQuery{} } func (m *ProjectQuery) String() string { return proto.CompactTextString(m) } func (*ProjectQuery) ProtoMessage() {} func (*ProjectQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_project_082822b5d17b8c4e, []int{4} + return fileDescriptor_project_8d94583ca767d5b3, []int{4} } func (m *ProjectQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -326,7 +326,7 @@ func (m *ProjectUpdateRequest) Reset() { *m = ProjectUpdateRequest{} } func (m *ProjectUpdateRequest) String() string { return proto.CompactTextString(m) } func (*ProjectUpdateRequest) ProtoMessage() {} func (*ProjectUpdateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_project_082822b5d17b8c4e, []int{5} + return fileDescriptor_project_8d94583ca767d5b3, []int{5} } func (m *ProjectUpdateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -372,7 +372,7 @@ func (m *EmptyResponse) Reset() { *m = EmptyResponse{} } func (m *EmptyResponse) String() string { return proto.CompactTextString(m) } func (*EmptyResponse) ProtoMessage() {} func (*EmptyResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_project_082822b5d17b8c4e, []int{6} + return fileDescriptor_project_8d94583ca767d5b3, []int{6} } func (m *EmptyResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1846,10 +1846,10 @@ var ( ) func init() { - proto.RegisterFile("server/project/project.proto", fileDescriptor_project_082822b5d17b8c4e) + proto.RegisterFile("server/project/project.proto", fileDescriptor_project_8d94583ca767d5b3) } -var fileDescriptor_project_082822b5d17b8c4e = []byte{ +var fileDescriptor_project_8d94583ca767d5b3 = []byte{ // 697 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0x5d, 0x6b, 0x13, 0x4d, 0x14, 0x66, 0x9a, 0xbe, 0x79, 0xdf, 0x4e, 0x5e, 0xb5, 0x0c, 0xad, 0xa6, 0xb1, 0x8d, 0x61, 0x2e, diff --git a/server/repository/repository.pb.go b/server/repository/repository.pb.go index 5c3a4c080e..4a46ef444f 100644 --- a/server/repository/repository.pb.go +++ b/server/repository/repository.pb.go @@ -46,7 +46,7 @@ func (m *RepoAppsQuery) Reset() { *m = RepoAppsQuery{} } func (m *RepoAppsQuery) String() string { return proto.CompactTextString(m) } func (*RepoAppsQuery) ProtoMessage() {} func (*RepoAppsQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_324bad698d34f88e, []int{0} + return fileDescriptor_repository_3c54adc3c349824a, []int{0} } func (m *RepoAppsQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -102,7 +102,7 @@ func (m *AppInfo) Reset() { *m = AppInfo{} } func (m *AppInfo) String() string { return proto.CompactTextString(m) } func (*AppInfo) ProtoMessage() {} func (*AppInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_324bad698d34f88e, []int{1} + return fileDescriptor_repository_3c54adc3c349824a, []int{1} } func (m *AppInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -159,7 +159,7 @@ func (m *RepoAppDetailsQuery) Reset() { *m = RepoAppDetailsQuery{} } func (m *RepoAppDetailsQuery) String() string { return proto.CompactTextString(m) } func (*RepoAppDetailsQuery) ProtoMessage() {} func (*RepoAppDetailsQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_324bad698d34f88e, []int{2} + return fileDescriptor_repository_3c54adc3c349824a, []int{2} } func (m *RepoAppDetailsQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -224,7 +224,7 @@ func (m *RepoAppDetailsResponse) Reset() { *m = RepoAppDetailsResponse{} func (m *RepoAppDetailsResponse) String() string { return proto.CompactTextString(m) } func (*RepoAppDetailsResponse) ProtoMessage() {} func (*RepoAppDetailsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_324bad698d34f88e, []int{3} + return fileDescriptor_repository_3c54adc3c349824a, []int{3} } func (m *RepoAppDetailsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -293,7 +293,7 @@ func (m *RepoAppsResponse) Reset() { *m = RepoAppsResponse{} } func (m *RepoAppsResponse) String() string { return proto.CompactTextString(m) } func (*RepoAppsResponse) ProtoMessage() {} func (*RepoAppsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_324bad698d34f88e, []int{4} + return fileDescriptor_repository_3c54adc3c349824a, []int{4} } func (m *RepoAppsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -344,7 +344,7 @@ func (m *KsonnetAppSpec) Reset() { *m = KsonnetAppSpec{} } func (m *KsonnetAppSpec) String() string { return proto.CompactTextString(m) } func (*KsonnetAppSpec) ProtoMessage() {} func (*KsonnetAppSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_324bad698d34f88e, []int{5} + return fileDescriptor_repository_3c54adc3c349824a, []int{5} } func (m *KsonnetAppSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -408,7 +408,7 @@ func (m *HelmAppSpec) Reset() { *m = HelmAppSpec{} } func (m *HelmAppSpec) String() string { return proto.CompactTextString(m) } func (*HelmAppSpec) ProtoMessage() {} func (*HelmAppSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_324bad698d34f88e, []int{6} + return fileDescriptor_repository_3c54adc3c349824a, []int{6} } func (m *HelmAppSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -470,7 +470,7 @@ func (m *KustomizeAppSpec) Reset() { *m = KustomizeAppSpec{} } func (m *KustomizeAppSpec) String() string { return proto.CompactTextString(m) } func (*KustomizeAppSpec) ProtoMessage() {} func (*KustomizeAppSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_324bad698d34f88e, []int{7} + return fileDescriptor_repository_3c54adc3c349824a, []int{7} } func (m *KustomizeAppSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -524,7 +524,7 @@ func (m *KsonnetEnvironment) Reset() { *m = KsonnetEnvironment{} } func (m *KsonnetEnvironment) String() string { return proto.CompactTextString(m) } func (*KsonnetEnvironment) ProtoMessage() {} func (*KsonnetEnvironment) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_324bad698d34f88e, []int{8} + return fileDescriptor_repository_3c54adc3c349824a, []int{8} } func (m *KsonnetEnvironment) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -595,7 +595,7 @@ func (m *KsonnetEnvironmentDestination) Reset() { *m = KsonnetEnvironmen func (m *KsonnetEnvironmentDestination) String() string { return proto.CompactTextString(m) } func (*KsonnetEnvironmentDestination) ProtoMessage() {} func (*KsonnetEnvironmentDestination) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_324bad698d34f88e, []int{9} + return fileDescriptor_repository_3c54adc3c349824a, []int{9} } func (m *KsonnetEnvironmentDestination) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -650,7 +650,7 @@ func (m *RepoQuery) Reset() { *m = RepoQuery{} } func (m *RepoQuery) String() string { return proto.CompactTextString(m) } func (*RepoQuery) ProtoMessage() {} func (*RepoQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_324bad698d34f88e, []int{10} + return fileDescriptor_repository_3c54adc3c349824a, []int{10} } func (m *RepoQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -696,7 +696,7 @@ func (m *RepoResponse) Reset() { *m = RepoResponse{} } func (m *RepoResponse) String() string { return proto.CompactTextString(m) } func (*RepoResponse) ProtoMessage() {} func (*RepoResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_324bad698d34f88e, []int{11} + return fileDescriptor_repository_3c54adc3c349824a, []int{11} } func (m *RepoResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -737,7 +737,7 @@ func (m *RepoCreateRequest) Reset() { *m = RepoCreateRequest{} } func (m *RepoCreateRequest) String() string { return proto.CompactTextString(m) } func (*RepoCreateRequest) ProtoMessage() {} func (*RepoCreateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_324bad698d34f88e, []int{12} + return fileDescriptor_repository_3c54adc3c349824a, []int{12} } func (m *RepoCreateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -791,7 +791,7 @@ func (m *RepoUpdateRequest) Reset() { *m = RepoUpdateRequest{} } func (m *RepoUpdateRequest) String() string { return proto.CompactTextString(m) } func (*RepoUpdateRequest) ProtoMessage() {} func (*RepoUpdateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_324bad698d34f88e, []int{13} + return fileDescriptor_repository_3c54adc3c349824a, []int{13} } func (m *RepoUpdateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3675,10 +3675,10 @@ var ( ) func init() { - proto.RegisterFile("server/repository/repository.proto", fileDescriptor_repository_324bad698d34f88e) + proto.RegisterFile("server/repository/repository.proto", fileDescriptor_repository_3c54adc3c349824a) } -var fileDescriptor_repository_324bad698d34f88e = []byte{ +var fileDescriptor_repository_3c54adc3c349824a = []byte{ // 893 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x5f, 0x6f, 0x1b, 0x45, 0x10, 0xd7, 0x25, 0xa9, 0x1b, 0x8f, 0xdb, 0x2a, 0xdd, 0x96, 0x60, 0x0e, 0xc7, 0x8d, 0x16, 0x09, diff --git a/server/session/session.pb.go b/server/session/session.pb.go index e3db19fa81..f594a9a3f7 100644 --- a/server/session/session.pb.go +++ b/server/session/session.pb.go @@ -47,7 +47,7 @@ func (m *SessionCreateRequest) Reset() { *m = SessionCreateRequest{} } func (m *SessionCreateRequest) String() string { return proto.CompactTextString(m) } func (*SessionCreateRequest) ProtoMessage() {} func (*SessionCreateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_session_8e535ce77fc5e082, []int{0} + return fileDescriptor_session_217b926c109d1cc2, []int{0} } func (m *SessionCreateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -108,7 +108,7 @@ func (m *SessionDeleteRequest) Reset() { *m = SessionDeleteRequest{} } func (m *SessionDeleteRequest) String() string { return proto.CompactTextString(m) } func (*SessionDeleteRequest) ProtoMessage() {} func (*SessionDeleteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_session_8e535ce77fc5e082, []int{1} + return fileDescriptor_session_217b926c109d1cc2, []int{1} } func (m *SessionDeleteRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -149,7 +149,7 @@ func (m *SessionResponse) Reset() { *m = SessionResponse{} } func (m *SessionResponse) String() string { return proto.CompactTextString(m) } func (*SessionResponse) ProtoMessage() {} func (*SessionResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_session_8e535ce77fc5e082, []int{2} + return fileDescriptor_session_217b926c109d1cc2, []int{2} } func (m *SessionResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -827,10 +827,10 @@ var ( ) func init() { - proto.RegisterFile("server/session/session.proto", fileDescriptor_session_8e535ce77fc5e082) + proto.RegisterFile("server/session/session.proto", fileDescriptor_session_217b926c109d1cc2) } -var fileDescriptor_session_8e535ce77fc5e082 = []byte{ +var fileDescriptor_session_217b926c109d1cc2 = []byte{ // 356 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xb1, 0x4e, 0xeb, 0x30, 0x14, 0x86, 0xe5, 0x5e, 0xdd, 0xde, 0x7b, 0x3d, 0xdc, 0x8a, 0x28, 0x82, 0x28, 0x2a, 0x15, 0xca, diff --git a/server/settings/settings.pb.go b/server/settings/settings.pb.go index ebbeec9f90..59132481e3 100644 --- a/server/settings/settings.pb.go +++ b/server/settings/settings.pb.go @@ -42,7 +42,7 @@ func (m *SettingsQuery) Reset() { *m = SettingsQuery{} } func (m *SettingsQuery) String() string { return proto.CompactTextString(m) } func (*SettingsQuery) ProtoMessage() {} func (*SettingsQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_settings_902e174a76eb35c2, []int{0} + return fileDescriptor_settings_90d4947f5a5e2583, []int{0} } func (m *SettingsQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -84,7 +84,7 @@ func (m *Settings) Reset() { *m = Settings{} } func (m *Settings) String() string { return proto.CompactTextString(m) } func (*Settings) ProtoMessage() {} func (*Settings) Descriptor() ([]byte, []int) { - return fileDescriptor_settings_902e174a76eb35c2, []int{1} + return fileDescriptor_settings_90d4947f5a5e2583, []int{1} } func (m *Settings) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -145,7 +145,7 @@ func (m *DexConfig) Reset() { *m = DexConfig{} } func (m *DexConfig) String() string { return proto.CompactTextString(m) } func (*DexConfig) ProtoMessage() {} func (*DexConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_settings_902e174a76eb35c2, []int{2} + return fileDescriptor_settings_90d4947f5a5e2583, []int{2} } func (m *DexConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -193,7 +193,7 @@ func (m *Connector) Reset() { *m = Connector{} } func (m *Connector) String() string { return proto.CompactTextString(m) } func (*Connector) ProtoMessage() {} func (*Connector) Descriptor() ([]byte, []int) { - return fileDescriptor_settings_902e174a76eb35c2, []int{3} + return fileDescriptor_settings_90d4947f5a5e2583, []int{3} } func (m *Connector) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -249,7 +249,7 @@ func (m *OIDCConfig) Reset() { *m = OIDCConfig{} } func (m *OIDCConfig) String() string { return proto.CompactTextString(m) } func (*OIDCConfig) ProtoMessage() {} func (*OIDCConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_settings_902e174a76eb35c2, []int{4} + return fileDescriptor_settings_90d4947f5a5e2583, []int{4} } func (m *OIDCConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1291,10 +1291,10 @@ var ( ) func init() { - proto.RegisterFile("server/settings/settings.proto", fileDescriptor_settings_902e174a76eb35c2) + proto.RegisterFile("server/settings/settings.proto", fileDescriptor_settings_90d4947f5a5e2583) } -var fileDescriptor_settings_902e174a76eb35c2 = []byte{ +var fileDescriptor_settings_90d4947f5a5e2583 = []byte{ // 397 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x52, 0xcd, 0x8a, 0xdb, 0x30, 0x18, 0x44, 0x71, 0x49, 0xe2, 0xaf, 0x3f, 0x69, 0xd5, 0x12, 0xdc, 0x50, 0x9c, 0xe0, 0x53, 0xa0, diff --git a/server/version/version.pb.go b/server/version/version.pb.go index 24be96b970..9a055c4938 100644 --- a/server/version/version.pb.go +++ b/server/version/version.pb.go @@ -51,7 +51,7 @@ func (m *VersionMessage) Reset() { *m = VersionMessage{} } func (m *VersionMessage) String() string { return proto.CompactTextString(m) } func (*VersionMessage) ProtoMessage() {} func (*VersionMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_version_9a67e1897074bbcc, []int{0} + return fileDescriptor_version_301443c925f6e1d7, []int{0} } func (m *VersionMessage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -781,10 +781,10 @@ var ( ) func init() { - proto.RegisterFile("server/version/version.proto", fileDescriptor_version_9a67e1897074bbcc) + proto.RegisterFile("server/version/version.proto", fileDescriptor_version_301443c925f6e1d7) } -var fileDescriptor_version_9a67e1897074bbcc = []byte{ +var fileDescriptor_version_301443c925f6e1d7 = []byte{ // 343 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x92, 0xcf, 0x4a, 0xc3, 0x40, 0x10, 0xc6, 0x49, 0xd5, 0xfe, 0x59, 0x4a, 0x0f, 0x8b, 0xd4, 0x25, 0x96, 0x22, 0x3d, 0x88, 0x08, diff --git a/util/kube/ctl.go b/util/kube/ctl.go index 1104d5c458..651a9b6f0e 100644 --- a/util/kube/ctl.go +++ b/util/kube/ctl.go @@ -30,7 +30,7 @@ import ( type Kubectl interface { ApplyResource(config *rest.Config, obj *unstructured.Unstructured, namespace string, dryRun, force bool) (string, error) ConvertToVersion(obj *unstructured.Unstructured, group, version string) (*unstructured.Unstructured, error) - DeleteResource(config *rest.Config, gvk schema.GroupVersionKind, name string, namespace string, forceDelete bool, gracePeriod *int64) error + DeleteResource(config *rest.Config, gvk schema.GroupVersionKind, name string, namespace string, forceDelete bool) error GetResource(config *rest.Config, gvk schema.GroupVersionKind, name string, namespace string) (*unstructured.Unstructured, error) WatchResources(ctx context.Context, config *rest.Config, namespace string) (chan watch.Event, error) GetResources(config *rest.Config, namespace string) ([]*unstructured.Unstructured, error) @@ -151,7 +151,7 @@ func (k KubectlCmd) GetResource(config *rest.Config, gvk schema.GroupVersionKind } // DeleteResource deletes resource -func (k KubectlCmd) DeleteResource(config *rest.Config, gvk schema.GroupVersionKind, name string, namespace string, forceDelete bool, gracePeriod *int64) error { +func (k KubectlCmd) DeleteResource(config *rest.Config, gvk schema.GroupVersionKind, name string, namespace string, forceDelete bool) error { dynamicIf, err := dynamic.NewForConfig(config) if err != nil { return err @@ -168,11 +168,9 @@ func (k KubectlCmd) DeleteResource(config *rest.Config, gvk schema.GroupVersionK resourceIf := ToResourceInterface(dynamicIf, apiResource, resource, namespace) propagationPolicy := metav1.DeletePropagationForeground deleteOptions := &metav1.DeleteOptions{PropagationPolicy: &propagationPolicy} - if gracePeriod != nil { - if *gracePeriod == 0 && !forceDelete { - *gracePeriod = 1 - } - deleteOptions.GracePeriodSeconds = gracePeriod + if forceDelete { + zeroGracePeriod := int64(0) + deleteOptions.GracePeriodSeconds = &zeroGracePeriod } return resourceIf.Delete(name, deleteOptions) diff --git a/util/kube/kubetest/mock.go b/util/kube/kubetest/mock.go index 28ad061ffb..2ad919ac6c 100644 --- a/util/kube/kubetest/mock.go +++ b/util/kube/kubetest/mock.go @@ -34,7 +34,7 @@ func (k MockKubectlCmd) WatchResources( return k.Events, nil } -func (k MockKubectlCmd) DeleteResource(config *rest.Config, gvk schema.GroupVersionKind, name string, namespace string, forceDelete bool, gracePeriod *int64) error { +func (k MockKubectlCmd) DeleteResource(config *rest.Config, gvk schema.GroupVersionKind, name string, namespace string, forceDelete bool) error { command, ok := k.Commands[name] if !ok { return nil