Skip to content

Commit 0996178

Browse files
authored
Merge pull request #1351 from splunk/release/2.6.0
Splunk Operator 2.6.0 release
2 parents a98d120 + ebe8f68 commit 0996178

31 files changed

+172
-41
lines changed

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ KUBECTL_VERSION=v1.29.1
66
AZ_CLI_VERSION=2.30.0
77
EKSCTL_VERSION=v0.143.0
88
EKS_CLUSTER_K8_VERSION=1.27
9-
SPLUNK_ENTERPRISE_RELEASE_IMAGE=splunk/splunk:9.1.3
9+
SPLUNK_ENTERPRISE_RELEASE_IMAGE=splunk/splunk:9.2.2

.github/workflows/build-test-push-workflow.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,12 @@ jobs:
8787
- name: Login to Amazon ECR
8888
id: login-ecr
8989
uses: aws-actions/amazon-ecr-login@v1
90-
91-
90+
- name: Login to Redhat registry
91+
uses: docker/login-action@v3
92+
with:
93+
registry: registry.redhat.io
94+
username: ${{ secrets.REDHAT_REGISTRY_ID }}
95+
password: ${{ secrets.REDHAT_REGISTRY_PASSWORD }}
9296
- name: Make Splunk Operator Image
9397
run: |
9498
make docker-build IMG=${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA
@@ -130,6 +134,7 @@ jobs:
130134
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
131135
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
132136
aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
137+
133138
- name: Login to Amazon ECR
134139
uses: aws-actions/amazon-ecr-login@v1
135140
- name: Pull Splunk Operator Image Locally

Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o manager main.go
2323
# Use distroless as minimal base image to package the manager binary
2424
# Refer to https://github.com/GoogleContainerTools/distroless for more details
2525
FROM registry.access.redhat.com/ubi8/ubi:8.10
26-
2726
ENV OPERATOR=/manager \
2827
USER_UID=1001 \
2928
USER_NAME=nonroot

bundle/manifests/enterprise.splunk.com_clustermanagers.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ spec:
3939
jsonPath: .metadata.creationTimestamp
4040
name: Age
4141
type: date
42+
- description: Auxillary message describing CR status
43+
jsonPath: .status.message
44+
name: Message
45+
type: string
4246
name: v4
4347
schema:
4448
openAPIV3Schema:
@@ -4236,6 +4240,9 @@ spec:
42364240
needToPushMasterApps:
42374241
type: boolean
42384242
type: object
4243+
message:
4244+
description: Auxillary message describing CR status
4245+
type: string
42394246
phase:
42404247
description: current phase of the cluster manager
42414248
enum:

bundle/manifests/enterprise.splunk.com_indexerclusters.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3826,6 +3826,10 @@ spec:
38263826
jsonPath: .metadata.creationTimestamp
38273827
name: Age
38283828
type: date
3829+
- description: Auxillary message describing CR status
3830+
jsonPath: .status.message
3831+
name: Message
3832+
type: string
38293833
name: v4
38303834
schema:
38313835
openAPIV3Schema:
@@ -7514,6 +7518,9 @@ spec:
75147518
maintenance_mode:
75157519
description: Indicates if the cluster is in maintenance mode.
75167520
type: boolean
7521+
message:
7522+
description: Auxillary message describing CR status
7523+
type: string
75177524
namespace_scoped_secret_resource_version:
75187525
description: Indicates resource version of namespace scoped secret
75197526
type: string

bundle/manifests/enterprise.splunk.com_licensemanagers.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ spec:
2727
jsonPath: .metadata.creationTimestamp
2828
name: Age
2929
type: date
30+
- description: Auxillary message describing CR status
31+
jsonPath: .status.message
32+
name: Message
33+
type: string
3034
name: v4
3135
schema:
3236
openAPIV3Schema:
@@ -4099,6 +4103,9 @@ spec:
40994103
description: App Framework version info for future use
41004104
type: integer
41014105
type: object
4106+
message:
4107+
description: Auxillary message describing CR status
4108+
type: string
41024109
phase:
41034110
description: current phase of the license manager
41044111
enum:

bundle/manifests/enterprise.splunk.com_monitoringconsoles.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4157,6 +4157,10 @@ spec:
41574157
jsonPath: .metadata.creationTimestamp
41584158
name: Age
41594159
type: date
4160+
- description: Auxillary message describing CR status
4161+
jsonPath: .status.message
4162+
name: Message
4163+
type: string
41604164
name: v4
41614165
schema:
41624166
openAPIV3Schema:
@@ -8237,6 +8241,9 @@ spec:
82378241
needToPushMasterApps:
82388242
type: boolean
82398243
type: object
8244+
message:
8245+
description: Auxillary message describing CR status
8246+
type: string
82408247
phase:
82418248
description: current phase of the monitoring console
82428249
enum:

bundle/manifests/enterprise.splunk.com_searchheadclusters.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4248,6 +4248,10 @@ spec:
42484248
jsonPath: .metadata.creationTimestamp
42494249
name: Age
42504250
type: date
4251+
- description: Auxillary message describing CR status
4252+
jsonPath: .status.message
4253+
name: Message
4254+
type: string
42514255
name: v4
42524256
schema:
42534257
openAPIV3Schema:
@@ -8388,6 +8392,9 @@ spec:
83888392
type: string
83898393
type: object
83908394
type: array
8395+
message:
8396+
description: Auxillary message describing CR status
8397+
type: string
83918398
minPeersJoined:
83928399
description: true if the minimum number of search head cluster members
83938400
have joined

bundle/manifests/enterprise.splunk.com_standalones.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4401,6 +4401,10 @@ spec:
44014401
jsonPath: .metadata.creationTimestamp
44024402
name: Age
44034403
type: date
4404+
- description: Auxillary message describing CR status
4405+
jsonPath: .status.message
4406+
name: Message
4407+
type: string
44044408
name: v4
44054409
schema:
44064410
openAPIV3Schema:
@@ -8593,6 +8597,9 @@ spec:
85938597
description: App Framework version info for future use
85948598
type: integer
85958599
type: object
8600+
message:
8601+
description: Auxillary message describing CR status
8602+
type: string
85968603
phase:
85978604
description: current phase of the standalone instances
85988605
enum:

bundle/manifests/splunk-operator.clusterserviceversion.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ 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-02-29T18:47:11Z"
114+
createdAt: "2024-07-12T00:58:17Z"
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
@@ -808,14 +808,14 @@ spec:
808808
fieldRef:
809809
fieldPath: metadata.annotations['olm.targetNamespaces']
810810
- name: RELATED_IMAGE_SPLUNK_ENTERPRISE
811-
value: docker.io/splunk/splunk:9.1.3
811+
value: docker.io/splunk/splunk:9.2.2
812812
- name: OPERATOR_NAME
813813
value: splunk-operator
814814
- name: POD_NAME
815815
valueFrom:
816816
fieldRef:
817817
fieldPath: metadata.name
818-
image: docker.io/splunk/splunk-operator:2.5.2
818+
image: docker.io/splunk/splunk-operator:2.6.0
819819
imagePullPolicy: Always
820820
livenessProbe:
821821
httpGet:
@@ -853,6 +853,7 @@ spec:
853853
name: app-staging
854854
securityContext:
855855
fsGroup: 1001
856+
fsGroupChangePolicy: OnRootMismatch
856857
runAsNonRoot: true
857858
runAsUser: 1001
858859
serviceAccountName: splunk-operator-controller-manager
@@ -927,7 +928,7 @@ spec:
927928
name: Splunk Inc.
928929
url: www.splunk.com
929930
relatedImages:
930-
- image: docker.io/splunk/splunk:9.1.3
931+
- image: docker.io/splunk/splunk:9.2.2
931932
name: splunk-enterprise
932933
replaces: splunk-operator.v2.5.1
933934
version: 2.5.2

0 commit comments

Comments
 (0)