Remove managed kafka ephemeral mode (#828)

apis/cloud.redhat.com/v1alpha1/clowdenvironment_types.go

@@ -228,13 +228,6 @@ type KafkaConfig struct {
 	// Managed topic prefix for the managed cluster. Only used in (*_managed_*) mode.
 	ManagedPrefix string `json:"managedPrefix,omitempty"`
 
-	// Defines the secret reference for the Ephemeral Managed Kafka mode. Only used in (*_managed-ephem_*) mode.
-	EphemManagedSecretRef NamespacedName `json:"ephemManagedSecretRef,omitempty"`
-
-	// Deprecated: topics being deleted will be done so using the env name and a regex that combines - with .
-	// There is also a clowder top level setting to ensure that only certain topics can be deleted.
-	EphemManagedDeletePrefix string `json:"ephemManagedDeletePrefix,omitempty"`
-
 	// (Deprecated) Defines the cluster name to be used by the Kafka Provider this will
 	// be used in some modes to locate the Kafka instance.
 	ClusterName string `json:"clusterName,omitempty"`

config/crd/bases/cloud.redhat.com_clowdenvironments.yaml

@@ -313,26 +313,6 @@ spec:
                       enableLegacyStrimzi:
                         description: EnableLegacyStrimzi disables TLS + user auth
                         type: boolean
-                      ephemManagedDeletePrefix:
-                        description: 'Deprecated: topics being deleted will be done
-                          so using the env name and a regex that combines - with .
-                          There is also a clowder top level setting to ensure that
-                          only certain topics can be deleted.'
-                        type: string
-                      ephemManagedSecretRef:
-                        description: Defines the secret reference for the Ephemeral
-                          Managed Kafka mode. Only used in (*_managed-ephem_*) mode.
-                        properties:
-                          name:
-                            description: Name defines the Name of a resource.
-                            type: string
-                          namespace:
-                            description: Namespace defines the Namespace of a resource.
-                            type: string
-                        required:
-                        - name
-                        - namespace
-                        type: object
                       managedPrefix:
                         description: Managed topic prefix for the managed cluster.
                           Only used in (*_managed_*) mode.

controllers/cloud.redhat.com/providers/kafka/cyndi.go

@@ -3,7 +3,6 @@ package kafka
 import (
 	"context"
 	"fmt"
-	"strconv"
 
 	crd "github.com/RedHatInsights/clowder/apis/cloud.redhat.com/v1alpha1"
 	"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/errors"
@@ -280,40 +279,3 @@ func createCyndiInventoryDbSecret(
 
 	return secretName, nil
 }
-
-// create a configmap to tweak the connector config for CyndiPipelines created in a specific namespace
-// at the moment this function is only called when the kafka provider mode is 'managed-ephem'
-func createCyndiConfigMap(
-	s prov.RootProvider,
-	connectClusterNamespace string,
-) error {
-	// TODO: as a followup, make these topic names configurable
-	eventsTopic := fmt.Sprintf("%s-platform.inventory.events", s.GetEnv().Name)
-	deadLetterQueueTopic := fmt.Sprintf("%s-platform.cyndi.dlq", s.GetEnv().Name)
-	replicationFactor := 3
-
-	nn := types.NamespacedName{
-		Namespace: connectClusterNamespace,
-		Name:      "cyndi",
-	}
-
-	cm := &core.ConfigMap{}
-
-	if err := s.GetCache().Create(CyndiConfigMap, nn, cm); err != nil {
-		return err
-	}
-
-	cm.Data = map[string]string{
-		"connector.topic":                      eventsTopic,
-		"connector.deadletterqueue.topic.name": deadLetterQueueTopic,
-		"connector.topic.replication.factor":   strconv.Itoa(replicationFactor),
-	}
-
-	cm.SetName(nn.Name)
-	cm.SetNamespace(nn.Namespace)
-	// it would be best for the ClowdApp to own this, but since cross-namespace OwnerReferences
-	// are not permitted, make this owned by the ClowdEnvironment
-	cm.SetOwnerReferences([]metav1.OwnerReference{s.GetEnv().MakeOwnerReference()})
-
-	return s.GetCache().Update(CyndiConfigMap, cm)
-}