[release-ltsr] set value of csvInjector enable to true in nss CR (#189)

ibm-ci-bot · YCShen1010 · web-flow · commit f3663de2ad69 · 2022-10-07T23:32:05.000+08:00
* set value of csvInjector enable to true

Signed-off-by: YCShen1010 &lt;yuchen.shen@mail.utoronto.ca&gt;

* set csvInjector enable to true by default

Signed-off-by: YCShen1010 &lt;yuchen.shen@mail.utoronto.ca&gt;

Signed-off-by: YCShen1010 &lt;yuchen.shen@mail.utoronto.ca&gt;
Co-authored-by: YCShen1010 &lt;yuchen.shen@mail.utoronto.ca&gt;
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,6 +67,7 @@ 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
@@ -41,11 +41,12 @@ spec:
                   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
@@ -75,6 +76,7 @@ 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
@@ -41,11 +41,12 @@ spec:
                   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
@@ -75,6 +76,7 @@ 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
@@ -38,10 +38,11 @@ spec:
                 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
@@ -65,6 +66,7 @@ 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}`
`44`	`45`	CSVInjector CSVInjector `json:"csvInjector,omitempty"`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`// CSVInjector manages if operator will insert labels and WATCH_NAMESPACES in CSV automatically`
`48`	`49`	`type CSVInjector struct {`
`49`		`- // +kubebuilder:default:=true`
`50`	`50`	Enable bool `json:"enable"`
`51`	`51`	`}`
`52`	`52`
`@@ -67,6 +67,7 @@ type NamespaceScope struct {`
`67`	`67`	metav1.TypeMeta `json:",inline"`
`68`	`68`	metav1.ObjectMeta `json:"metadata,omitempty"`
`69`	`69`
	`70`	`+ // +kubebuilder:pruning:PreserveUnknownFields`
`70`	`71`	Spec NamespaceScopeSpec `json:"spec,omitempty"`
`71`	`72`	Status NamespaceScopeStatus `json:"status,omitempty"`
`72`	`73`	`}`