Merge pull request #266 from 3scale-ops/clenaup/system-sphinx

Cleanup/Remove system-sphinx from System API
3scale-ops · Jul 4, 2023 · d6e2664 · d6e2664
2 parents f8d510a + f20fde4
commit d6e2664
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 175 deletions.
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION ?= 0.19.10
+VERSION ?= 0.19.11
 
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")

diff --git a/api/v1alpha1/system_types.go b/api/v1alpha1/system_types.go
@@ -163,9 +163,6 @@ var (
 		MaxThreads: pointer.Int32(15),
 	}
 
-	// Sphinx
-	systemDefaultSphinxEnabled bool = false
-
 	// Searchd
 	systemDefaultSearchdEnabled bool             = true
 	systemDefaultSearchdImage   defaultImageSpec = defaultImageSpec{
@@ -238,10 +235,6 @@ type SystemSpec struct {
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
 	// +optional
 	SidekiqLow *SystemSidekiqSpec `json:"sidekiqLow,omitempty"`
-	// DEPRECATED Sphinx specific configuration options
-	// +operator-sdk:csv:customresourcedefinitions:type=spec
-	// +optional
-	Sphinx *SystemSphinxSpec `json:"sphinx,omitempty"`
 	// Searchd specific configuration options
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
 	// +optional
@@ -291,11 +284,6 @@ func (spec *SystemSpec) Default() {
 	}
 	spec.Searchd.Default()
 
-	if spec.Sphinx == nil {
-		spec.Sphinx = &SystemSphinxSpec{}
-	}
-	spec.Sphinx.Default(spec.Image)
-
 	if spec.Console == nil {
 		spec.Console = &SystemRailsConsoleSpec{}
 	}
@@ -786,39 +774,6 @@ func (spec *SystemSidekiqSpec) Default(sidekiqType systemSidekiqType) {
 	}
 }
 
-// SystemSphinxSpec configures the App component of System
-type SystemSphinxSpec struct {
-	// Configuration options for System's sphinx
-	// +operator-sdk:csv:customresourcedefinitions:type=spec
-	// +optional
-	Config *SphinxConfig `json:"config,omitempty"`
-}
-
-// Default implements defaulting for the system sphinx component
-func (spec *SystemSphinxSpec) Default(systemDefaultImage *ImageSpec) {
-
-	if spec.Config == nil {
-		spec.Config = &SphinxConfig{}
-	}
-	spec.Config.Default()
-}
-
-// SphinxConfig has configuration options for System's sphinx
-type SphinxConfig struct {
-	// Deploy Sphinx instance
-	// +operator-sdk:csv:customresourcedefinitions:type=spec
-	// +optional
-	Enabled *bool `json:"enabled,omitempty"`
-}
-
-// Default implements defaulting for SphinxConfig
-func (sc *SphinxConfig) Default() {
-
-	sc.Enabled = boolOrDefault(
-		sc.Enabled, pointer.Bool(systemDefaultSphinxEnabled),
-	)
-}
-
 // SystemSearchdSpec configures the App component of System
 type SystemSearchdSpec struct {
 	// Deploy searchd instance
@@ -858,7 +813,7 @@ type SystemSearchdSpec struct {
 	TerminationGracePeriodSeconds *int64 `json:"terminationGracePeriodSeconds,omitempty"`
 }
 
-// Default implements defaulting for the system sphinx component
+// Default implements defaulting for the system searchd component
 func (spec *SystemSearchdSpec) Default() {
 	spec.Enabled = boolOrDefault(spec.Enabled, pointer.Bool(systemDefaultSearchdEnabled))
 	spec.Image = InitializeImageSpec(spec.Image, defaultImageSpec(systemDefaultSearchdImage))
@@ -874,7 +829,7 @@ func (spec *SystemSearchdSpec) Default() {
 	)
 }
 
-// SearchdConfig has configuration options for System's sphinx
+// SearchdConfig has configuration options for System's searchd
 type SearchdConfig struct {
 	// Allows setting the service name for Searchd
 	// +operator-sdk:csv:customresourcedefinitions:type=spec

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/bundle/manifests/saas-operator.clusterserviceversion.yaml b/bundle/manifests/saas-operator.clusterserviceversion.yaml
@@ -627,15 +627,15 @@ metadata:
     capabilities: Basic Install
     categories: Integration & Delivery
     containerImage: quay.io/3scale/saas-operator
-    createdAt: "2023-07-03T09:28:53Z"
+    createdAt: "2023-07-03T15:19:09Z"
     description: |-
       The 3scale SaaS Operator creates and maintains a SaaS-ready deployment
       of the Red Hat 3scale API Management on OpenShift.
     operators.operatorframework.io/builder: operator-sdk-v1.27.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/3scale/saas-operator
     support: Red Hat
-  name: saas-operator.v0.19.10
+  name: saas-operator.v0.19.11
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -3803,15 +3803,6 @@ spec:
       - description: Configures the TerminationGracePeriodSeconds
         displayName: Termination Grace Period Seconds
         path: sidekiqLow.terminationGracePeriodSeconds
-      - description: DEPRECATED Sphinx specific configuration options
-        displayName: Sphinx
-        path: sphinx
-      - description: Configuration options for System's sphinx
-        displayName: Config
-        path: sphinx.config
-      - description: Deploy Sphinx instance
-        displayName: Enabled
-        path: sphinx.config.enabled
       - description: Configures twemproxy
         displayName: Twemproxy
         path: twemproxy
@@ -4386,7 +4377,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
-                image: quay.io/3scale/saas-operator:v0.19.10
+                image: quay.io/3scale/saas-operator:v0.19.11
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -4900,4 +4891,4 @@ spec:
   provider:
     name: Red Hat
     url: https://www.3scale.net/
-  version: 0.19.10
+  version: 0.19.11
diff --git a/bundle/manifests/saas.3scale.net_systems.yaml b/bundle/manifests/saas.3scale.net_systems.yaml
@@ -4026,17 +4026,6 @@ spec:
                       type: object
                     type: array
                 type: object
-              sphinx:
-                description: DEPRECATED Sphinx specific configuration options
-                properties:
-                  config:
-                    description: Configuration options for System's sphinx
-                    properties:
-                      enabled:
-                        description: Deploy Sphinx instance
-                        type: boolean
-                    type: object
-                type: object
               twemproxy:
                 description: Configures twemproxy
                 properties:

diff --git a/config/crd/bases/saas.3scale.net_systems.yaml b/config/crd/bases/saas.3scale.net_systems.yaml
@@ -4027,17 +4027,6 @@ spec:
                       type: object
                     type: array
                 type: object
-              sphinx:
-                description: DEPRECATED Sphinx specific configuration options
-                properties:
-                  config:
-                    description: Configuration options for System's sphinx
-                    properties:
-                      enabled:
-                        description: Deploy Sphinx instance
-                        type: boolean
-                    type: object
-                type: object
               twemproxy:
                 description: Configures twemproxy
                 properties:

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -13,4 +13,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/3scale/saas-operator
-  newTag: v0.19.10
+  newTag: v0.19.11
diff --git a/config/manifests/bases/saas-operator.clusterserviceversion.yaml b/config/manifests/bases/saas-operator.clusterserviceversion.yaml
@@ -3315,15 +3315,6 @@ spec:
       - description: Configures the TerminationGracePeriodSeconds
         displayName: Termination Grace Period Seconds
         path: sidekiqLow.terminationGracePeriodSeconds
-      - description: DEPRECATED Sphinx specific configuration options
-        displayName: Sphinx
-        path: sphinx
-      - description: Configuration options for System's sphinx
-        displayName: Config
-        path: sphinx.config
-      - description: Deploy Sphinx instance
-        displayName: Enabled
-        path: sphinx.config.enabled
       - description: Configures twemproxy
         displayName: Twemproxy
         path: twemproxy

diff --git a/docs/api-reference/reference.asciidoc b/docs/api-reference/reference.asciidoc
@@ -1343,7 +1343,7 @@ SMTPSpec has options to configure system's SMTP
 [id="{anchor_prefix}-github-com-3scale-saas-operator-api-v1alpha1-searchdconfig"]
 ==== SearchdConfig 
 
-SearchdConfig has configuration options for System's sphinx
+SearchdConfig has configuration options for System's searchd
 
 .Appears In:
 ****
@@ -1548,23 +1548,6 @@ SidekiqConfig configures app behavior for System Sidekiq
 |===
 
 
-[id="{anchor_prefix}-github-com-3scale-saas-operator-api-v1alpha1-sphinxconfig"]
-==== SphinxConfig 
-
-SphinxConfig has configuration options for System's sphinx
-
-.Appears In:
-****
-- xref:{anchor_prefix}-github-com-3scale-saas-operator-api-v1alpha1-systemsphinxspec[$$SystemSphinxSpec$$]
-****
-
-[cols="25a,75a", options="header"]
-|===
-| Field | Description
-| *`enabled`* __boolean__ | Deploy Sphinx instance
-|===
-
-
 [id="{anchor_prefix}-github-com-3scale-saas-operator-api-v1alpha1-system"]
 ==== System 
 
@@ -1804,31 +1787,13 @@ SystemSpec defines the desired state of System
 | *`sidekiqDefault`* __xref:{anchor_prefix}-github-com-3scale-saas-operator-api-v1alpha1-systemsidekiqspec[$$SystemSidekiqSpec$$]__ | Sidekiq Default specific configuration options
 | *`sidekiqBilling`* __xref:{anchor_prefix}-github-com-3scale-saas-operator-api-v1alpha1-systemsidekiqspec[$$SystemSidekiqSpec$$]__ | Sidekiq Billing specific configuration options
 | *`sidekiqLow`* __xref:{anchor_prefix}-github-com-3scale-saas-operator-api-v1alpha1-systemsidekiqspec[$$SystemSidekiqSpec$$]__ | Sidekiq Low specific configuration options
-| *`sphinx`* __xref:{anchor_prefix}-github-com-3scale-saas-operator-api-v1alpha1-systemsphinxspec[$$SystemSphinxSpec$$]__ | DEPRECATED Sphinx specific configuration options
 | *`searchd`* __xref:{anchor_prefix}-github-com-3scale-saas-operator-api-v1alpha1-systemsearchdspec[$$SystemSearchdSpec$$]__ | Searchd specific configuration options
 | *`console`* __xref:{anchor_prefix}-github-com-3scale-saas-operator-api-v1alpha1-systemrailsconsolespec[$$SystemRailsConsoleSpec$$]__ | Console specific configuration options
 | *`grafanaDashboard`* __xref:{anchor_prefix}-github-com-3scale-saas-operator-api-v1alpha1-grafanadashboardspec[$$GrafanaDashboardSpec$$]__ | Configures the Grafana Dashboard for the component
 | *`twemproxy`* __xref:{anchor_prefix}-github-com-3scale-saas-operator-api-v1alpha1-twemproxyspec[$$TwemproxySpec$$]__ | Configures twemproxy
 |===
 
 
-[id="{anchor_prefix}-github-com-3scale-saas-operator-api-v1alpha1-systemsphinxspec"]
-==== SystemSphinxSpec 
-
-SystemSphinxSpec configures the App component of System
-
-.Appears In:
-****
-- xref:{anchor_prefix}-github-com-3scale-saas-operator-api-v1alpha1-systemspec[$$SystemSpec$$]
-****
-
-[cols="25a,75a", options="header"]
-|===
-| Field | Description
-| *`config`* __xref:{anchor_prefix}-github-com-3scale-saas-operator-api-v1alpha1-sphinxconfig[$$SphinxConfig$$]__ | Configuration options for System's sphinx
-|===
-
-
 
 
 [id="{anchor_prefix}-github-com-3scale-saas-operator-api-v1alpha1-systemzyncspec"]

diff --git a/pkg/version/version.go b/pkg/version/version.go
@@ -1,7 +1,7 @@
 package version
 
 const (
-	version string = "v0.19.10"
+	version string = "v0.19.11"
 )
 
 // Current returns the current marin3r operator version