Skip to content

Commit 221f1ad

Browse files
Merge pull request #543 from astefanutti/pr-03
api: Remove QueueJob API
2 parents d78eb63 + 46cd63f commit 221f1ad

File tree

11 files changed

+19
-14258
lines changed

11 files changed

+19
-14258
lines changed

Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,14 +235,12 @@ DEPLOYMENT_CRD_DIR=deployment/mcad-controller/crds
235235
CRD_BASE_DIR=config/crd/bases
236236
MCAD_CRDS= ${DEPLOYMENT_CRD_DIR}/ibm.com_quotasubtrees.yaml \
237237
${DEPLOYMENT_CRD_DIR}/mcad.ibm.com_appwrappers.yaml \
238-
${DEPLOYMENT_CRD_DIR}/mcad.ibm.com_queuejobs.yaml \
239238
${DEPLOYMENT_CRD_DIR}/mcad.ibm.com_schedulingspecs.yaml
240239

241240
update-deployment-crds: ${MCAD_CRDS}
242241

243242
${DEPLOYMENT_CRD_DIR}/ibm.com_quotasubtrees.yaml : ${CRD_BASE_DIR}/ibm.com_quotasubtrees.yaml
244243
${DEPLOYMENT_CRD_DIR}/mcad.ibm.com_appwrappers.yaml : ${CRD_BASE_DIR}/mcad.ibm.com_appwrappers.yaml
245-
${DEPLOYMENT_CRD_DIR}/mcad.ibm.com_queuejobs.yaml : ${CRD_BASE_DIR}/mcad.ibm.com_queuejobs.yaml
246244
${DEPLOYMENT_CRD_DIR}/mcad.ibm.com_schedulingspecs.yaml : ${CRD_BASE_DIR}/mcad.ibm.com_schedulingspecs.yaml
247245

248246
$(DEPLOYMENT_CRD_DIR)/%: ${CRD_BASE_DIR}/%

config/crd/bases/mcad.ibm.com_queuejobs.yaml

Lines changed: 0 additions & 6885 deletions
This file was deleted.

deployment/mcad-controller/crds/mcad.ibm.com_queuejobs.yaml

Lines changed: 0 additions & 6885 deletions
This file was deleted.

pkg/apis/controller/v1beta1/queuejob.go

Lines changed: 0 additions & 108 deletions
This file was deleted.

pkg/apis/controller/v1beta1/register.go

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,4 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
3-
4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
7-
8-
http://www.apache.org/licenses/LICENSE-2.0
9-
10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
15-
*/
16-
/*
172
Copyright 2019, 2021 The Multi-Cluster App Dispatcher Authors.
183
194
Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,10 +13,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
2813
See the License for the specific language governing permissions and
2914
limitations under the License.
3015
*/
16+
3117
package v1beta1
3218

3319
import (
34-
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
3520
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3621
"k8s.io/apimachinery/pkg/runtime"
3722
"k8s.io/apimachinery/pkg/runtime/schema"
@@ -48,14 +33,6 @@ const GroupName = "mcad.ibm.com"
4833
// SchemeGroupVersion is the group version used to register these objects.
4934
var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1beta1"}
5035

51-
var Versions = []apiextensionsv1.CustomResourceDefinitionVersion{
52-
{
53-
Name: SchemeGroupVersion.Version,
54-
Served: true,
55-
Storage: true,
56-
},
57-
}
58-
5936
// Resource takes an unqualified resource and returns a Group-qualified GroupResource.
6037
func Resource(resource string) schema.GroupResource {
6138
return SchemeGroupVersion.WithResource(resource).GroupResource()
@@ -66,8 +43,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
6643
scheme.AddKnownTypes(SchemeGroupVersion,
6744
&SchedulingSpec{},
6845
&SchedulingSpecList{},
69-
&QueueJob{},
70-
&QueueJobList{},
7146
&AppWrapper{},
7247
&AppWrapperList{},
7348
)

pkg/apis/controller/v1beta1/zz_generated.deepcopy.go

Lines changed: 0 additions & 138 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/quotaplugins/quotasubtree/v1/zz_generated.deepcopy.go

Lines changed: 0 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/client/clientset/versioned/fake/register.go

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)