Merge pull request #748 from stuggi/trash_redis

Remove redis
openstack-k8s-operators · Apr 16, 2024 · 726e5cc · 726e5cc
2 parents 9e8ef7d + 2b3dcc4
commit 726e5cc
Show file tree

Hide file tree

Showing 28 changed files with 19 additions and 436 deletions.
diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -15594,28 +15594,6 @@ spec:
                       type: object
                     type: object
                 type: object
-              redis:
-                properties:
-                  enabled:
-                    default: false
-                    type: boolean
-                  templates:
-                    additionalProperties:
-                      properties:
-                        replicas:
-                          default: 1
-                          format: int32
-                          type: integer
-                        tls:
-                          properties:
-                            caBundleSecretName:
-                              type: string
-                            secretName:
-                              type: string
-                          type: object
-                      type: object
-                    type: object
-                type: object
               secret:
                 type: string
               storageClass:
@@ -17321,8 +17299,6 @@ spec:
                     type: string
                   infraMemcachedImage:
                     type: string
-                  infraRedisImage:
-                    type: string
                   ironicAPIImage:
                     type: string
                   ironicConductorImage:

diff --git a/apis/bases/core.openstack.org_openstackversions.yaml b/apis/bases/core.openstack.org_openstackversions.yaml
@@ -123,8 +123,6 @@ spec:
                     type: string
                   infraMemcachedImage:
                     type: string
-                  infraRedisImage:
-                    type: string
                   ironicAPIImage:
                     type: string
                   ironicConductorImage:
@@ -314,8 +312,6 @@ spec:
                       type: string
                     infraMemcachedImage:
                       type: string
-                    infraRedisImage:
-                      type: string
                     ironicAPIImage:
                       type: string
                     ironicConductorImage:
@@ -474,8 +470,6 @@ spec:
                     type: string
                   infraMemcachedImage:
                     type: string
-                  infraRedisImage:
-                    type: string
                   ironicAPIImage:
                     type: string
                   ironicConductorImage:

