CSPL-3558 Fix tests after merge

Author: kasiakoziol

api/v4/ingestorcluster_types.go

@@ -52,8 +52,6 @@ type IngestorClusterSpec struct {
 // Helper types
 // Only SQS as of now
 type PushBusSpec struct {
-	// +kubebuilder:validation:Enum=sqs_smartbus
-	// +kubebuilder:default=sqs_smartbus
 	Type string `json:"type"`
 
 	SQS SQSSpec `json:"sqs"`
@@ -64,46 +62,32 @@ type SQSSpec struct {
 
 	AuthRegion string `json:"authRegion"`
 
-	// +kubebuilder:validation:Pattern=`^https://`
 	Endpoint string `json:"endpoint"`
 
-	// +kubebuilder:validation:Pattern=`^https://`
 	LargeMessageStoreEndpoint string `json:"largeMessageStoreEndpoint"`
 
-	// +kubebuilder:validation:Pattern=`^s3://`
 	LargeMessageStorePath string `json:"largeMessageStorePath"`
 
 	DeadLetterQueueName string `json:"deadLetterQueueName"`
 
-	// +kubebuilder:validation:Minimum=0
-	// +kubebuilder:default=3
 	MaxRetriesPerPart int `json:"maxRetriesPerPart"`
 
-	// +kubebuilder:validation:Enum=max_count
-	// +kubebuilder:default=max_count
 	RetryPolicy string `json:"retryPolicy"`
 
-	// +kubebuilder:validation:Pattern=`^[0-9]+s$`
-	// +kubebuilder:default="5s"
 	SendInterval string `json:"sendInterval"`
 
 	EncodingFormat string `json:"encodingFormat"`
 }
 
 type PipelineConfigSpec struct {
-	// +kubebuilder:default=false
 	RemoteQueueRuleset bool `json:"remoteQueueRuleset"`
 
-	// +kubebuilder:default=true
 	RuleSet bool `json:"ruleSet"`
 
-	// +kubebuilder:default=false
 	RemoteQueueTyping bool `json:"remoteQueueTyping"`
 
-	// +kubebuilder:default=false
 	RemoteQueueOutput bool `json:"remoteQueueOutput"`
 
-	// +kubebuilder:default=true
 	Typing bool `json:"typing"`
 
 	IndexerPipe bool `json:"indexerPipe"`

config/crd/bases/enterprise.splunk.com_indexerclusters.yaml

@@ -5607,22 +5607,16 @@ spec:
               pipelineConfig:
                 properties:
                   indexerPipe:
-                    default: true
                     type: boolean
                   remoteQueueOutput:
-                    default: false
                     type: boolean
                   remoteQueueRuleset:
-                    default: false
                     type: boolean
                   remoteQueueTyping:
-                    default: false
                     type: boolean
                   ruleSet:
-                    default: true
                     type: boolean
                   typing:
-                    default: true
                     type: boolean
                 type: object
               pullBus:
@@ -5639,34 +5633,21 @@ spec:
                       encodingFormat:
                         type: string
                       endpoint:
-                        pattern: ^https://
                         type: string
                       largeMessageStoreEndpoint:
-                        pattern: ^https://
                         type: string
                       largeMessageStorePath:
-                        pattern: ^s3://
                         type: string
                       maxRetriesPerPart:
-                        default: 3
-                        minimum: 0
                         type: integer
                       queueName:
                         type: string
                       retryPolicy:
-                        default: max_count
-                        enum:
-                        - max_count
                         type: string
                       sendInterval:
-                        default: 5s
-                        pattern: ^[0-9]+s$
                         type: string
                     type: object
                   type:
-                    default: sqs_smartbus
-                    enum:
-                    - sqs_smartbus
                     type: string
                 type: object
               readinessInitialDelaySeconds:

config/crd/bases/enterprise.splunk.com_ingestorclusters.yaml

@@ -1584,22 +1584,16 @@ spec:
                 description: Pipeline configuration
                 properties:
                   indexerPipe:
-                    default: true
                     type: boolean
                   remoteQueueOutput:
-                    default: false
                     type: boolean
                   remoteQueueRuleset:
-                    default: false
                     type: boolean
                   remoteQueueTyping:
-                    default: false
                     type: boolean
                   ruleSet:
-                    default: true
                     type: boolean
                   typing:
-                    default: true
                     type: boolean
                 type: object
               pushBus:
@@ -1614,34 +1608,21 @@ spec:
                       encodingFormat:
                         type: string
                       endpoint:
-                        pattern: ^https://
                         type: string
                       largeMessageStoreEndpoint:
-                        pattern: ^https://
                         type: string
                       largeMessageStorePath:
-                        pattern: ^s3://
                         type: string
                       maxRetriesPerPart:
-                        default: 3
-                        minimum: 0
                         type: integer
                       queueName:
                         type: string
                       retryPolicy:
-                        default: max_count
-                        enum:
-                        - max_count
                         type: string
                       sendInterval:
-                        default: 5s
-                        pattern: ^[0-9]+s$
                         type: string
                     type: object
                   type:
-                    default: sqs_smartbus
-                    enum:
-                    - sqs_smartbus
                     type: string
                 type: object
               readinessInitialDelaySeconds:

helm-chart/splunk-operator/templates/rbac/ingestorcluster_editor_role.yaml

@@ -0,0 +1,30 @@
+# This rule is not used by the project splunk-operator itself.
+# It is provided to allow the cluster admin to help manage permissions for users.
+#
+# Grants permissions to create, update, and delete resources within the enterprise.splunk.com.
+# This role is intended for users who need to manage these resources
+# but should not control RBAC or manage permissions for others.
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: ingestorcluster-editor-role
+rules:
+- apiGroups:
+  - enterprise.splunk.com
+  resources:
+  - ingestorclusters
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - enterprise.splunk.com
+  resources:
+  - ingestorclusters/status
+  verbs:
+  - get

helm-chart/splunk-operator/templates/rbac/ingestorcluster_viewer_role.yaml

@@ -0,0 +1,26 @@
+# This rule is not used by the project splunk-operator itself.
+# It is provided to allow the cluster admin to help manage permissions for users.
+#
+# Grants read-only access to enterprise.splunk.com resources.
+# This role is intended for users who need visibility into these resources
+# without permissions to modify them. It is ideal for monitoring purposes and limited-access viewing.
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: ingestorcluster-viewer-role
+rules:
+- apiGroups:
+  - enterprise.splunk.com
+  resources:
+  - ingestorclusters
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - enterprise.splunk.com
+  resources:
+  - ingestorclusters/status
+  verbs:
+  - get

helm-chart/splunk-operator/templates/rbac/role.yaml

@@ -222,6 +222,32 @@ rules:
   - get
   - patch
   - update
+- apiGroups:
+    - enterprise.splunk.com
+  resources:
+  - ingestorclusters
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - enterprise.splunk.com
+  resources:
+  - ingestorclusters/finalizers
+  verbs:
+  - update
+- apiGroups:
+  - enterprise.splunk.com
+  resources:
+  - ingestorclusters/status
+  verbs:
+  - get
+  - patch
+  - update
 - apiGroups:
   - enterprise.splunk.com
   resources:

kuttl/tests/helm/index-and-ingest-separation/00-assert.yaml

@@ -0,0 +1,6 @@
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: ingestion-role-sa
+spec: {}

kuttl/tests/helm/index-and-ingest-separation/00-install-service-account.yaml

@@ -3,7 +3,7 @@
 apiVersion: enterprise.splunk.com/v4
 kind: ClusterManager
 metadata:
-  name: cm
+  name: cm-sep
 status:
   phase: Ready
 
@@ -12,7 +12,7 @@ status:
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: splunk-cm-cluster-manager
+  name: splunk-cm-sep-cluster-manager
 status:
   replicas: 1
 
@@ -21,14 +21,14 @@ status:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: splunk-cm-cluster-manager-secret-v1
+  name: splunk-cm-sep-cluster-manager-secret-v1
 
 ---
 # assert for indexer cluster custom resource to be ready
 apiVersion: enterprise.splunk.com/v4
 kind: IndexerCluster
 metadata:
-  name: idxc
+  name: idxc-sep
   pipelineConfig:
     remoteQueueRuleset: false
     ruleSet: true
@@ -77,7 +77,7 @@ status:
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: splunk-idxc-indexer
+  name: splunk-idxc-sep-indexer
 status:
   replicas: 3
 
@@ -86,14 +86,14 @@ status:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: splunk-idxc-indexer-secret-v1
+  name: splunk-idxc-sep-indexer-secret-v1
 
 ---
 # assert for indexer cluster custom resource to be ready
 apiVersion: enterprise.splunk.com/v4
 kind: IngestorCluster
 metadata:
-  name: ingestor
+  name: ingestor-sep
 spec:
   replicas: 3
   pipelineConfig:
@@ -144,7 +144,7 @@ status:
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: splunk-ingestor-ingestor
+  name: splunk-ingestor-sep-ingestor
 status:
   replicas: 3
 
@@ -153,4 +153,4 @@ status:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: splunk-ingestor-ingestor-secret-v1
+  name: splunk-ingestor-sep-ingestor-secret-v1

kuttl/tests/helm/index-and-ingest-separation/01-assert.yaml

@@ -2,5 +2,5 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
-  - command: helm install splunk-index-ingest-sep $HELM_REPO_PATH/splunk-enterprise -f splunk_index_ingest_sep.yaml
+  - command: helm upgrade --install splunk-index-ingest-sep $HELM_REPO_PATH/splunk-enterprise -f splunk_index_ingest_sep.yaml
     namespaced: true