Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .biased_lang_exclude
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ api/v4/zz_generated.deepcopy.go
api/v4/common_types.go
#Below should be reviewed once CRDs have no bias lang
tools/bias_lang_migration.sh
go.mod
go.sum
.github/
.circleci/
Expand Down
6 changes: 3 additions & 3 deletions .env
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
OPERATOR_SDK_VERSION=v1.39.0
REVIEWERS=vivekr-splunk,rlieberman-splunk,patrykw-splunk,Igor-splunk,kasiakoziol,kubabuczak
GO_VERSION=1.23.0
OPERATOR_SDK_VERSION=v1.41.1
REVIEWERS=vivekr-splunk,rlieberman-splunk,patrykw-splunk,Igor-splunk,kasiakoziol,kubabuczak,gabrielm-splunk
GO_VERSION=1.24.4
AWSCLI_URL=https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.8.6.zip
KUBECTL_VERSION=v1.29.1
AZ_CLI_VERSION=2.79.0
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/build-test-push-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ jobs:
SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator
ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }}
S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
SPLUNK_GENERAL_TERMS: --accept-sgt-current-at-splunk-com

steps:
- name: Set up cosign
uses: sigstore/cosign-installer@main
Expand Down Expand Up @@ -115,6 +117,8 @@ jobs:
ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }}
S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
IMAGE_NAME: ${{ secrets.ECR_REPOSITORY }}/splunk/splunk-operator:${{ github.sha }}
SPLUNK_GENERAL_TERMS: --accept-sgt-current-at-splunk-com

steps:
- name: Set up cosign
uses: sigstore/cosign-installer@main
Expand Down Expand Up @@ -189,6 +193,8 @@ jobs:
EKS_SSH_PUBLIC_KEY: ${{ secrets.EKS_SSH_PUBLIC_KEY }}
CLUSTER_WIDE: "true"
DEPLOYMENT_TYPE: ""
SPLUNK_GENERAL_TERMS: --accept-sgt-current-at-splunk-com

steps:
- name: Set Test Cluster Name
run: |
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/int-test-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
- develop
- main
- feature**
- CSPL-3964-upgrade-operator-sdk
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remember to remove it before merge.

jobs:
build-operator-image:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal
ARG BASE_IMAGE_VERSION=8.10-1761032271

# Build the manager binary
FROM golang:1.24.2 AS builder
FROM golang:1.24.4 AS builder

WORKDIR /workspace

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.distroless
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.24.2 AS builder
FROM golang:1.24.4 AS builder

WORKDIR /workspace
# Copy the Go Modules manifests
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ $(LOCALBIN):

## Tool Versions
KUSTOMIZE_VERSION ?= v5.4.3
CONTROLLER_TOOLS_VERSION ?= v0.16.1
CONTROLLER_TOOLS_VERSION ?= v0.18.0

CONTROLLER_GEN = $(LOCALBIN)/controller-gen
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
Expand Down Expand Up @@ -263,7 +263,7 @@ ifeq (,$(shell which opm 2>/dev/null))
set -e ;\
mkdir -p $(dir $(OPM)) ;\
OS=$(shell go env GOOS) && ARCH=$(shell go env GOARCH) && \
curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.24.2/$${OS}-$${ARCH}-opm ;\
curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.55.0/$${OS}-$${ARCH}-opm ;\
chmod +x $(OPM) ;\
}
else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
creationTimestamp: null
labels:
name: splunk-operator
app.kubernetes.io/name: splunk-operator
name: clustermanagers.enterprise.splunk.com
spec:
group: enterprise.splunk.com
Expand Down
1 change: 1 addition & 0 deletions bundle/manifests/enterprise.splunk.com_clustermasters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
creationTimestamp: null
labels:
name: splunk-operator
app.kubernetes.io/name: splunk-operator
name: clustermasters.enterprise.splunk.com
spec:
group: enterprise.splunk.com
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
creationTimestamp: null
labels:
name: splunk-operator
app.kubernetes.io/name: splunk-operator
name: indexerclusters.enterprise.splunk.com
spec:
group: enterprise.splunk.com
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
creationTimestamp: null
labels:
name: splunk-operator
app.kubernetes.io/name: splunk-operator
name: licensemanagers.enterprise.splunk.com
spec:
group: enterprise.splunk.com
Expand Down
1 change: 1 addition & 0 deletions bundle/manifests/enterprise.splunk.com_licensemasters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
creationTimestamp: null
labels:
name: splunk-operator
app.kubernetes.io/name: splunk-operator
name: licensemasters.enterprise.splunk.com
spec:
group: enterprise.splunk.com
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
creationTimestamp: null
labels:
name: splunk-operator
app.kubernetes.io/name: splunk-operator
name: monitoringconsoles.enterprise.splunk.com
spec:
group: enterprise.splunk.com
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
creationTimestamp: null
labels:
name: splunk-operator
app.kubernetes.io/name: splunk-operator
name: searchheadclusters.enterprise.splunk.com
spec:
group: enterprise.splunk.com
Expand Down
1 change: 1 addition & 0 deletions bundle/manifests/enterprise.splunk.com_standalones.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
creationTimestamp: null
labels:
name: splunk-operator
app.kubernetes.io/name: splunk-operator
name: standalones.enterprise.splunk.com
spec:
group: enterprise.splunk.com
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,7 @@ spec:
labels:
control-plane: controller-manager
name: splunk-operator
app.kubernetes.io/name: splunk-operator
spec:
containers:
- args:
Expand Down
4 changes: 2 additions & 2 deletions cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,11 @@ func main() {
// as certificates issued by a trusted Certificate Authority (CA). The primary risk is potentially allowing
// unauthorized access to sensitive metrics data. Consider replacing with CertDir, CertName, and KeyName
// to provide certificates, ensuring the server communicates using trusted and secure certificates.
TLSOpts: tlsOpts,
TLSOpts: tlsOpts,
FilterProvider: filters.WithAuthenticationAndAuthorization,
}

// TODO: enable https for /metrics endpoint by default
// TODO: enable https for /metrics endpoint by default
// if secureMetrics {
// // FilterProvider is used to protect the metrics endpoint with authn/authz.
// // These configurations ensure that only authorized users and service accounts
Expand Down
Loading
Loading