Skip to content

Commit 4d63aef

Browse files
committed
Rename v1/resource dir to v1/crd
Signed-off-by: Adrian Orive <[email protected]>
1 parent f4c81fe commit 4d63aef

File tree

10 files changed

+19
-19
lines changed

10 files changed

+19
-19
lines changed

pkg/scaffold/api.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"sigs.k8s.io/kubebuilder/pkg/scaffold/resource"
3030
"sigs.k8s.io/kubebuilder/pkg/scaffold/util"
3131
"sigs.k8s.io/kubebuilder/pkg/scaffold/v1/controller"
32-
resourcev1 "sigs.k8s.io/kubebuilder/pkg/scaffold/v1/resource"
32+
crdv1 "sigs.k8s.io/kubebuilder/pkg/scaffold/v1/crd"
3333
scaffoldv2 "sigs.k8s.io/kubebuilder/pkg/scaffold/v2"
3434
crdv2 "sigs.k8s.io/kubebuilder/pkg/scaffold/v2/crd"
3535
)
@@ -125,14 +125,14 @@ func (api *API) scaffoldV1() error {
125125
fmt.Sprintf("%s_types_test.go", strings.ToLower(r.Kind))))
126126

127127
err := (&Scaffold{}).Execute(api.buildUniverse(), input.Options{},
128-
&resourcev1.Register{Resource: r},
129-
&resourcev1.Types{Resource: r},
130-
&resourcev1.VersionSuiteTest{Resource: r},
131-
&resourcev1.TypesTest{Resource: r},
132-
&resourcev1.Doc{Resource: r},
133-
&resourcev1.Group{Resource: r},
134-
&resourcev1.AddToScheme{Resource: r},
135-
&resourcev1.CRDSample{Resource: r},
128+
&crdv1.Register{Resource: r},
129+
&crdv1.Types{Resource: r},
130+
&crdv1.VersionSuiteTest{Resource: r},
131+
&crdv1.TypesTest{Resource: r},
132+
&crdv1.Doc{Resource: r},
133+
&crdv1.Group{Resource: r},
134+
&crdv1.AddToScheme{Resource: r},
135+
&crdv1.CRDSample{Resource: r},
136136
)
137137
if err != nil {
138138
return fmt.Errorf("error scaffolding APIs: %v", err)

pkg/scaffold/v1/resource/addtoscheme.go renamed to pkg/scaffold/v1/crd/addtoscheme.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package resource
17+
package crd
1818

1919
import (
2020
"fmt"

pkg/scaffold/v1/resource/crd_sample.go renamed to pkg/scaffold/v1/crd/crd_sample.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package resource
17+
package crd
1818

1919
import (
2020
"fmt"

pkg/scaffold/v1/resource/doc.go renamed to pkg/scaffold/v1/crd/doc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package resource
17+
package crd
1818

1919
import (
2020
"path/filepath"

pkg/scaffold/v1/resource/group.go renamed to pkg/scaffold/v1/crd/group.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package resource
17+
package crd
1818

1919
import (
2020
"path/filepath"

pkg/scaffold/v1/resource/register.go renamed to pkg/scaffold/v1/crd/register.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package resource
17+
package crd
1818

1919
import (
2020
"path/filepath"

pkg/scaffold/v1/resource/suite_test.go renamed to pkg/scaffold/v1/crd/suite_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package resource_test
1+
package crd_test
22

33
import (
44
"fmt"
@@ -13,7 +13,7 @@ import (
1313
"sigs.k8s.io/kubebuilder/pkg/scaffold/input"
1414
"sigs.k8s.io/kubebuilder/pkg/scaffold/resource"
1515
"sigs.k8s.io/kubebuilder/pkg/scaffold/scaffoldtest"
16-
. "sigs.k8s.io/kubebuilder/pkg/scaffold/v1/resource"
16+
. "sigs.k8s.io/kubebuilder/pkg/scaffold/v1/crd"
1717
)
1818

1919
func TestResource(t *testing.T) {

pkg/scaffold/v1/resource/types.go renamed to pkg/scaffold/v1/crd/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package resource
17+
package crd
1818

1919
import (
2020
"fmt"

pkg/scaffold/v1/resource/typestest.go renamed to pkg/scaffold/v1/crd/typestest.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package resource
17+
package crd
1818

1919
import (
2020
"fmt"

pkg/scaffold/v1/resource/version_suitetest.go renamed to pkg/scaffold/v1/crd/version_suitetest.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package resource
17+
package crd
1818

1919
import (
2020
"fmt"

0 commit comments

Comments
 (0)