Skip to content

Commit 260ed2e

Browse files
tenzen-ytenzen-y
committed
Change Go module name to 'github.com/kubeflow/mpi-operator'
Signed-off-by: Yuki Iwai <[email protected]>
1 parent d93642d commit 260ed2e

File tree

301 files changed

+29755
-1191
lines changed

Some content is hidden

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

301 files changed

+29755
-1191
lines changed

‎Makefile‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ CONTROLLER_VERSION?=v2
2222
BASE_IMAGE_SSH_PORT?=2222
2323
IMG_BUILDER=docker
2424
LD_FLAGS_V2=" \
25-
-X '${REPO_PATH}/v2/pkg/version.GitSHA=${GitSHA}' \
26-
-X '${REPO_PATH}/v2/pkg/version.Built=${Date}' \
27-
-X '${REPO_PATH}/v2/pkg/version.Version=${RELEASE_VERSION}'"
25+
-X '${REPO_PATH}/pkg/version.GitSHA=${GitSHA}' \
26+
-X '${REPO_PATH}/pkg/version.Built=${Date}' \
27+
-X '${REPO_PATH}/pkg/version.Version=${RELEASE_VERSION}'"
2828
IMAGE_NAME?=mpioperator/mpi-operator
2929
KUBEBUILDER_ASSETS_PATH := $(dir $(abspath $(firstword $(MAKEFILE_LIST))))bin/kubebuilder/bin
3030
KIND_VERSION=v0.17.0
@@ -35,7 +35,7 @@ PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
3535
GOARCH=$(shell go env GOARCH)
3636
GOOS=$(shell go env GOOS)
3737

38-
CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false"
38+
CRD_OPTIONS ?= "crd:generateEmbeddedObjectMeta=true"
3939

4040
build: all
4141

@@ -74,8 +74,10 @@ dev_manifest:
7474

7575
.PHONY: generate
7676
generate:
77-
go generate ./pkg/... ./cmd/... && \
78-
openapi-gen --input-dirs github.com/kubeflow/mpi-operator/v2/pkg/apis/kubeflow/v2beta1,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,github.com/kubeflow/common/pkg/apis/common/v1 --output-package github.com/kubeflow/mpi-operator/pkg/apis/kubeflow/v2beta1 --go-header-file hack/boilerplate/boilerplate.go.txt
77+
go generate ./pkg/... ./cmd/...
78+
hack/update-codegen.sh
79+
$(MAKE) crd
80+
hack/python-sdk/gen-sdk.sh
7981

8082
.PHONY: clean
8183
clean:

‎cmd/mpi-operator/app/options/options.go‎

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

21-
"github.com/kubeflow/mpi-operator/v2/pkg/apis/kubeflow/v2beta1"
21+
"github.com/kubeflow/mpi-operator/pkg/apis/kubeflow/v2beta1"
2222
)
2323

2424
// ServerOption is the main context object for the controller manager.

‎cmd/mpi-operator/app/server.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"os"
2222
"time"
2323

24-
kubeflowScheme "github.com/kubeflow/mpi-operator/v2/pkg/client/clientset/versioned/scheme"
24+
kubeflowScheme "github.com/kubeflow/mpi-operator/pkg/client/clientset/versioned/scheme"
2525
"github.com/prometheus/client_golang/prometheus"
2626
"github.com/prometheus/client_golang/prometheus/promauto"
2727
corev1 "k8s.io/api/core/v1"
@@ -44,11 +44,11 @@ import (
4444
volcanoinformers "volcano.sh/apis/pkg/client/informers/externalversions"
4545
podgroupsinformer "volcano.sh/apis/pkg/client/informers/externalversions/scheduling/v1beta1"
4646

47-
"github.com/kubeflow/mpi-operator/v2/cmd/mpi-operator/app/options"
48-
mpijobclientset "github.com/kubeflow/mpi-operator/v2/pkg/client/clientset/versioned"
49-
informers "github.com/kubeflow/mpi-operator/v2/pkg/client/informers/externalversions"
50-
controllersv1 "github.com/kubeflow/mpi-operator/v2/pkg/controller"
51-
"github.com/kubeflow/mpi-operator/v2/pkg/version"
47+
"github.com/kubeflow/mpi-operator/cmd/mpi-operator/app/options"
48+
mpijobclientset "github.com/kubeflow/mpi-operator/pkg/client/clientset/versioned"
49+
informers "github.com/kubeflow/mpi-operator/pkg/client/informers/externalversions"
50+
controllersv1 "github.com/kubeflow/mpi-operator/pkg/controller"
51+
"github.com/kubeflow/mpi-operator/pkg/version"
5252
)
5353

