-
Notifications
You must be signed in to change notification settings - Fork 127
CSPL-4002 Update Ansible role to ingestor (from standalone) for IngestorCluster #1606
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
kasiakoziol
wants to merge
6
commits into
CSPL-3551-ingestion-cr
Choose a base branch
from
feature/cspl-4002-update-role-to-ingestor
base: CSPL-3551-ingestion-cr
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
cd6f087
CSPL-4002 Update role for ingestor to ingestor from standalone
kasiakoziol d02f24b
Merge branch 'develop' into feature/cspl-4002-update-role-to-ingestor
kasiakoziol d79a6c2
CSPL-4212 Address changes from unit tests from develop branch
kasiakoziol a0b6b30
Merge branch 'CSPL-3551-ingestion-cr' into feature/cspl-4002-update-r…
kasiakoziol 88a94c2
Addressing comments
kasiakoziol 671f33d
Run tests against Splunk 10.2
kasiakoziol File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
207 changes: 207 additions & 0 deletions
207
pkg/splunk/enterprise/testdata/fixtures/statefulset_ingestor.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,207 @@ | ||
| { | ||
| "kind": "StatefulSet", | ||
| "apiVersion": "apps/v1", | ||
| "metadata": { | ||
| "name": "splunk-test-ingestor", | ||
| "namespace": "test", | ||
| "creationTimestamp": null, | ||
| "labels": { | ||
| "app.kubernetes.io/component": "ingestor", | ||
| "app.kubernetes.io/instance": "splunk-test-ingestor", | ||
| "app.kubernetes.io/managed-by": "splunk-operator", | ||
| "app.kubernetes.io/name": "ingestor", | ||
| "app.kubernetes.io/part-of": "splunk-test-ingestor" | ||
| }, | ||
| "ownerReferences": [ | ||
| { | ||
| "apiVersion": "", | ||
| "kind": "IngestorCluster", | ||
| "name": "test", | ||
| "uid": "", | ||
| "controller": true | ||
| } | ||
| ] | ||
| }, | ||
| "spec": { | ||
| "replicas": 3, | ||
| "selector": { | ||
| "matchLabels": { | ||
| "app.kubernetes.io/component": "ingestor", | ||
| "app.kubernetes.io/instance": "splunk-test-ingestor", | ||
| "app.kubernetes.io/managed-by": "splunk-operator", | ||
| "app.kubernetes.io/name": "ingestor", | ||
| "app.kubernetes.io/part-of": "splunk-test-ingestor" | ||
| } | ||
| }, | ||
| "template": { | ||
| "metadata": { | ||
| "creationTimestamp": null, | ||
| "labels": { | ||
| "app.kubernetes.io/component": "ingestor", | ||
| "app.kubernetes.io/instance": "splunk-test-ingestor", | ||
| "app.kubernetes.io/managed-by": "splunk-operator", | ||
| "app.kubernetes.io/name": "ingestor", | ||
| "app.kubernetes.io/part-of": "splunk-test-ingestor" | ||
| }, | ||
| "annotations": { | ||
| "traffic.sidecar.istio.io/excludeOutboundPorts": "8089,8191,9997", | ||
| "traffic.sidecar.istio.io/includeInboundPorts": "8000,8088" | ||
| } | ||
| }, | ||
| "spec": { | ||
| "volumes": [ | ||
| { | ||
| "name": "splunk-test-probe-configmap", | ||
| "configMap": { | ||
| "name": "splunk-test-probe-configmap", | ||
| "defaultMode": 365 | ||
| } | ||
| }, | ||
| { | ||
| "name": "mnt-splunk-secrets", | ||
| "secret": { | ||
| "secretName": "splunk-test-ingestor-secret-v1", | ||
| "defaultMode": 420 | ||
| } | ||
| } | ||
| ], | ||
| "containers": [ | ||
| { | ||
| "name": "splunk", | ||
| "image": "splunk/splunk", | ||
| "ports": [ | ||
| { "name": "http-splunkweb", "containerPort": 8000, "protocol": "TCP" }, | ||
| { "name": "http-hec", "containerPort": 8088, "protocol": "TCP" }, | ||
| { "name": "https-splunkd", "containerPort": 8089, "protocol": "TCP" }, | ||
| { "name": "tcp-s2s", "containerPort": 9997, "protocol": "TCP" }, | ||
| { "name": "user-defined", "containerPort": 32000, "protocol": "UDP" } | ||
| ], | ||
| "env": [ | ||
| { "name": "SPLUNK_HOME", "value": "/opt/splunk" }, | ||
| { "name": "SPLUNK_START_ARGS", "value": "--accept-license" }, | ||
| { "name": "SPLUNK_DEFAULTS_URL", "value": "/mnt/splunk-secrets/default.yml" }, | ||
| { "name": "SPLUNK_HOME_OWNERSHIP_ENFORCEMENT", "value": "false" }, | ||
| { "name": "SPLUNK_ROLE", "value": "splunk_ingestor" }, | ||
| { "name": "SPLUNK_DECLARATIVE_ADMIN_PASSWORD", "value": "true" }, | ||
| { "name": "SPLUNK_OPERATOR_K8_LIVENESS_DRIVER_FILE_PATH", "value": "/tmp/splunk_operator_k8s/probes/k8_liveness_driver.sh" }, | ||
| { "name": "SPLUNK_GENERAL_TERMS", "value": "--accept-sgt-current-at-splunk-com" }, | ||
| { "name": "SPLUNK_SKIP_CLUSTER_BUNDLE_PUSH", "value": "true" } | ||
| ], | ||
| "resources": { | ||
| "limits": { "cpu": "4", "memory": "8Gi" }, | ||
| "requests": { "cpu": "100m", "memory": "512Mi" } | ||
| }, | ||
| "volumeMounts": [ | ||
| { "name": "pvc-etc", "mountPath": "/opt/splunk/etc" }, | ||
| { "name": "pvc-var", "mountPath": "/opt/splunk/var" }, | ||
| { "name": "splunk-test-probe-configmap", "mountPath": "/mnt/probes" }, | ||
| { "name": "mnt-splunk-secrets", "mountPath": "/mnt/splunk-secrets" } | ||
| ], | ||
| "livenessProbe": { | ||
| "exec": { "command": ["/mnt/probes/livenessProbe.sh"] }, | ||
| "initialDelaySeconds": 30, | ||
| "timeoutSeconds": 30, | ||
| "periodSeconds": 30, | ||
| "failureThreshold": 3 | ||
| }, | ||
| "readinessProbe": { | ||
| "exec": { "command": ["/mnt/probes/readinessProbe.sh"] }, | ||
| "initialDelaySeconds": 10, | ||
| "timeoutSeconds": 5, | ||
| "periodSeconds": 5, | ||
| "failureThreshold": 3 | ||
| }, | ||
| "startupProbe": { | ||
| "exec": { "command": ["/mnt/probes/startupProbe.sh"] }, | ||
| "initialDelaySeconds": 40, | ||
| "timeoutSeconds": 30, | ||
| "periodSeconds": 30, | ||
| "failureThreshold": 12 | ||
| }, | ||
| "imagePullPolicy": "IfNotPresent", | ||
| "securityContext": { | ||
| "capabilities": { "add": ["NET_BIND_SERVICE"], "drop": ["ALL"] }, | ||
| "privileged": false, | ||
| "runAsUser": 41812, | ||
| "runAsNonRoot": true, | ||
| "allowPrivilegeEscalation": false, | ||
| "seccompProfile": { "type": "RuntimeDefault" } | ||
| } | ||
| } | ||
| ], | ||
| "securityContext": { | ||
| "runAsUser": 41812, | ||
| "runAsNonRoot": true, | ||
| "fsGroup": 41812, | ||
| "fsGroupChangePolicy": "OnRootMismatch" | ||
| }, | ||
| "affinity": { | ||
| "podAntiAffinity": { | ||
| "preferredDuringSchedulingIgnoredDuringExecution": [ | ||
| { | ||
| "weight": 100, | ||
| "podAffinityTerm": { | ||
| "labelSelector": { | ||
| "matchExpressions": [ | ||
| { | ||
| "key": "app.kubernetes.io/instance", | ||
| "operator": "In", | ||
| "values": ["splunk-test-ingestor"] | ||
| } | ||
| ] | ||
| }, | ||
| "topologyKey": "kubernetes.io/hostname" | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "schedulerName": "default-scheduler" | ||
| } | ||
| }, | ||
| "volumeClaimTemplates": [ | ||
| { | ||
| "metadata": { | ||
| "name": "pvc-etc", | ||
| "namespace": "test", | ||
| "creationTimestamp": null, | ||
| "labels": { | ||
| "app.kubernetes.io/component": "ingestor", | ||
| "app.kubernetes.io/instance": "splunk-test-ingestor", | ||
| "app.kubernetes.io/managed-by": "splunk-operator", | ||
| "app.kubernetes.io/name": "ingestor", | ||
| "app.kubernetes.io/part-of": "splunk-test-ingestor" | ||
| } | ||
| }, | ||
| "spec": { | ||
| "accessModes": ["ReadWriteOnce"], | ||
| "resources": { "requests": { "storage": "10Gi" } } | ||
| }, | ||
| "status": {} | ||
| }, | ||
| { | ||
| "metadata": { | ||
| "name": "pvc-var", | ||
| "namespace": "test", | ||
| "creationTimestamp": null, | ||
| "labels": { | ||
| "app.kubernetes.io/component": "ingestor", | ||
| "app.kubernetes.io/instance": "splunk-test-ingestor", | ||
| "app.kubernetes.io/managed-by": "splunk-operator", | ||
| "app.kubernetes.io/name": "ingestor", | ||
| "app.kubernetes.io/part-of": "splunk-test-ingestor" | ||
| } | ||
| }, | ||
| "spec": { | ||
| "accessModes": ["ReadWriteOnce"], | ||
| "resources": { "requests": { "storage": "100Gi" } } | ||
| }, | ||
| "status": {} | ||
| } | ||
| ], | ||
| "serviceName": "splunk-test-ingestor-headless", | ||
| "podManagementPolicy": "Parallel", | ||
| "updateStrategy": { "type": "OnDelete" } | ||
| }, | ||
| "status": { "replicas": 0, "availableReplicas": 0 } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Once this and the 3.0.0 release is verified with splunk 10.2, we can update the secret and remove the hard coding.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@rlieberman-splunk Thanks. As initially planned, I will remove the commit once tests are green and will wait for the secret change.