diff --git a/apis/core/v1beta1/conditions.go b/apis/core/v1beta1/conditions.go
@@ -129,9 +129,6 @@ const (
 	// OpenStackControlPlaneBarbicanReadyCondition Status=True condition which indicates if Barbican is configured and operational
 	OpenStackControlPlaneBarbicanReadyCondition condition.Type = "OpenStackControlPlaneBarbicanReady"
 
-	// OpenStackControlPlaneRedisReadyCondition Status=True condition which indicates if Redis is configured and operational
-	OpenStackControlPlaneRedisReadyCondition condition.Type = "OpenStackControlPlaneRedisReady"
-
 	// OpenStackControlPlaneExposeOctaviaReadyCondition Status=True condition which indicates if Octavia is exposed via a route
 	OpenStackControlPlaneExposeOctaviaReadyCondition condition.Type = "OpenStackControlPlaneExposeOctaviaReady"
 
@@ -403,18 +400,6 @@ const (
 	// OpenStackControlPlaneManilaReadyErrorMessage
 	OpenStackControlPlaneManilaReadyErrorMessage = "OpenStackControlPlane Manila error occured %s"
 
-	// OpenStackControlPlaneRedisReadyInitMessage
-	OpenStackControlPlaneRedisReadyInitMessage = "OpenStackControlPlane Redis not started"
-
-	// OpenStackControlPlaneRedisReadyMessage
-	OpenStackControlPlaneRedisReadyMessage = "OpenStackControlPlane Redis completed"
-
-	// OpenStackControlPlaneRedisReadyRunningMessage
-	OpenStackControlPlaneRedisReadyRunningMessage = "OpenStackControlPlane Redis in progress"
-
-	// OpenStackControlPlaneRedisReadyErrorMessage
-	OpenStackControlPlaneRedisReadyErrorMessage = "OpenStackControlPlane Redis error occured %s"
-
 	// OpenStackControlPlaneExposeServiceReadyInitMessage
 	OpenStackControlPlaneExposeServiceReadyInitMessage = "OpenStackControlPlane %s exposing service %s not started"
 

diff --git a/apis/core/v1beta1/openstackcontrolplane_types.go b/apis/core/v1beta1/openstackcontrolplane_types.go
@@ -25,7 +25,6 @@ import (
 	horizonv1 "github.com/openstack-k8s-operators/horizon-operator/api/v1beta1"
 	memcachedv1 "github.com/openstack-k8s-operators/infra-operator/apis/memcached/v1beta1"
 	networkv1 "github.com/openstack-k8s-operators/infra-operator/apis/network/v1beta1"
-	redisv1 "github.com/openstack-k8s-operators/infra-operator/apis/redis/v1beta1"
 	ironicv1 "github.com/openstack-k8s-operators/ironic-operator/api/v1beta1"
 	keystonev1 "github.com/openstack-k8s-operators/keystone-operator/api/v1beta1"
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
@@ -170,9 +169,6 @@ type OpenStackControlPlaneSpec struct {
 	// Barbican - Parameters related to the Barbican service
 	Barbican BarbicanSection `json:"barbican,omitempty"`
 
-	// Redis - Parameters related to the Redis service
-	Redis RedisSection `json:"redis,omitempty"`
-
 	// +kubebuilder:validation:Optional
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
 	// OpenStackClient - Parameters related to the OpenStackClient
@@ -713,20 +709,6 @@ type BarbicanSection struct {
 	APIOverride Override `json:"apiOverride,omitempty"`
 }
 
-// RedisSection defines the desired state of the Redis service
-type RedisSection struct {
-	// +kubebuilder:validation:Optional
-	// Enabled - Whether the Redis service should be deployed and managed
-	// +kubebuilder:default=false
-	// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:booleanSwitch"}
-	Enabled bool `json:"enabled"`
-
-	// +kubebuilder:validation:Optional
-	//+operator-sdk:csv:customresourcedefinitions:type=spec
-	// Templates - Overrides to use when creating the Redis Resources
-	Templates map[string]redisv1.RedisSpecCore `json:"templates,omitempty"`
-}
-
 // OpenStackClientSection defines the desired state of the OpenStackClient
 type OpenStackClientSection struct {
 	// +kubebuilder:validation:Optional
@@ -847,7 +829,6 @@ func (instance *OpenStackControlPlane) InitConditions() {
 		condition.UnknownCondition(OpenStackControlPlaneOctaviaReadyCondition, condition.InitReason, OpenStackControlPlaneOctaviaReadyInitMessage),
 		condition.UnknownCondition(OpenStackControlPlaneDesignateReadyCondition, condition.InitReason, OpenStackControlPlaneDesignateReadyInitMessage),
 		condition.UnknownCondition(OpenStackControlPlaneBarbicanReadyCondition, condition.InitReason, OpenStackControlPlaneBarbicanReadyInitMessage),
-		condition.UnknownCondition(OpenStackControlPlaneRedisReadyCondition, condition.InitReason, OpenStackControlPlaneRedisReadyInitMessage),
 		condition.UnknownCondition(OpenStackControlPlaneCAReadyCondition, condition.InitReason, OpenStackControlPlaneCAReadyInitMessage),
 
 		// Also add the overall status condition as Unknown

diff --git a/apis/core/v1beta1/openstackcontrolplane_webhook.go b/apis/core/v1beta1/openstackcontrolplane_webhook.go
@@ -161,7 +161,6 @@ func (r *OpenStackControlPlane) checkDepsEnabled(name string) string {
 			reqs = "Galera, Keystone"
 		}
 	case "Octavia":
-		// TODO(beagles): So far we haven't declared Redis as dependency for Octavia, but we might.
 		if !((r.Spec.Galera.Enabled) && r.Spec.Memcached.Enabled && r.Spec.Rabbitmq.Enabled &&
 			r.Spec.Keystone.Enabled && r.Spec.Neutron.Enabled && r.Spec.Glance.Enabled && r.Spec.Nova.Enabled &&
 			r.Spec.Ovn.Enabled) {
@@ -420,11 +419,4 @@ func (r *OpenStackControlPlane) DefaultServices() {
 
 	// Barbican
 	r.Spec.Barbican.Template.Default()
-
-	// Redis
-	for key, template := range r.Spec.Redis.Templates {
-		template.Default()
-		// By-value copy, need to update
-		r.Spec.Redis.Templates[key] = template
-	}
 }
diff --git a/apis/core/v1beta1/openstackversion_types.go b/apis/core/v1beta1/openstackversion_types.go
@@ -108,7 +108,6 @@ type ContainerTemplate struct {
 	HorizonImage                  *string `json:"horizonImage,omitempty"`
 	InfraDnsmasqImage             *string `json:"infraDnsmasqImage,omitempty"`
 	InfraMemcachedImage           *string `json:"infraMemcachedImage,omitempty"`
-	InfraRedisImage               *string `json:"infraRedisImage,omitempty"`
 	IronicAPIImage                *string `json:"ironicAPIImage,omitempty"`
 	IronicConductorImage          *string `json:"ironicConductorImage,omitempty"`
 	IronicInspectorImage          *string `json:"ironicInspectorImage,omitempty"`

diff --git a/apis/core/v1beta1/zz_generated.deepcopy.go b/apis/core/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -15594,28 +15594,6 @@ spec:
                       type: object
                     type: object
                 type: object
-              redis:
-                properties:
-                  enabled:
-                    default: false
-                    type: boolean
-                  templates:
-                    additionalProperties:
-                      properties:
-                        replicas:
-                          default: 1
-                          format: int32
-                          type: integer
-                        tls:
-                          properties:
-                            caBundleSecretName:
-                              type: string
-                            secretName:
-                              type: string
-                          type: object
-                      type: object
-                    type: object
-                type: object
               secret:
                 type: string
               storageClass:
@@ -17321,8 +17299,6 @@ spec:
                     type: string
                   infraMemcachedImage:
                     type: string
-                  infraRedisImage:
-                    type: string
                   ironicAPIImage:
                     type: string
                   ironicConductorImage:

diff --git a/config/crd/bases/core.openstack.org_openstackversions.yaml b/config/crd/bases/core.openstack.org_openstackversions.yaml
@@ -123,8 +123,6 @@ spec:
                     type: string
                   infraMemcachedImage:
                     type: string
-                  infraRedisImage:
-                    type: string
                   ironicAPIImage:
                     type: string
                   ironicConductorImage:
@@ -314,8 +312,6 @@ spec:
                       type: string
                     infraMemcachedImage:
                       type: string
-                    infraRedisImage:
-                      type: string
                     ironicAPIImage:
                       type: string
                     ironicConductorImage:
@@ -474,8 +470,6 @@ spec:
                     type: string
                   infraMemcachedImage:
                     type: string
-                  infraRedisImage:
-                    type: string
                   ironicAPIImage:
                     type: string
                   ironicConductorImage:

diff --git a/config/manifests/bases/openstack-operator.clusterserviceversion.yaml b/config/manifests/bases/openstack-operator.clusterserviceversion.yaml
@@ -346,14 +346,6 @@ spec:
       - description: Templates - Overrides to use when creating the Rabbitmq clusters
         displayName: Templates
         path: rabbitmq.templates
-      - description: Enabled - Whether the Redis service should be deployed and managed
-        displayName: Enabled
-        path: redis.enabled
-        x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:booleanSwitch
-      - description: Templates - Overrides to use when creating the Redis Resources
-        displayName: Templates
-        path: redis.templates
       - description: 'Secret - FIXME: make this optional'
         displayName: Secret
         path: secret
@@ -379,19 +371,33 @@ spec:
       - description: Template - Overrides to use when creating Swift Resources
         displayName: Template
         path: swift.template
-      - description: APIOverride, provides the ability to override the generated manifest
-          of several child resources.
-        displayName: APIOverride
-        path: telemetry.apiOverride
+      - description: AlertmanagerOverride, provides the ability to override the generated
+          manifest of several child resources.
+        displayName: Alertmanager Override
+        path: telemetry.alertmanagerOverride
+      - description: TLS - overrides tls parameters for public endpoint
+        displayName: TLS
+        path: telemetry.alertmanagerOverride.tls
+      - description: AodhAPIOverride, provides the ability to override the generated
+          manifest of several child resources.
+        displayName: Aodh APIOverride
+        path: telemetry.aodhApiOverride
       - description: TLS - overrides tls parameters for public endpoint
         displayName: TLS
-        path: telemetry.apiOverride.tls
+        path: telemetry.aodhApiOverride.tls
       - description: Enabled - Whether OpenStack Telemetry services should be deployed
           and managed
         displayName: Enabled
         path: telemetry.enabled
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:booleanSwitch
+      - description: PrometheusOverride, provides the ability to override the generated
+          manifest of several child resources.
+        displayName: Prometheus Override
+        path: telemetry.prometheusOverride
+      - description: TLS - overrides tls parameters for public endpoint
+        displayName: TLS
+        path: telemetry.prometheusOverride.tls
       - description: Template - Overrides to use when creating the OpenStack Telemetry
           services
         displayName: Template

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -416,18 +416,6 @@ rules:
   - list
   - update
   - watch
-- apiGroups:
-  - redis.openstack.org
-  resources:
-  - redises
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
 - apiGroups:
   - route.openshift.io
   resources:

diff --git a/config/samples/core_v1beta1_openstackcontrolplane.yaml b/config/samples/core_v1beta1_openstackcontrolplane.yaml
@@ -180,8 +180,6 @@ spec:
       octaviaAPI:
         replicas: 1
       secret: osp-secret
-  redis:
-    enabled: false
   designate:
     template:
       databaseInstance: openstack

diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml
@@ -178,8 +178,6 @@ spec:
       octaviaAPI:
         replicas: 1
       secret: osp-secret
-  redis:
-    enabled: false
   designate:
     enabled: false
     apiOverride:

diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml
@@ -159,8 +159,6 @@ spec:
       octaviaAPI:
         replicas: 1
       secret: osp-secret
-  redis:
-    enabled: false
   designate:
     enabled: false
     apiOverride:

diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml
@@ -363,8 +363,6 @@ spec:
       octaviaAPI:
         replicas: 1
       secret: osp-secret
-  redis:
-    enabled: false
   designate:
     enabled: false
     apiOverride: