Skip to content

Commit fe0597e

Browse files
akondurakondur
authored
Merge pull request #1381 from splunk/promote-develop-to-main-2.6.1
2 parents bebafce + b41a338 commit fe0597e

19 files changed

+40532
-40976
lines changed

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.23.0 as builder
2+
FROM golang:1.23.0 AS builder
33

44
WORKDIR /workspace
55
# Copy the Go Modules manifests

‎bundle/manifests/enterprise.splunk.com_clustermanagers.yaml‎

Lines changed: 1701 additions & 1708 deletions
Large diffs are not rendered by default.

‎bundle/manifests/enterprise.splunk.com_clustermasters.yaml‎

Lines changed: 1701 additions & 1708 deletions
Large diffs are not rendered by default.

‎bundle/manifests/enterprise.splunk.com_indexerclusters.yaml‎

Lines changed: 3247 additions & 3269 deletions
Large diffs are not rendered by default.

‎bundle/manifests/enterprise.splunk.com_licensemanagers.yaml‎

Lines changed: 1701 additions & 1708 deletions
Large diffs are not rendered by default.

‎bundle/manifests/enterprise.splunk.com_licensemasters.yaml‎

Lines changed: 1701 additions & 1708 deletions
Large diffs are not rendered by default.

‎bundle/manifests/enterprise.splunk.com_monitoringconsoles.yaml‎

Lines changed: 3401 additions & 3415 deletions
Large diffs are not rendered by default.

‎bundle/manifests/enterprise.splunk.com_searchheadclusters.yaml‎

Lines changed: 3401 additions & 3415 deletions
Large diffs are not rendered by default.

‎bundle/manifests/enterprise.splunk.com_standalones.yaml‎

Lines changed: 3401 additions & 3415 deletions
Large diffs are not rendered by default.

‎bundle/manifests/splunk-operator.clusterserviceversion.yaml‎

