Revert "set value of csvInjector enable to true in nss CR (#187)" (#195)

Daniel-Fan · web-flow · commit 09a218d1a6d8 · 2022-10-19T05:55:09.000+08:00
This reverts commit 39832d0.
diff --git a/api/v1/namespacescope_types.go b/api/v1/namespacescope_types.go
@@ -41,12 +41,12 @@ type NamespaceScopeSpec struct {
 	ManualManagement bool `json:"manualManagement,omitempty"`
 
 	// When CSVInjector is enabled, operator will inject the watch namespace list into operator csv.
-	// +kubebuilder:default:={enable:true}
 	CSVInjector CSVInjector `json:"csvInjector,omitempty"`
 }
 
 // CSVInjector manages if operator will insert labels and WATCH_NAMESPACES in CSV automatically
 type CSVInjector struct {
+	// +kubebuilder:default:=true
 	Enable bool `json:"enable"`
 }
 
@@ -67,7 +67,6 @@ type NamespaceScope struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	// +kubebuilder:pruning:PreserveUnknownFields
 	Spec   NamespaceScopeSpec   `json:"spec,omitempty"`
 	Status NamespaceScopeStatus `json:"status,omitempty"`
 }
diff --git a/bundle-restricted/manifests/operator.ibm.com_namespacescopes.yaml b/bundle-restricted/manifests/operator.ibm.com_namespacescopes.yaml
@@ -34,19 +34,19 @@ spec:
           metadata:
             type: object
           spec:
+            x-kubernetes-preserve-unknown-fields: true
             description: NamespaceScopeSpec defines the desired state of NamespaceScope
             properties:
               configmapName:
                 description: ConfigMap name that will contain the list of namespaces
                   to be watched
                 type: string
               csvInjector:
-                default:
-                  enable: true
                 description: When CSVInjector is enabled, operator will inject the
                   watch namespace list into operator csv.
                 properties:
                   enable:
+                    default: true
                     type: boolean
                 required:
                 - enable
@@ -76,7 +76,6 @@ spec:
                   type: string
                 type: array
             type: object
-            x-kubernetes-preserve-unknown-fields: true
           status:
             description: NamespaceScopeStatus defines the observed state of NamespaceScope
             properties:
diff --git a/bundle/manifests/operator.ibm.com_namespacescopes.yaml b/bundle/manifests/operator.ibm.com_namespacescopes.yaml
@@ -34,19 +34,19 @@ spec:
           metadata:
             type: object
           spec:
+            x-kubernetes-preserve-unknown-fields: true
             description: NamespaceScopeSpec defines the desired state of NamespaceScope
             properties:
               configmapName:
                 description: ConfigMap name that will contain the list of namespaces
                   to be watched
                 type: string
               csvInjector:
-                default:
-                  enable: true
                 description: When CSVInjector is enabled, operator will inject the
                   watch namespace list into operator csv.
                 properties:
                   enable:
+                    default: true
                     type: boolean
                 required:
                 - enable
@@ -76,7 +76,6 @@ spec:
                   type: string
                 type: array
             type: object
-            x-kubernetes-preserve-unknown-fields: true
           status:
             description: NamespaceScopeStatus defines the observed state of NamespaceScope
             properties:
diff --git a/config/crd/bases/operator.ibm.com_namespacescopes.yaml b/config/crd/bases/operator.ibm.com_namespacescopes.yaml
@@ -32,17 +32,17 @@ spec:
           metadata:
             type: object
           spec:
+            x-kubernetes-preserve-unknown-fields: true
             description: NamespaceScopeSpec defines the desired state of NamespaceScope
             properties:
               configmapName:
                 description: ConfigMap name that will contain the list of namespaces to be watched
                 type: string
               csvInjector:
-                default:
-                  enable: true
                 description: When CSVInjector is enabled, operator will inject the watch namespace list into operator csv.
                 properties:
                   enable:
+                    default: true
                     type: boolean
                 required:
                 - enable
@@ -66,7 +66,6 @@ spec:
                   type: string
                 type: array
             type: object
-            x-kubernetes-preserve-unknown-fields: true
           status:
             description: NamespaceScopeStatus defines the observed state of NamespaceScope
             properties:

Original file line number	Diff line number	Diff line change
`@@ -41,12 +41,12 @@ type NamespaceScopeSpec struct {`
`41`	`41`	ManualManagement bool `json:"manualManagement,omitempty"`
`42`	`42`
`43`	`43`	`// When CSVInjector is enabled, operator will inject the watch namespace list into operator csv.`
`44`		`- // +kubebuilder:default:={enable:true}`
`45`	`44`	CSVInjector CSVInjector `json:"csvInjector,omitempty"`
`46`	`45`	`}`
`47`	`46`
`48`	`47`	`// CSVInjector manages if operator will insert labels and WATCH_NAMESPACES in CSV automatically`
`49`	`48`	`type CSVInjector struct {`
	`49`	`+ // +kubebuilder:default:=true`
`50`	`50`	Enable bool `json:"enable"`
`51`	`51`	`}`
`52`	`52`
`@@ -67,7 +67,6 @@ type NamespaceScope struct {`
`67`	`67`	metav1.TypeMeta `json:",inline"`
`68`	`68`	metav1.ObjectMeta `json:"metadata,omitempty"`
`69`	`69`
`70`		`- // +kubebuilder:pruning:PreserveUnknownFields`
`71`	`70`	Spec NamespaceScopeSpec `json:"spec,omitempty"`
`72`	`71`	Status NamespaceScopeStatus `json:"status,omitempty"`
`73`	`72`	`}`