Merge pull request #216 from gibizer/crd-cleanup

Drop Debug fields
openstack-k8s-operators · Feb 5, 2024 · 00056af · 00056af
2 parents 8bdccc6 + 474d236
commit 00056af
Show file tree

Hide file tree

Showing 20 changed files with 67 additions and 769 deletions.
diff --git a/api/bases/ovn.openstack.org_ovncontrollers.yaml b/api/bases/ovn.openstack.org_ovncontrollers.yaml
@@ -48,16 +48,6 @@ spec:
           spec:
             description: OVNControllerSpec defines the desired state of OVNController
             properties:
-              debug:
-                description: Debug - enable debug for different deploy stages. If
-                  an init container is used, it runs and the actual action pod gets
-                  started with sleep infinity
-                properties:
-                  service:
-                    default: false
-                    description: Service enable debug
-                    type: boolean
-                type: object
               external-ids:
                 description: OVSExternalIDs is a set of configuration options for
                   OVS external-ids table

diff --git a/api/bases/ovn.openstack.org_ovndbclusters.yaml b/api/bases/ovn.openstack.org_ovndbclusters.yaml
@@ -57,16 +57,6 @@ spec:
                 description: DBType - NB or SB
                 pattern: ^NB|SB$
                 type: string
-              debug:
-                description: Debug - enable debug for different deploy stages. If
-                  an init container is used, it runs and the actual action pod gets
-                  started with sleep infinity
-                properties:
-                  service:
-                    default: false
-                    description: Service enable debug
-                    type: boolean
-                type: object
               electionTimer:
                 default: 10000
                 description: OVN Northbound and Southbound RAFT db election timer

diff --git a/api/bases/ovn.openstack.org_ovnnorthds.yaml b/api/bases/ovn.openstack.org_ovnnorthds.yaml
@@ -52,16 +52,6 @@ spec:
                 description: ContainerImage - Container Image URL (will be set to
                   environmental default if empty)
                 type: string
-              debug:
-                description: Debug - enable debug for different deploy stages. If
-                  an init container is used, it runs and the actual action pod gets
-                  started with sleep infinity
-                properties:
-                  service:
-                    default: false
-                    description: Service enable debug
-                    type: boolean
-                type: object
               logLevel:
                 default: info
                 description: LogLevel - Set log level info, dbg, emer etc

