🐛 (deploy-image/v1-alpha) : remove the namespaced option

Author: camilamacedo86

pkg/plugins/golang/deploy-image/v1alpha1/api.go

@@ -135,7 +135,6 @@ func (p *createAPISubcommand) BindFlags(fs *pflag.FlagSet) {
 		"version of CustomResourceDefinition to scaffold. Options: [v1, v1beta1]")
 
 	fs.StringVar(&p.options.Plural, "plural", "", "resource irregular plural form")
-	fs.BoolVar(&p.options.Namespaced, "namespaced", true, "resource is namespaced")
 
 	// (not required raise an error in this case)
 	// nolint:errcheck,gosec
@@ -152,6 +151,7 @@ func (p *createAPISubcommand) InjectResource(res *resource.Resource) error {
 	p.resource = res
 	p.options.DoAPI = true
 	p.options.DoController = true
+	p.options.Namespaced = true
 	p.options.UpdateResource(p.resource, p.config)
 
 	if err := p.resource.Validate(); err != nil {

pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller-test.go

@@ -80,7 +80,7 @@ var _ = Describe("{{ .Resource.Kind }} controller", func() {
 	// Define utility constants for object names and testing timeouts/durations and intervals.
 	const (
 		{{ .Resource.Kind }}Name      = "test-{{ lower .Resource.Kind }}"
-		{{ .Resource.Kind }}Namespace = "test-{{ lower .Resource.Kind }}"
+		{{ .Resource.Kind }}Namespace = "default"
 	)
 
 	Context("{{ .Resource.Kind }} controller test", func() {

test/testdata/generate.sh

@@ -109,8 +109,8 @@ function scaffold_test_project {
     $kb create api --group crew --version v1 --kind Admiral --controller=true --resource=true --namespaced=false --make=false
   elif [[ $project =~ deploy-image ]]; then
       header_text 'Creating Memcached API with deploy-image plugin ...'
-      $kb create api --group example.com --version v1alpha1 --kind Memcached --image=memcached:1.4.36-alpine --image-container-command="memcached,-m=64,-o,modern,-v" --image-container-port="11211" --run-as-user="1001" --plugins="deploy-image/v1-alpha" --make=false --namespaced=false
-      $kb create api --group example.com --version v1alpha1 --kind Busybox --image=busybox:1.28 --plugins="deploy-image/v1-alpha" --make=false --namespaced=false
+      $kb create api --group example.com --version v1alpha1 --kind Memcached --image=memcached:1.4.36-alpine --image-container-command="memcached,-m=64,-o,modern,-v" --image-container-port="11211" --run-as-user="1001" --plugins="deploy-image/v1-alpha" --make=false
+      $kb create api --group example.com --version v1alpha1 --kind Busybox --image=busybox:1.28 --plugins="deploy-image/v1-alpha" --make=false
       header_text 'Creating Memcached webhook ...'
       $kb create webhook --group example.com --version v1alpha1 --kind Memcached --programmatic-validation
   elif [[ $project == "project-v3" || $project == "project-v4" ]]; then

testdata/project-v3-with-deploy-image/PROJECT

@@ -24,6 +24,7 @@ repo: sigs.k8s.io/kubebuilder/testdata/project-v3-with-deploy-image
 resources:
 - api:
     crdVersion: v1
+    namespaced: true
   controller: true
   domain: testproject.org
   group: example.com
@@ -35,6 +36,7 @@ resources:
     webhookVersion: v1
 - api:
     crdVersion: v1
+    namespaced: true
   controller: true
   domain: testproject.org
   group: example.com

testdata/project-v3-with-deploy-image/api/v1alpha1/busybox_types.go

@@ -40,7 +40,6 @@ type BusyboxStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
-//+kubebuilder:resource:scope=Cluster
 
 // Busybox is the Schema for the busyboxes API
 type Busybox struct {

testdata/project-v3-with-deploy-image/api/v1alpha1/memcached_types.go

@@ -43,7 +43,6 @@ type MemcachedStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
-//+kubebuilder:resource:scope=Cluster
 
 // Memcached is the Schema for the memcacheds API
 type Memcached struct {

testdata/project-v3-with-deploy-image/config/crd/bases/example.com.testproject.org_busyboxes.yaml

@@ -13,7 +13,7 @@ spec:
     listKind: BusyboxList
     plural: busyboxes
     singular: busybox
-  scope: Cluster
+  scope: Namespaced
   versions:
   - name: v1alpha1
     schema:

testdata/project-v3-with-deploy-image/config/crd/bases/example.com.testproject.org_memcacheds.yaml

@@ -13,7 +13,7 @@ spec:
     listKind: MemcachedList
     plural: memcacheds
     singular: memcached
-  scope: Cluster
+  scope: Namespaced
   versions:
   - name: v1alpha1
     schema:

testdata/project-v3-with-deploy-image/controllers/busybox_controller_test.go

@@ -37,7 +37,7 @@ var _ = Describe("Busybox controller", func() {
 	// Define utility constants for object names and testing timeouts/durations and intervals.
 	const (
 		BusyboxName      = "test-busybox"
-		BusyboxNamespace = "test-busybox"
+		BusyboxNamespace = "default"
 	)
 
 	Context("Busybox controller test", func() {

testdata/project-v3-with-deploy-image/controllers/memcached_controller_test.go

@@ -37,7 +37,7 @@ var _ = Describe("Memcached controller", func() {
 	// Define utility constants for object names and testing timeouts/durations and intervals.
 	const (
 		MemcachedName      = "test-memcached"
-		MemcachedNamespace = "test-memcached"
+		MemcachedNamespace = "default"
 	)
 
 	Context("Memcached controller test", func() {