Skip to content

Commit 41137b9

Browse files
authored
Revert "[release-ltsr] set value of csvInjector enable to true in nss CR (#189)" (#196)
This reverts commit f3663de.
1 parent 230e0c0 commit 41137b9

File tree

4 files changed

+4
-11
lines changed

4 files changed

+4
-11
lines changed

api/v1/namespacescope_types.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ type NamespaceScopeSpec struct {
4141
ManualManagement bool `json:"manualManagement,omitempty"`
4242

4343
// When CSVInjector is enabled, operator will inject the watch namespace list into operator csv.
44-
// +kubebuilder:default:={enable:true}
4544
CSVInjector CSVInjector `json:"csvInjector,omitempty"`
4645
}
4746

4847
// CSVInjector manages if operator will insert labels and WATCH_NAMESPACES in CSV automatically
4948
type CSVInjector struct {
49+
// +kubebuilder:default:=true
5050
Enable bool `json:"enable"`
5151
}
5252

@@ -67,7 +67,6 @@ type NamespaceScope struct {
6767
metav1.TypeMeta `json:",inline"`
6868
metav1.ObjectMeta `json:"metadata,omitempty"`
6969

70-
// +kubebuilder:pruning:PreserveUnknownFields
7170
Spec NamespaceScopeSpec `json:"spec,omitempty"`
7271
Status NamespaceScopeStatus `json:"status,omitempty"`
7372
}

bundle-restricted/manifests/operator.ibm.com_namespacescopes.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,11 @@ spec:
4141
to be watched
4242
type: string
4343
csvInjector:
44-
default:
45-
enable: true
4644
description: When CSVInjector is enabled, operator will inject the
4745
watch namespace list into operator csv.
4846
properties:
4947
enable:
48+
default: true
5049
type: boolean
5150
required:
5251
- enable
@@ -76,7 +75,6 @@ spec:
7675
type: string
7776
type: array
7877
type: object
79-
x-kubernetes-preserve-unknown-fields: true
8078
status:
8179
description: NamespaceScopeStatus defines the observed state of NamespaceScope
8280
properties:

bundle/manifests/operator.ibm.com_namespacescopes.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,11 @@ spec:
4141
to be watched
4242
type: string
4343
csvInjector:
44-
default:
45-
enable: true
4644
description: When CSVInjector is enabled, operator will inject the
4745
watch namespace list into operator csv.
4846
properties:
4947
enable:
48+
default: true
5049
type: boolean
5150
required:
5251
- enable
@@ -76,7 +75,6 @@ spec:
7675
type: string
7776
type: array
7877
type: object
79-
x-kubernetes-preserve-unknown-fields: true
8078
status:
8179
description: NamespaceScopeStatus defines the observed state of NamespaceScope
8280
properties:

config/crd/bases/operator.ibm.com_namespacescopes.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,10 @@ spec:
3838
description: ConfigMap name that will contain the list of namespaces to be watched
3939
type: string
4040
csvInjector:
41-
default:
42-
enable: true
4341
description: When CSVInjector is enabled, operator will inject the watch namespace list into operator csv.
4442
properties:
4543
enable:
44+
default: true
4645
type: boolean
4746
required:
4847
- enable
@@ -66,7 +65,6 @@ spec:
6665
type: string
6766
type: array
6867
type: object
69-
x-kubernetes-preserve-unknown-fields: true
7068
status:
7169
description: NamespaceScopeStatus defines the observed state of NamespaceScope
7270
properties:

0 commit comments

Comments
 (0)