Lines changed: 19 additions & 279 deletions
Original file line numberDiff line numberDiff line change
@@ -111,16 +111,16 @@ metadata:
111111
capabilities: Seamless Upgrades
112112
categories: Big Data, Logging & Tracing, Monitoring, Security, AI/Machine Learning
113113
containerImage: splunk/splunk-operator@sha256:c4e0d314622699496f675760aad314520d050a66627fdf33e1e21fa28ca85d50
114-
createdAt: "2024-08-21T21:13:21Z"
114+
createdAt: "2024-09-30T21:21:00Z"
115115
description: The Splunk Operator for Kubernetes enables you to quickly and easily
116116
deploy Splunk Enterprise on your choice of private or public cloud provider.
117117
The Operator simplifies scaling and management of Splunk Enterprise by automating
118118
administrative workflows using Kubernetes best practices.
119-
olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.9"}]'
119+
olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.15"}]'
120120
operators.operatorframework.io/builder: operator-sdk-v1.31.0
121121
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
122122
repository: https://github.com/splunk/splunk-operator
123-
name: splunk-operator.v2.6.0
123+
name: splunk-operator.v2.6.1
124124
namespace: placeholder
125125
spec:
126126
apiservicedefinitions: {}
@@ -408,113 +408,14 @@ spec:
408408
- ""
409409
resources:
410410
- configmaps
411-
verbs:
412-
- create
413-
- delete
414-
- get
415-
- list
416-
- patch
417-
- update
418-
- watch
419-
- apiGroups:
420-
- ""
421-
resources:
422411
- endpoints
423-
verbs:
424-
- create
425-
- delete
426-
- get
427-
- list
428-
- patch
429-
- update
430-
- watch
431-
- apiGroups:
432-
- ""
433-
resources:
434412
- events
435-
verbs:
436-
- create
437-
- delete
438-
- get
439-
- list
440-
- patch
441-
- update
442-
- watch
443-
- apiGroups:
444-
- ""
445-
resources:
446413
- persistentvolumeclaims
447-
verbs:
448-
- create
449-
- delete
450-
- get
451-
- list
452-
- patch
453-
- update
454-
- watch
455-
- apiGroups:
456-
- ""
457-
resources:
458414
- pods
459-
verbs:
460-
- create
461-
- delete
462-
- get
463-
- list
464-
- patch
465-
- update
466-
- watch
467-
- apiGroups:
468-
- ""
469-
resources:
470415
- pods/exec
471-
verbs:
472-
- create
473-
- delete
474-
- get
475-
- list
476-
- patch
477-
- update
478-
- watch
479-
- apiGroups:
480-
- ""
481-
resources:
482416
- secrets
483-
verbs:
484-
- create
485-
- delete
486-
- get
487-
- list
488-
- patch
489-
- update
490-
- watch
491-
- apiGroups:
492-
- ""
493-
resources:
494417
- serviceaccounts
495-
verbs:
496-
- create
497-
- delete
498-
- get
499-
- list
500-
- patch
501-
- update
502-
- watch
503-
- apiGroups:
504-
- ""
505-
resources:
506418
- services
507-
verbs:
508-
- create
509-
- delete
510-
- get
511-
- list
512-
- patch
513-
- update
514-
- watch
515-
- apiGroups:
516-
- ""
517-
resources:
518419
- services/finalizers
519420
verbs:
520421
- create
@@ -528,187 +429,12 @@ spec:
528429
- enterprise.splunk.com
529430
resources:
530431
- clustermanagers
531-
verbs:
532-
- create
533-
- delete
534-
- get
535-
- list
536-
- patch
537-
- update
538-
- watch
539-
- apiGroups:
540-
- enterprise.splunk.com
541-
resources:
542-
- clustermanagers/finalizers
543-
verbs:
544-
- update
545-
- apiGroups:
546-
- enterprise.splunk.com
547-
resources:
548-
- clustermanagers/status
549-
verbs:
550-
- get
551-
- patch
552-
- update
553-
- apiGroups:
554-
- enterprise.splunk.com
555-
resources:
556432
- clustermasters
557-
verbs:
558-
- create
559-
- delete
560-
- get
561-
- list
562-
- patch
563-
- update
564-
- watch
565-
- apiGroups:
566-
- enterprise.splunk.com
567-
resources:
568-
- clustermasters/finalizers
569-
verbs:
570-
- update
571-
- apiGroups:
572-
- enterprise.splunk.com
573-
resources:
574-
- clustermasters/status
575-
verbs:
576-
- get
577-
- patch
578-
- update
579-
- apiGroups:
580-
- enterprise.splunk.com
581-
resources:
582433
- indexerclusters
583-
verbs:
584-
- create
585-
- delete
586-
- get
587-
- list
588-
- patch
589-
- update
590-
- watch
591-
- apiGroups:
592-
- enterprise.splunk.com
593-
resources:
594-
- indexerclusters/finalizers
595-
verbs:
596-
- update
597-
- apiGroups:
598-
- enterprise.splunk.com
599-
resources:
600-
- indexerclusters/status
601-
verbs:
602-
- get
603-
- patch
604-
- update
605-
- apiGroups:
606-
- enterprise.splunk.com
607-
resources:
608434
- licensemanagers
609-
verbs:
610-
- create
611-
- delete
612-
- get
613-
- list
614-
- patch
615-
- update
616-
- watch
617-
- apiGroups:
618-
- enterprise.splunk.com
619-
resources:
620-
- licensemanagers/finalizers
621-
verbs:
622-
- update
623-
- apiGroups:
624-
- enterprise.splunk.com
625-
resources:
626-
- licensemanagers/status
627-
verbs:
628-
- get
629-
- patch
630-
- update
631-
- apiGroups:
632-
- enterprise.splunk.com
633-
resources:
634435
- licensemasters
635-
verbs:
636-
- create
637-
- delete
638-
- get
639-
- list
640-
- patch
641-
- update
642-
- watch
643-
- apiGroups:
644-
- enterprise.splunk.com
645-
resources:
646-
- licensemasters/finalizers
647-
verbs:
648-
- update
649-
- apiGroups:
650-
- enterprise.splunk.com
651-
resources:
652-
- licensemasters/status
653-
verbs:
654-
- get
655-
- patch
656-
- update
657-
- apiGroups:
658-
- enterprise.splunk.com
659-
resources:
660436
- monitoringconsoles
661-
verbs:
662-
- create
663-
- delete
664-
- get
665-
- list
666-
- patch
667-
- update
668-
- watch
669-
- apiGroups:
670-
- enterprise.splunk.com
671-
resources:
672-
- monitoringconsoles/finalizers
673-
verbs:
674-
- update
675-
- apiGroups:
676-
- enterprise.splunk.com
677-
resources:
678-
- monitoringconsoles/status
679-
verbs:
680-
- get
681-
- patch
682-
- update
683-
- apiGroups:
684-
- enterprise.splunk.com
685-
resources:
686437
- searchheadclusters
687-
verbs:
688-
- create
689-
- delete
690-
- get
691-
- list
692-
- patch
693-
- update
694-
- watch
695-
- apiGroups:
696-
- enterprise.splunk.com
697-
resources:
698-
- searchheadclusters/finalizers
699-
verbs:
700-
- update
701-
- apiGroups:
702-
- enterprise.splunk.com
703-
resources:
704-
- searchheadclusters/status
705-
verbs:
706-
- get
707-
- patch
708-
- update
709-
- apiGroups:
710-
- enterprise.splunk.com
711-
resources:
712438
- standalones
713439
verbs:
714440
- create
@@ -721,12 +447,26 @@ spec:
721447
- apiGroups:
722448
- enterprise.splunk.com
723449
resources:
450+
- clustermanagers/finalizers
451+
- clustermasters/finalizers
452+
- indexerclusters/finalizers
453+
- licensemanagers/finalizers
454+
- licensemasters/finalizers
455+
- monitoringconsoles/finalizers
456+
- searchheadclusters/finalizers
724457
- standalones/finalizers
725458
verbs:
726459
- update
727460
- apiGroups:
728461
- enterprise.splunk.com
729462
resources:
463+
- clustermanagers/status
464+
- clustermasters/status
465+
- indexerclusters/status
466+
- licensemanagers/status
467+
- licensemasters/status
468+
- monitoringconsoles/status
469+
- searchheadclusters/status
730470
- standalones/status
731471
verbs:
732472
- get
@@ -930,5 +670,5 @@ spec:
930670
relatedImages:
931671
- image: docker.io/splunk/splunk:9.3.0
932672
name: splunk-enterprise
933-
replaces: splunk-operator.v2.5.2
934-
version: 2.6.0
673+
replaces: splunk-operator.v2.6.0
674+
version: 2.6.1

0 commit comments

Comments
 (0)