5454
const (

‎cmd/mpi-operator/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121

2222
"k8s.io/klog"
2323

24-
"github.com/kubeflow/mpi-operator/v2/cmd/mpi-operator/app"
25-
"github.com/kubeflow/mpi-operator/v2/cmd/mpi-operator/app/options"
24+
"github.com/kubeflow/mpi-operator/cmd/mpi-operator/app"
25+
"github.com/kubeflow/mpi-operator/cmd/mpi-operator/app/options"
2626
"github.com/prometheus/client_golang/prometheus/promhttp"
2727
)
2828

‎crd/kubeflow.org_mpijobs.yaml‎

Lines changed: 1914 additions & 805 deletions
Large diffs are not rendered by default.

‎go.mod‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
module github.com/kubeflow/mpi-operator/v2
1+
module github.com/kubeflow/mpi-operator
22

33
go 1.19
44

55
require (
66
github.com/google/go-cmp v0.5.8
7-
github.com/kubeflow/common v0.4.3
7+
github.com/kubeflow/common v0.4.6
88
github.com/onsi/ginkgo v1.16.5
99
github.com/onsi/gomega v1.20.1
1010
github.com/prometheus/client_golang v1.12.2
1111
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd
12-
k8s.io/api v0.25.5
13-
k8s.io/apimachinery v0.25.5
14-
k8s.io/apiserver v0.25.5
15-
k8s.io/client-go v0.25.5
16-
k8s.io/code-generator v0.25.5
12+
k8s.io/api v0.25.6
13+
k8s.io/apimachinery v0.25.6
14+
k8s.io/apiserver v0.25.6
15+
k8s.io/client-go v0.25.6
16+
k8s.io/code-generator v0.25.6
1717
k8s.io/klog v1.0.0
1818
k8s.io/kube-openapi v0.0.0-20230109183929-3758b55a6596
19-
k8s.io/sample-controller v0.25.5
19+
k8s.io/sample-controller v0.25.6
2020
sigs.k8s.io/controller-runtime v0.13.1
2121
volcano.sh/apis v1.7.0
2222
)
@@ -39,7 +39,7 @@ require (
3939
github.com/golang/protobuf v1.5.2 // indirect
4040
github.com/google/gnostic v0.5.7-v3refs // indirect
4141
github.com/google/gofuzz v1.1.0 // indirect
42-
github.com/google/uuid v1.1.2 // indirect
42+
github.com/google/uuid v1.3.0 // indirect
4343
github.com/imdario/mergo v0.3.12 // indirect
4444
github.com/josharian/intern v1.0.0 // indirect
4545
github.com/json-iterator/go v1.1.12 // indirect
@@ -70,7 +70,7 @@ require (
7070
gopkg.in/yaml.v2 v2.4.0 // indirect
7171
gopkg.in/yaml.v3 v3.0.1 // indirect
7272
k8s.io/apiextensions-apiserver v0.25.0 // indirect
73-
k8s.io/component-base v0.25.5 // indirect
73+
k8s.io/component-base v0.25.6 // indirect
7474
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
7575
k8s.io/klog/v2 v2.70.1 // indirect
7676
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect

‎go.sum‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,8 @@ github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hf
157157
github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
158158
github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
159159
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
160-
github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
161-
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
160+
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
161+
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
162162
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
163163
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
164164
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
@@ -193,8 +193,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
193193
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
194194
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
195195
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
196-
github.com/kubeflow/common v0.4.3 h1:vVoOMNPOZK4wzZvQ4rsRLvC3SDi+J1fVKNHSXC/QRvU=
197-
github.com/kubeflow/common v0.4.3/go.mod h1:Qb/5aON7/OWVkN8OnjRqqT0i8X/XzMekRIZ8lkLosj4=
196+
github.com/kubeflow/common v0.4.6 h1:yzJf/HEdS6ginD0GlVkgbOFie0Sp66VdGjXidAGZIlk=
197+
github.com/kubeflow/common v0.4.6/go.mod h1:43MAof/uhpJA2C0urynqatE3oKFQc7m2HLmJty7waqY=
198198
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
199199
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
200200
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
@@ -601,20 +601,20 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
601601
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
602602
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
603603
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
604-
k8s.io/api v0.25.5 h1:mqyHf7aoaYMpdvO87mqpol+Qnsmo+y09S0PMIXwiZKo=
605-
k8s.io/api v0.25.5/go.mod h1:RzplZX0Z8rV/WhSTfEvnyd91bBhBQTRWo85qBQwRmb8=
604+
k8s.io/api v0.25.6 h1:LwDY2H6kD/3R8TekJYYaJWOdekNdXDO44eVpX6sNtJA=
605+
k8s.io/api v0.25.6/go.mod h1:bVp01KUcl8VUHFBTJMOknWNo7XvR0cMbeTTuFg1zCUs=
606606
k8s.io/apiextensions-apiserver v0.25.0 h1:CJ9zlyXAbq0FIW8CD7HHyozCMBpDSiH7EdrSTCZcZFY=
607607
k8s.io/apiextensions-apiserver v0.25.0/go.mod h1:3pAjZiN4zw7R8aZC5gR0y3/vCkGlAjCazcg1me8iB/E=
608-
k8s.io/apimachinery v0.25.5 h1:SQomYHvv+aO43qdu3QKRf9YuI0oI8w3RrOQ1qPbAUGY=
609-
k8s.io/apimachinery v0.25.5/go.mod h1:1S2i1QHkmxc8+EZCIxe/fX5hpldVXk4gvnJInMEb8D4=
610-
k8s.io/apiserver v0.25.5 h1:oC6pd5Z/q8WKksJApbnnK0mODqIz/jKWw3Jk4QqIVXM=
611-
k8s.io/apiserver v0.25.5/go.mod h1:iCRtEN+C0EsNBcbhmDJp41M7cspJM54VWoKyl62gGOU=
612-
k8s.io/client-go v0.25.5 h1:7QWVK0Ph4bLn0UwotPTc2FTgm8shreQXyvXnnHDd8rE=
613-
k8s.io/client-go v0.25.5/go.mod h1:bOeoaUUdpyz3WDFGo+Xm3nOQFh2KuYXRDwrvbAPtFQA=
614-
k8s.io/code-generator v0.25.5 h1:K3MSqc27VT6fGJtVlE037N2dGmtqyhZi3S+1GkrKH+c=
615-
k8s.io/code-generator v0.25.5/go.mod h1:aDxzxJynLKQkaa117y0FFcgZ5jG8+GobxZ2JUntmvKk=
616-
k8s.io/component-base v0.25.5 h1:tVni0kgpceq71MDMBSixp8Y621YGvTS/1zq3RABgX9A=
617-
k8s.io/component-base v0.25.5/go.mod h1:9J+e9uIUwUOG2x5q5+aaOR0b8QI5OIqwqPAbeODkYpc=
608+
k8s.io/apimachinery v0.25.6 h1:r6KIF2AHwLqFfZ0LcOA3I11SF62YZK83dxj1fn14NOQ=
609+
k8s.io/apimachinery v0.25.6/go.mod h1:1S2i1QHkmxc8+EZCIxe/fX5hpldVXk4gvnJInMEb8D4=
610+
k8s.io/apiserver v0.25.6 h1:32mn8HAlsEl1tpuiVmhAl0YCVkOugjybsJ6l6kf0c8k=
611+
k8s.io/apiserver v0.25.6/go.mod h1:IEp2B2/FvQ8GmdspscUoUS0iFF/GGc6NVrJ/cTM4OaA=
612+
k8s.io/client-go v0.25.6 h1:CHxACHi0DijmlYyUR7ooZoXnD5P8jYLgBHcxp775x/U=
613+
k8s.io/client-go v0.25.6/go.mod h1:s9mMAGFYiH3Z66j7BESzu0GEradT9GQ2LjFf/YRrnyc=
614+
k8s.io/code-generator v0.25.6 h1:md8jqhQiMqos8WaTY0ZxhDk8ttlmJl/ijCneJ8ahBNQ=
615+
k8s.io/code-generator v0.25.6/go.mod h1:aDxzxJynLKQkaa117y0FFcgZ5jG8+GobxZ2JUntmvKk=
616+
k8s.io/component-base v0.25.6 h1:v3ci6FbXFcxpjyQJaaLq0MgzT3vyFzwUDWtO+KRv9Bk=
617+
k8s.io/component-base v0.25.6/go.mod h1:k7DfcfJ8cOI6A2xTCfU5LxsnXV+lWw1ME8cRCHzIh6o=
618618
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 h1:TT1WdmqqXareKxZ/oNXEUSwKlLiHzPMyB0t8BaFeBYI=
619619
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
620620
k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
@@ -625,8 +625,8 @@ k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ=
625625
k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
626626
k8s.io/kube-openapi v0.0.0-20230109183929-3758b55a6596 h1:8cNCQs+WqqnSpZ7y0LMQPKD+RZUHU17VqLPMW3qxnxc=
627627
k8s.io/kube-openapi v0.0.0-20230109183929-3758b55a6596/go.mod h1:/BYxry62FuDzmI+i9B+X2pqfySRmSOW2ARmj5Zbqhj0=
628-
k8s.io/sample-controller v0.25.5 h1:pmQYG9DFX2kyDCUnS4r0c+mbCpiU/tgdiAYFJezBnaw=
629-
k8s.io/sample-controller v0.25.5/go.mod h1:O304kQz5j23hWAbsu4OroeSHt/7RghBuzkKkjIzyI3E=
628+
k8s.io/sample-controller v0.25.6 h1:3pL/re2XIBmV7XMMUyAJXJzoeGDUVPw+96KHb1hmJa4=
629+
k8s.io/sample-controller v0.25.6/go.mod h1:S52SPXRVs87vEEOscuaFlj2A6BnwzrtxI8OA+3M44rs=
630630
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4=
631631
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
632632
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=

‎hack/python-sdk/gen-sdk.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ fi
3232
mv pkg/apis/kubeflow/v2beta1/openapi_generated.go pkg/apis/kubeflow/v2beta1/openapi_generated.go.backup
3333

3434
echo "Generating V2 OpenAPI specification ..."
35-
openapi-gen --input-dirs github.com/kubeflow/mpi-operator/v2/pkg/apis/kubeflow/v2beta1,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,github.com/kubeflow/common/pkg/apis/common/v1 --output-package github.com/kubeflow/mpi-operator/pkg/apis/kubeflow/v2beta1 --go-header-file hack/boilerplate/boilerplate.go.txt
35+
openapi-gen --input-dirs github.com/kubeflow/mpi-operator/pkg/apis/kubeflow/v2beta1,github.com/kubeflow/common/pkg/apis/common/v1 --output-package github.com/kubeflow/mpi-operator/pkg/apis/kubeflow/v2beta1 --go-header-file hack/boilerplate/boilerplate.go.txt
3636

3737
echo "Generating V2 swagger file ..."
3838
go run hack/python-sdk/main.go v2beta1 > ${SWAGGER_V2_CODEGEN_FILE}

‎hack/python-sdk/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"k8s.io/kube-openapi/pkg/common"
2727
"k8s.io/kube-openapi/pkg/validation/spec"
2828

29-
mpijobv2 "github.com/kubeflow/mpi-operator/v2/pkg/apis/kubeflow/v2beta1"
29+
mpijobv2 "github.com/kubeflow/mpi-operator/pkg/apis/kubeflow/v2beta1"
3030
)
3131

3232
// Generate OpenAPI spec definitions for MPIJob Resource
@@ -72,7 +72,7 @@ func main() {
7272
}
7373

7474
func swaggify(name string) string {
75-
name = strings.Replace(name, "github.com/kubeflow/mpi-operator/v2/pkg/apis/kubeflow/", "", -1)
75+
name = strings.Replace(name, "github.com/kubeflow/mpi-operator/pkg/apis/kubeflow/", "", -1)
7676
name = strings.Replace(name, "github.com/kubeflow/common/pkg/apis/common/", "", -1)
7777
name = strings.Replace(name, "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/", "", -1)
7878
name = strings.Replace(name, "k8s.io/api/core/", "", -1)

‎hack/update-codegen.sh‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ set -o errexit
1818
set -o nounset
1919
set -o pipefail
2020

21-
SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/..
22-
pushd $SCRIPT_ROOT
21+
SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
22+
pushd "${SCRIPT_ROOT}"
2323
SCRIPT_ROOT=$(pwd)
2424
popd
2525

@@ -28,8 +28,10 @@ popd
2828
# Reference: https://github.com/kubernetes/code-generator/issues/57
2929
CODEGEN_VERSION=$(grep 'k8s.io/code-generator' go.sum | awk '{print $2}' | sed 's/\/go.mod//g' | head -1)
3030
CODEGEN_PKG=$(echo `go env GOPATH`"/pkg/mod/k8s.io/code-generator@${CODEGEN_VERSION}")
31-
chmod +x ${CODEGEN_PKG}/generate-groups.sh
31+
chmod +x "${CODEGEN_PKG}/generate-groups.sh"
3232

33-
${CODEGEN_PKG}/generate-groups.sh "deepcopy,client,informer,lister" \
33+
"${CODEGEN_PKG}/generate-groups.sh" "deepcopy,client,informer,lister" \
3434
github.com/kubeflow/mpi-operator/pkg/client github.com/kubeflow/mpi-operator/pkg/apis \
35-
kubeflow:v2beta1 --go-header-file ${SCRIPT_ROOT}/hack/custom-boilerplate.go.txt
35+
kubeflow:v2beta1 \
36+
--output-base "${SCRIPT_ROOT}/../../../.." \
37+
--go-header-file "${SCRIPT_ROOT}/hack/custom-boilerplate.go.txt"

0 commit comments

Comments
 (0)