CSPL-3551 Fixes and enhancements

Author: kasiakoziol

api/v4/ingestorcluster_types.go

@@ -33,12 +33,12 @@ const (
 	IngestorClusterPausedAnnotation = "ingestorcluster.enterprise.splunk.com/paused"
 )
 
-// IngestorClusterSpec defines the spec of Ingestor Cluster pods
+// IngestorClusterSpec defines the spec of Ingestor Cluster
 type IngestorClusterSpec struct {
-	// Common SPlunk spec
+	// Common Splunk spec
 	CommonSplunkSpec `json:",inline"`
 
-	// Number of ingestion pods
+	// Number of ingestor pods
 	Replicas int32 `json:"replicas"`
 
 	// Splunk Enterprise app repository that specifies remote app location and scope for Splunk app management
@@ -83,15 +83,15 @@ type PipelineConfigSpec struct {
 	IndexerPipe bool `json:"indexerPipe"`
 }
 
-// IngestorClusterStatus defines the observed state of Ingestor Cluster pods
+// IngestorClusterStatus defines the observed state of Ingestor Cluster
 type IngestorClusterStatus struct {
-	// Phase of the ingestion pods
+	// Phase of the ingestor pods
 	Phase Phase `json:"phase"`
 
-	// Number of desired ingestion pods
+	// Number of desired ingestor pods
 	Replicas int32 `json:"replicas"`
 
-	// Number of ready ingestion pods
+	// Number of ready ingestor pods
 	ReadyReplicas int32 `json:"readyReplicas"`
 
 	// Selector for pods used by HorizontalPodAutoscaler
@@ -134,210 +134,192 @@ type IngestorCluster struct {
 	Status IngestorClusterStatus `json:"status,omitempty,omitzero"`
 }
 
-// DeepCopyObject implements common.MetaObject.
+// DeepCopyObject implements client.Object.
 func (ic *IngestorCluster) DeepCopyObject() runtime.Object {
 	panic("unimplemented")
 }
 
-// GetAnnotations implements common.MetaObject.
+// GetAnnotations implements client.Object.
 // Subtle: this method shadows the method (ObjectMeta).GetAnnotations of IngestorCluster.ObjectMeta.
 func (ic *IngestorCluster) GetAnnotations() map[string]string {
 	panic("unimplemented")
 }
 
-// GetCreationTimestamp implements common.MetaObject.
+// GetCreationTimestamp implements client.Object.
 // Subtle: this method shadows the method (ObjectMeta).GetCreationTimestamp of IngestorCluster.ObjectMeta.
 func (ic *IngestorCluster) GetCreationTimestamp() metav1.Time {
 	panic("unimplemented")
 }
 
-// GetDeletionGracePeriodSeconds implements common.MetaObject.
+// GetDeletionGracePeriodSeconds implements client.Object.
 // Subtle: this method shadows the method (ObjectMeta).GetDeletionGracePeriodSeconds of IngestorCluster.ObjectMeta.
 func (ic *IngestorCluster) GetDeletionGracePeriodSeconds() *int64 {
 	panic("unimplemented")
 }
 
-// GetDeletionTimestamp implements common.MetaObject.
+// GetDeletionTimestamp implements client.Object.
 // Subtle: this method shadows the method (ObjectMeta).GetDeletionTimestamp of IngestorCluster.ObjectMeta.
 func (ic *IngestorCluster) GetDeletionTimestamp() *metav1.Time {
 	panic("unimplemented")
 }
 
-// GetFinalizers implements common.MetaObject.
+// GetFinalizers implements client.Object.
 // Subtle: this method shadows the method (ObjectMeta).GetFinalizers of IngestorCluster.ObjectMeta.
 func (ic *IngestorCluster) GetFinalizers() []string {
 	panic("unimplemented")
 }
 
-// GetGenerateName implements common.MetaObject.
+// GetGenerateName implements client.Object.
 // Subtle: this method shadows the method (ObjectMeta).GetGenerateName of IngestorCluster.ObjectMeta.
 func (ic *IngestorCluster) GetGenerateName() string {
 	panic("unimplemented")
 }
 
-// GetGeneration implements common.MetaObject.
+// GetGeneration implements client.Object.
 // Subtle: this method shadows the method (ObjectMeta).GetGeneration of IngestorCluster.ObjectMeta.
 func (ic *IngestorCluster) GetGeneration() int64 {
 	panic("unimplemented")
 }
 
-// GetLabels implements common.MetaObject.
+// GetLabels implements client.Object.
 // Subtle: this method shadows the method (ObjectMeta).GetLabels of IngestorCluster.ObjectMeta.
 func (ic *IngestorCluster) GetLabels() map[string]string {
 	panic("unimplemented")
 }
 
-// GetManagedFields implements common.MetaObject.
+// GetManagedFields implements client.Object.
 // Subtle: this method shadows the method (ObjectMeta).GetManagedFields of IngestorCluster.ObjectMeta.
 func (ic *IngestorCluster) GetManagedFields() []metav1.ManagedFieldsEntry {
 	panic("unimplemented")
 }
 
-// GetName implements common.MetaObject.
+// GetName implements client.Object.
 // Subtle: this method shadows the method (ObjectMeta).GetName of IngestorCluster.ObjectMeta.
 func (ic *IngestorCluster) GetName() string {
 	panic("unimplemented")
 }
 
-// GetNamespace implements common.MetaObject.
+// GetNamespace implements client.Object.
 // Subtle: this method shadows the method (ObjectMeta).GetNamespace of IngestorCluster.ObjectMeta.
 func (ic *IngestorCluster) GetNamespace() string {
 	panic("unimplemented")
 }
 
-// GetObjectKind implements common.MetaObject.
+// GetObjectKind implements client.Object.
 // Subtle: this method shadows the method (TypeMeta).GetObjectKind of IngestorCluster.TypeMeta.
 func (ic *IngestorCluster) GetObjectKind() schema.ObjectKind {
 	panic("unimplemented")
 }
 
-// GetObjectMeta implements common.MetaObject.
-// Subtle: this method shadows the method (ObjectMeta).GetObjectMeta of IngestorCluster.ObjectMeta.
-func (ic *IngestorCluster) GetObjectMeta() metav1.Object {
-	panic("unimplemented")
-}
-
-// GetOwnerReferences implements common.MetaObject.
+// GetOwnerReferences implements client.Object.
 // Subtle: this method shadows the method (ObjectMeta).GetOwnerReferences of IngestorCluster.ObjectMeta.
 func (ic *IngestorCluster) GetOwnerReferences() []metav1.OwnerReference {
 	panic("unimplemented")
 }
 
-// GetResourceVersion implements common.MetaObject.
+// GetResourceVersion implements client.Object.
 // Subtle: this method shadows the method (ObjectMeta).GetResourceVersion of IngestorCluster.ObjectMeta.
 func (ic *IngestorCluster) GetResourceVersion() string {
 	panic("unimplemented")
 }
 
-// GetSelfLink implements common.MetaObject.
+// GetSelfLink implements client.Object.
 // Subtle: this method shadows the method (ObjectMeta).GetSelfLink of IngestorCluster.ObjectMeta.
 func (ic *IngestorCluster) GetSelfLink() string {
 	panic("unimplemented")
 }
 
-// GetUID implements common.MetaObject.
+// GetUID implements client.Object.
 // Subtle: this method shadows the method (ObjectMeta).GetUID of IngestorCluster.ObjectMeta.
 func (ic *IngestorCluster) GetUID() types.UID {
 	panic("unimplemented")
 }
 
-// GroupVersionKind implements common.MetaObject.
-// Subtle: this method shadows the method (TypeMeta).GroupVersionKind of IngestorCluster.TypeMeta.
-func (ic *IngestorCluster) GroupVersionKind() schema.GroupVersionKind {
-	panic("unimplemented")
-}
-
-// SetAnnotations implements common.MetaObject.
+// SetAnnotations implements client.Object.
 // Subtle: this method shadows the method (ObjectMeta).SetAnnotations of IngestorCluster.ObjectMeta.
 func (ic *IngestorCluster) SetAnnotations(annotations map[string]string) {
 	panic("unimplemented")
 }
 
-// SetCreationTimestamp implements common.MetaObject.
+// SetCreationTimestamp implements client.Object.
 // Subtle: this method shadows the method (ObjectMeta).SetCreationTimestamp of IngestorCluster.ObjectMeta.
 func (ic *IngestorCluster) SetCreationTimestamp(timestamp metav1.Time) {
 	panic("unimplemented")
 }
 
-// SetDeletionGracePeriodSeconds implements common.MetaObject.
+// SetDeletionGracePeriodSeconds implements client.Object.
 // Subtle: this method shadows the method (ObjectMeta).SetDeletionGracePeriodSeconds of IngestorCluster.ObjectMeta.
 func (ic *IngestorCluster) SetDeletionGracePeriodSeconds(*int64) {
 	panic("unimplemented")
 }
 
-// SetDeletionTimestamp implements common.MetaObject.
+// SetDeletionTimestamp implements client.Object.
 // Subtle: this method shadows the method (ObjectMeta).SetDeletionTimestamp of IngestorCluster.ObjectMeta.
 func (ic *IngestorCluster) SetDeletionTimestamp(timestamp *metav1.Time) {
 	panic("unimplemented")
 }
 
-// SetFinalizers implements common.MetaObject.
+// SetFinalizers implements client.Object.
 // Subtle: this method shadows the method (ObjectMeta).SetFinalizers of IngestorCluster.ObjectMeta.
 func (ic *IngestorCluster) SetFinalizers(finalizers []string) {
 	panic("unimplemented")
 }
 
-// SetGenerateName implements common.MetaObject.
+// SetGenerateName implements client.Object.
 // Subtle: this method shadows the method (ObjectMeta).SetGenerateName of IngestorCluster.ObjectMeta.
 func (ic *IngestorCluster) SetGenerateName(name string) {
 	panic("unimplemented")
 }
 
-// SetGeneration implements common.MetaObject.
+// SetGeneration implements client.Object.
 // Subtle: this method shadows the method (ObjectMeta).SetGeneration of IngestorCluster.ObjectMeta.
 func (ic *IngestorCluster) SetGeneration(generation int64) {
 	panic("unimplemented")
 }
 
-// SetGroupVersionKind implements common.MetaObject.
-// Subtle: this method shadows the method (TypeMeta).SetGroupVersionKind of IngestorCluster.TypeMeta.
-func (ic *IngestorCluster) SetGroupVersionKind(kind schema.GroupVersionKind) {
-	panic("unimplemented")
-}
-
-// SetLabels implements common.MetaObject.
+// SetLabels implements client.Object.
 // Subtle: this method shadows the method (ObjectMeta).SetLabels of IngestorCluster.ObjectMeta.
 func (ic *IngestorCluster) SetLabels(labels map[string]string) {
 	panic("unimplemented")
 }
 
-// SetManagedFields implements common.MetaObject.
+// SetManagedFields implements client.Object.
 // Subtle: this method shadows the method (ObjectMeta).SetManagedFields of IngestorCluster.ObjectMeta.
 func (ic *IngestorCluster) SetManagedFields(managedFields []metav1.ManagedFieldsEntry) {
 	panic("unimplemented")
 }
 
-// SetName implements common.MetaObject.
+// SetName implements client.Object.
 // Subtle: this method shadows the method (ObjectMeta).SetName of IngestorCluster.ObjectMeta.
 func (ic *IngestorCluster) SetName(name string) {
 	panic("unimplemented")
 }
 
-// SetNamespace implements common.MetaObject.
+// SetNamespace implements client.Object.
 // Subtle: this method shadows the method (ObjectMeta).SetNamespace of IngestorCluster.ObjectMeta.
 func (ic *IngestorCluster) SetNamespace(namespace string) {
 	panic("unimplemented")
 }
 
-// SetOwnerReferences implements common.MetaObject.
+// SetOwnerReferences implements client.Object.
 // Subtle: this method shadows the method (ObjectMeta).SetOwnerReferences of IngestorCluster.ObjectMeta.
 func (ic *IngestorCluster) SetOwnerReferences([]metav1.OwnerReference) {
 	panic("unimplemented")
 }
 
-// SetResourceVersion implements common.MetaObject.
+// SetResourceVersion implements client.Object.
 // Subtle: this method shadows the method (ObjectMeta).SetResourceVersion of IngestorCluster.ObjectMeta.
 func (ic *IngestorCluster) SetResourceVersion(version string) {
 	panic("unimplemented")
 }
 
-// SetSelfLink implements common.MetaObject.
+// SetSelfLink implements client.Object.
 // Subtle: this method shadows the method (ObjectMeta).SetSelfLink of IngestorCluster.ObjectMeta.
 func (ic *IngestorCluster) SetSelfLink(selfLink string) {
 	panic("unimplemented")
 }
 
-// SetUID implements common.MetaObject.
+// SetUID implements client.Object.
 // Subtle: this method shadows the method (ObjectMeta).SetUID of IngestorCluster.ObjectMeta.
 func (ic *IngestorCluster) SetUID(uid types.UID) {
 	panic("unimplemented")

config/rbac/ingestorcluster_admin_role.yaml

@@ -8,9 +8,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  labels:
-    app.kubernetes.io/name: splunk-operator
-    app.kubernetes.io/managed-by: kustomize
   name: ingestorcluster-editor-role
 rules:
 - apiGroups:

config/rbac/ingestorcluster_editor_role.yaml

@@ -8,9 +8,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  labels:
-    app.kubernetes.io/name: splunk-operator
-    app.kubernetes.io/managed-by: kustomize
   name: ingestorcluster-viewer-role
 rules:
 - apiGroups:

config/rbac/ingestorcluster_viewer_role.yaml

@@ -16,11 +16,3 @@ resources:
 - auth_proxy_role.yaml
 - auth_proxy_role_binding.yaml
 - auth_proxy_client_clusterrole.yaml
-# For each CRD, "Admin", "Editor" and "Viewer" roles are scaffolded by
-# default, aiding admins in cluster management. Those roles are
-# not used by the splunk-operator itself. You can comment the following lines
-# if you do not want those helpers be installed with your Project.
-- ingestorcluster_admin_role.yaml
-- ingestorcluster_editor_role.yaml
-- ingestorcluster_viewer_role.yaml
-

config/rbac/kustomization.yaml

@@ -1,9 +1,6 @@
 apiVersion: enterprise.splunk.com/v4
 kind: IngestorCluster
 metadata:
-  labels:
-    app.kubernetes.io/name: splunk-operator
-    app.kubernetes.io/managed-by: kustomize
   name: ingestorcluster-sample
 spec:
   # TODO(user): Add fields here

…ples/enterprise_v4_ingestioncluster.yaml …mples/enterprise_v4_ingestorcluster.yamlconfig/samples/enterprise_v4_ingestioncluster.yaml renamed to config/samples/enterprise_v4_ingestorcluster.yaml config/samples/enterprise_v4_ingestioncluster.yaml renamed to config/samples/enterprise_v4_ingestorcluster.yaml

@@ -110,11 +110,10 @@ func (r *IngestorClusterReconciler) SetupWithManager(mgr ctrl.Manager) error {
 			common.AnnotationChangedPredicate(),
 			common.LabelChangedPredicate(),
 			common.SecretChangedPredicate(),
+			common.ConfigMapChangedPredicate(),
 			common.StatefulsetChangedPredicate(),
 			common.PodChangedPredicate(),
-			common.ConfigMapChangedPredicate(),
-			common.ClusterManagerChangedPredicate(),
-			common.ClusterMasterChangedPredicate(),
+			common.CrdChangedPredicate(),
 		)).
 		Watches(&appsv1.StatefulSet{},
 			handler.EnqueueRequestForOwner(

internal/controller/ingestorcluster_controller.go

@@ -33,13 +33,11 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	"k8s.io/client-go/kubernetes/scheme"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	ctrl "sigs.k8s.io/controller-runtime"
 
 	enterpriseApiV3 "github.com/splunk/splunk-operator/api/v3"
 	enterpriseApi "github.com/splunk/splunk-operator/api/v4"
-	enterprisev4 "github.com/splunk/splunk-operator/api/v4"
 	//+kubebuilder:scaffold:imports
 )
 
@@ -94,9 +92,6 @@ var _ = BeforeSuite(func(ctx context.Context) {
 	err = enterpriseApi.AddToScheme(clientgoscheme.Scheme)
 	Expect(err).NotTo(HaveOccurred())
 
-	err = enterprisev4.AddToScheme(scheme.Scheme)
-	Expect(err).NotTo(HaveOccurred())
-
 	//+kubebuilder:scaffold:scheme
 
 	// Create New Manager for controller