diff --git a/api/v1beta1/ovncontroller_types.go b/api/v1beta1/ovncontroller_types.go
@@ -49,11 +49,6 @@ type OVNControllerSpec struct {
 	// Image used for the ovn-controller container (will be set to environmental default if empty)
 	OvnContainerImage string `json:"ovnContainerImage"`
 
-	// +kubebuilder:validation:Optional
-	// Debug - enable debug for different deploy stages. If an init container is used, it runs and the
-	// actual action pod gets started with sleep infinity
-	Debug OVNControllerDebug `json:"debug,omitempty"`
-
 	// +kubebuilder:validation:Optional
 	// +optional
 	NicMappings map[string]string `json:"nicMappings,omitempty"`
@@ -80,14 +75,6 @@ type OVNControllerSpec struct {
 	NetworkAttachments []string `json:"networkAttachments,omitempty"`
 }
 
-// OVNControllerDebug defines the observed state of OVNControllerDebug
-type OVNControllerDebug struct {
-	// +kubebuilder:validation:Optional
-	// +kubebuilder:default=false
-	// Service enable debug
-	Service bool `json:"service"`
-}
-
 // OVNControllerStatus defines the observed state of OVNController
 type OVNControllerStatus struct {
 	// NumberReady of the OVNController instances
@@ -145,7 +132,7 @@ func (instance OVNController) IsReady() bool {
 type OVSExternalIDs struct {
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default="random"
-	SystemID  string `json:"system-id,omitempty"`
+	SystemID string `json:"system-id,omitempty"`
 
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default="br-int"

diff --git a/api/v1beta1/ovndbcluster_types.go b/api/v1beta1/ovndbcluster_types.go
@@ -72,11 +72,6 @@ type OVNDBClusterSpec struct {
 	// LogLevel - Set log level info, dbg, emer etc
 	LogLevel string `json:"logLevel"`
 
-	// +kubebuilder:validation:Optional
-	// Debug - enable debug for different deploy stages. If an init container is used, it runs and the
-	// actual action pod gets started with sleep infinity
-	Debug OVNDBClusterDebug `json:"debug,omitempty"`
-
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default=10000
 	// OVN Northbound and Southbound RAFT db election timer to use on db creation (in milliseconds)
@@ -111,14 +106,6 @@ type OVNDBClusterSpec struct {
 	NetworkAttachment string `json:"networkAttachment"`
 }
 
-// OVNDBclusterDebug defines the observed state of OVNDBClusterDebug
-type OVNDBClusterDebug struct {
-	// +kubebuilder:validation:Optional
-	// +kubebuilder:default=false
-	// Service enable debug
-	Service bool `json:"service"`
-}
-
 // OVNDBClusterStatus defines the observed state of OVNDBCluster
 type OVNDBClusterStatus struct {
 	// ReadyCount of OVN DBCluster instances

diff --git a/api/v1beta1/ovnnorthd_types.go b/api/v1beta1/ovnnorthd_types.go
@@ -43,11 +43,6 @@ type OVNNorthdSpec struct {
 	// Replicas of OVN Northd to run
 	Replicas *int32 `json:"replicas"`
 
-	// +kubebuilder:validation:Optional
-	// Debug - enable debug for different deploy stages. If an init container is used, it runs and the
-	// actual action pod gets started with sleep infinity
-	Debug OVNNorthdDebug `json:"debug,omitempty"`
-
 	// +kubebuilder:validation:Optional
 	// NodeSelector to target subset of worker nodes running this service
 	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
@@ -68,14 +63,6 @@ type OVNNorthdSpec struct {
 	NetworkAttachment string `json:"networkAttachment"`
 }
 
-// OVNNorthdDebug defines the observed state of NeutronAPIDebug
-type OVNNorthdDebug struct {
-	// +kubebuilder:validation:Optional
-	// +kubebuilder:default=false
-	// Service enable debug
-	Service bool `json:"service"`
-}
-
 // OVNNorthdStatus defines the observed state of OVNNorthd
 type OVNNorthdStatus struct {
 	// ReadyCount of OVN Northd instances

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/ovn.openstack.org_ovncontrollers.yaml b/config/crd/bases/ovn.openstack.org_ovncontrollers.yaml
@@ -48,16 +48,6 @@ spec:
           spec:
             description: OVNControllerSpec defines the desired state of OVNController
             properties:
-              debug:
-                description: Debug - enable debug for different deploy stages. If
-                  an init container is used, it runs and the actual action pod gets
-                  started with sleep infinity
-                properties:
-                  service:
-                    default: false
-                    description: Service enable debug
-                    type: boolean
-                type: object
               external-ids:
                 description: OVSExternalIDs is a set of configuration options for
                   OVS external-ids table

diff --git a/config/crd/bases/ovn.openstack.org_ovndbclusters.yaml b/config/crd/bases/ovn.openstack.org_ovndbclusters.yaml
@@ -57,16 +57,6 @@ spec:
                 description: DBType - NB or SB
                 pattern: ^NB|SB$
                 type: string
-              debug:
-                description: Debug - enable debug for different deploy stages. If
-                  an init container is used, it runs and the actual action pod gets
-                  started with sleep infinity
-                properties:
-                  service:
-                    default: false
-                    description: Service enable debug
-                    type: boolean
-                type: object
               electionTimer:
                 default: 10000
                 description: OVN Northbound and Southbound RAFT db election timer

diff --git a/config/crd/bases/ovn.openstack.org_ovnnorthds.yaml b/config/crd/bases/ovn.openstack.org_ovnnorthds.yaml
@@ -52,16 +52,6 @@ spec:
                 description: ContainerImage - Container Image URL (will be set to
                   environmental default if empty)
                 type: string
-              debug:
-                description: Debug - enable debug for different deploy stages. If
-                  an init container is used, it runs and the actual action pod gets
-                  started with sleep infinity
-                properties:
-                  service:
-                    default: false
-                    description: Service enable debug
-                    type: boolean
-                type: object
               logLevel:
                 default: info
                 description: LogLevel - Set log level info, dbg, emer etc