Skip to content

Merge extra changes from promote-develop-to-main-2.6.1 to develop #1381

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Oct 1, 2024
Merged

Merge extra changes from promote-develop-to-main-2.6.1 to develop #1381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e39df60
Generated bundle changes
akondur Sep 30, 2024
b41a338
Docker file changes
akondur Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.23.0 as builder
FROM golang:1.23.0 AS builder

WORKDIR /workspace
# Copy the Go Modules manifests
Expand Down
3,409 changes: 1,701 additions & 1,708 deletions bundle/manifests/enterprise.splunk.com_clustermanagers.yaml
View file
Open in desktop

Large diffs are not rendered by default.

3,409 changes: 1,701 additions & 1,708 deletions bundle/manifests/enterprise.splunk.com_clustermasters.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6,516 changes: 3,247 additions & 3,269 deletions bundle/manifests/enterprise.splunk.com_indexerclusters.yaml
View file
Open in desktop

Large diffs are not rendered by default.

3,409 changes: 1,701 additions & 1,708 deletions bundle/manifests/enterprise.splunk.com_licensemanagers.yaml
View file
Open in desktop

Large diffs are not rendered by default.

3,409 changes: 1,701 additions & 1,708 deletions bundle/manifests/enterprise.splunk.com_licensemasters.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6,816 changes: 3,401 additions & 3,415 deletions bundle/manifests/enterprise.splunk.com_monitoringconsoles.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6,816 changes: 3,401 additions & 3,415 deletions bundle/manifests/enterprise.splunk.com_searchheadclusters.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6,816 changes: 3,401 additions & 3,415 deletions bundle/manifests/enterprise.splunk.com_standalones.yaml
View file
Open in desktop

Large diffs are not rendered by default.

298 changes: 19 additions & 279 deletions bundle/manifests/splunk-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,16 +111,16 @@ metadata:
capabilities: Seamless Upgrades
categories: Big Data, Logging & Tracing, Monitoring, Security, AI/Machine Learning
containerImage: splunk/splunk-operator@sha256:c4e0d314622699496f675760aad314520d050a66627fdf33e1e21fa28ca85d50
createdAt: "2024-08-21T21:13:21Z"
createdAt: "2024-09-30T21:21:00Z"
description: The Splunk Operator for Kubernetes enables you to quickly and easily
deploy Splunk Enterprise on your choice of private or public cloud provider.
The Operator simplifies scaling and management of Splunk Enterprise by automating
administrative workflows using Kubernetes best practices.
olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.9"}]'
olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.15"}]'
operators.operatorframework.io/builder: operator-sdk-v1.31.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
repository: https://github.com/splunk/splunk-operator
name: splunk-operator.v2.6.0
name: splunk-operator.v2.6.1
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -408,113 +408,14 @@ spec:
- ""
resources:
- configmaps
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- ""
resources:
- endpoints
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- ""
resources:
- events
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- ""
resources:
- persistentvolumeclaims
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- ""
resources:
- pods
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- ""
resources:
- pods/exec
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- ""
resources:
- secrets
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- ""
resources:
- serviceaccounts
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- ""
resources:
- services
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- ""
resources:
- services/finalizers
verbs:
- create
Expand All @@ -528,187 +429,12 @@ spec:
- enterprise.splunk.com
resources:
- clustermanagers
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- enterprise.splunk.com
resources:
- clustermanagers/finalizers
verbs:
- update
- apiGroups:
- enterprise.splunk.com
resources:
- clustermanagers/status
verbs:
- get
- patch
- update
- apiGroups:
- enterprise.splunk.com
resources:
- clustermasters
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- enterprise.splunk.com
resources:
- clustermasters/finalizers
verbs:
- update
- apiGroups:
- enterprise.splunk.com
resources:
- clustermasters/status
verbs:
- get
- patch
- update
- apiGroups:
- enterprise.splunk.com
resources:
- indexerclusters
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- enterprise.splunk.com
resources:
- indexerclusters/finalizers
verbs:
- update
- apiGroups:
- enterprise.splunk.com
resources:
- indexerclusters/status
verbs:
- get
- patch
- update
- apiGroups:
- enterprise.splunk.com
resources:
- licensemanagers
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- enterprise.splunk.com
resources:
- licensemanagers/finalizers
verbs:
- update
- apiGroups:
- enterprise.splunk.com
resources:
- licensemanagers/status
verbs:
- get
- patch
- update
- apiGroups:
- enterprise.splunk.com
resources:
- licensemasters
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- enterprise.splunk.com
resources:
- licensemasters/finalizers
verbs:
- update
- apiGroups:
- enterprise.splunk.com
resources:
- licensemasters/status
verbs:
- get
- patch
- update
- apiGroups:
- enterprise.splunk.com
resources:
- monitoringconsoles
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- enterprise.splunk.com
resources:
- monitoringconsoles/finalizers
verbs:
- update
- apiGroups:
- enterprise.splunk.com
resources:
- monitoringconsoles/status
verbs:
- get
- patch
- update
- apiGroups:
- enterprise.splunk.com
resources:
- searchheadclusters
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- enterprise.splunk.com
resources:
- searchheadclusters/finalizers
verbs:
- update
- apiGroups:
- enterprise.splunk.com
resources:
- searchheadclusters/status
verbs:
- get
- patch
- update
- apiGroups:
- enterprise.splunk.com
resources:
- standalones
verbs:
- create
Expand All @@ -721,12 +447,26 @@ spec:
- apiGroups:
- enterprise.splunk.com
resources:
- clustermanagers/finalizers
- clustermasters/finalizers
- indexerclusters/finalizers
- licensemanagers/finalizers
- licensemasters/finalizers
- monitoringconsoles/finalizers
- searchheadclusters/finalizers
- standalones/finalizers
verbs:
- update
- apiGroups:
- enterprise.splunk.com
resources:
- clustermanagers/status
- clustermasters/status
- indexerclusters/status
- licensemanagers/status
- licensemasters/status
- monitoringconsoles/status
- searchheadclusters/status
- standalones/status
verbs:
- get
Expand Down Expand Up @@ -930,5 +670,5 @@ spec:
relatedImages:
- image: docker.io/splunk/splunk:9.3.0
name: splunk-enterprise
replaces: splunk-operator.v2.5.2
version: 2.6.0
replaces: splunk-operator.v2.6.0
version: 2.6.1
8 changes: 4 additions & 4 deletions config/manifests/bases/splunk-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ metadata:
deploy Splunk Enterprise on your choice of private or public cloud provider.
The Operator simplifies scaling and management of Splunk Enterprise by automating
administrative workflows using Kubernetes best practices.
olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.9"}]'
olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.15"}]'
repository: https://github.com/splunk/splunk-operator
name: splunk-operator.v2.6.0
name: splunk-operator.v2.6.1
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -274,5 +274,5 @@ spec:
provider:
name: Splunk Inc.
url: www.splunk.com
replaces: splunk-operator.v2.5.2
version: 2.6.0
replaces: splunk-operator.v2.6.0
version: 2.6.1
Loading