Skip to content

Commit 4926a28

Browse files
gaocegegek8s-ci-robot
authored andcommitted
feat: Use kubeflow/common (kubeflow#1088)
* chore: Vendor update Signed-off-by: Ce Gao <gaoce@caicloud.io> * feat: Use common Signed-off-by: Ce Gao <gaoce@caicloud.io>
1 parent ed85559 commit 4926a28

File tree

198 files changed

+688
-13117
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

198 files changed

+688
-13117
lines changed

Gopkg.lock

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

hack/update-codegen.sh

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,29 +30,17 @@ CODEGEN_PKG=${SCRIPT_ROOT}/vendor/k8s.io/code-generator
3030
# instead of the $GOPATH directly. For normal projects this can be dropped.
3131
cd ${SCRIPT_ROOT}
3232

33-
${CODEGEN_PKG}/generate-groups.sh "deepcopy" \
34-
github.com/kubeflow/tf-operator/pkg/client github.com/kubeflow/tf-operator/pkg/apis \
35-
common:v1 \
36-
--go-header-file hack/boilerplate/boilerplate.go.txt
37-
3833
${CODEGEN_PKG}/generate-groups.sh "all" \
3934
github.com/kubeflow/tf-operator/pkg/client github.com/kubeflow/tf-operator/pkg/apis \
4035
tensorflow:v1 \
4136
--go-header-file hack/boilerplate/boilerplate.go.txt
4237

4338
# Notice: The code in code-generator does not generate defaulter by default.
44-
echo "Generating defaulters for common/v1"
45-
${GOPATH}/bin/defaulter-gen --input-dirs github.com/kubeflow/tf-operator/pkg/apis/common/v1 -O zz_generated.defaults --go-header-file hack/boilerplate/boilerplate.go.txt "$@"
46-
cd - > /dev/null
4739

4840
echo "Generating defaulters for tensorflow/v1"
4941
${GOPATH}/bin/defaulter-gen --input-dirs github.com/kubeflow/tf-operator/pkg/apis/tensorflow/v1 -O zz_generated.defaults --go-header-file hack/boilerplate/boilerplate.go.txt "$@"
5042
cd - > /dev/null
5143

52-
echo "Generating OpenAPI specification for common/v1"
53-
${GOPATH}/bin/openapi-gen --input-dirs github.com/kubeflow/tf-operator/pkg/apis/common/v1,k8s.io/api/core/v1,k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/api/resource,k8s.io/apimachinery/pkg/runtime,k8s.io/apimachinery/pkg/util/intstr,k8s.io/apimachinery/pkg/version --output-package github.com/kubeflow/tf-operator/pkg/apis/common/v1 --go-header-file hack/boilerplate/boilerplate.go.txt "$@"
54-
cd - > /dev/null
55-
5644
echo "Generating OpenAPI specification for tensorflow/v1"
5745
${GOPATH}/bin/openapi-gen --input-dirs github.com/kubeflow/tf-operator/pkg/apis/tensorflow/v1,k8s.io/api/core/v1,k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/api/resource,k8s.io/apimachinery/pkg/runtime,k8s.io/apimachinery/pkg/util/intstr,k8s.io/apimachinery/pkg/version --output-package github.com/kubeflow/tf-operator/pkg/apis/tensorflow/v1 --go-header-file hack/boilerplate/boilerplate.go.txt "$@"
5846
cd - > /dev/null

pkg/apis/tensorflow/v1/constants.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package v1
1616

1717
import (
18-
common "github.com/kubeflow/tf-operator/pkg/apis/common/v1"
18+
common "github.com/kubeflow/common/job_controller/api/v1"
1919
)
2020

2121
const (

pkg/apis/tensorflow/v1/defaults.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package v1
1717
import (
1818
"strings"
1919

20-
common "github.com/kubeflow/tf-operator/pkg/apis/common/v1"
20+
common "github.com/kubeflow/common/job_controller/api/v1"
2121
v1 "k8s.io/api/core/v1"
2222
"k8s.io/apimachinery/pkg/runtime"
2323
)

pkg/apis/tensorflow/v1/defaults_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020

2121
v1 "k8s.io/api/core/v1"
2222

23-
common "github.com/kubeflow/tf-operator/pkg/apis/common/v1"
23+
common "github.com/kubeflow/common/job_controller/api/v1"
2424
"github.com/kubeflow/tf-operator/pkg/util"
2525
)
2626

pkg/apis/tensorflow/v1/openapi_generated.go

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

pkg/apis/tensorflow/v1/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package v1
1616

1717
import (
18-
common "github.com/kubeflow/tf-operator/pkg/apis/common/v1"
18+
common "github.com/kubeflow/common/job_controller/api/v1"
1919
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2020
)
2121

pkg/apis/tensorflow/v1/zz_generated.deepcopy.go

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

pkg/apis/tensorflow/validation/validation.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919

2020
log "github.com/sirupsen/logrus"
2121

22-
commonv1 "github.com/kubeflow/tf-operator/pkg/apis/common/v1"
22+
commonv1 "github.com/kubeflow/common/job_controller/api/v1"
2323
tfv1 "github.com/kubeflow/tf-operator/pkg/apis/tensorflow/v1"
2424
)
2525

pkg/apis/tensorflow/validation/validation_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"testing"
1919

2020
"github.com/golang/protobuf/proto"
21-
commonv1 "github.com/kubeflow/tf-operator/pkg/apis/common/v1"
21+
commonv1 "github.com/kubeflow/common/job_controller/api/v1"
2222
tfv1 "github.com/kubeflow/tf-operator/pkg/apis/tensorflow/v1"
2323

2424
v1 "k8s.io/api/core/v1"

0 commit comments

Comments
 (0)