Skip to content
Draft
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
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
OPERATOR_SDK_VERSION=v1.42.0
REVIEWERS=vivekr-splunk,rlieberman-splunk,patrykw-splunk,Igor-splunk,kasiakoziol,kubabuczak,gabrielm-splunk,minjieqiu,qingw-splunk
GO_VERSION=1.25.8
GO_VERSION=1.26.2
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
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ jobs:
appframeworksS1,
managersecret,
managermc,
indingsep,
indexingestionsep,
licensemanager,
]
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/arm-AL2023-int-test-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
managercrcrud,
licensemanager,
managerdeletecr,
indingsep,
indexingestionsep,
]
runs-on: ubuntu-latest
needs: build-operator-image-arm-al2023
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/arm-RHEL-build-test-push-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
managercrcrud,
licensemanager,
managerdeletecr,
indingsep,
indexingestionsep,
]
runs-on: ubuntu-latest
needs: build-operator-image-arm-rhel
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/arm-RHEL-int-test-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
managercrcrud,
licensemanager,
managerdeletecr,
indingsep,
indexingestionsep,
]
runs-on: ubuntu-latest
needs: build-operator-image-arm-rhel
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/arm-Ubuntu-build-test-push-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ jobs:
appframeworksS1,
managersecret,
managermc,
indingsep,
indexingestionsep,
licensemanager,
]
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/arm-Ubuntu-int-test-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
managercrcrud,
licensemanager,
managerdeletecr,
indingsep,
indexingestionsep,
]
runs-on: ubuntu-latest
needs: build-operator-image-arm-ubuntu
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-test-push-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ jobs:
managerappframeworkm4,
managersecret,
managermc,
indingsep,
indexingestionsep,
licensemanager,
]
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/distroless-build-test-push-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ jobs:
managerappframeworkm4,
managersecret,
managermc,
indingsep,
indexingestionsep,
licensemanager,
]
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/distroless-int-test-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
managercrcrud,
licensemanager,
managerdeletecr,
indingsep,
indexingestionsep,
]
runs-on: ubuntu-latest
needs: build-operator-image-distroless
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/int-test-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
managercrcrud,
licensemanager,
managerdeletecr,
indingsep,
indexingestionsep,
]
runs-on: ubuntu-latest
needs: build-operator-image
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual-int-test-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
managerscaling,
managercrcrud,
licensemanager,
indingsep,
indexingestionsep,
]
runs-on: ubuntu-latest
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/namespace-scope-int-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
managerscaling,
managercrcrud,
licensemanager,
indingsep,
indexingestionsep,
]
runs-on: ubuntu-latest
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly-int-test-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
managerscaling,
managercrcrud,
licensemanager,
indingsep,
indexingestionsep,
]
runs-on: ubuntu-latest
needs: build-operator-image
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
ARG PLATFORMS=linux/amd64,linux/arm64

ARG BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal
ARG BASE_IMAGE_VERSION=8.10-1775152441
ARG BASE_IMAGE_VERSION=8.10-1776645784

# Build the manager binary
FROM golang:1.25.8 AS builder
FROM golang:1.26.2 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.25.8 AS builder
FROM golang:1.26.2 AS builder

WORKDIR /workspace
# Copy the Go Modules manifests
Expand Down
25 changes: 23 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,21 @@ docs-preview: ## Preview documentation locally with Jekyll (requires Ruby and bu
@cd docs && bundle exec jekyll serve --livereload
@echo "Documentation available at http://localhost:4000/splunk-operator"

##@ Helm

HELM_OPERATOR_CHART = helm-chart/splunk-operator

.PHONY: helm-lint
helm-lint: ## Lint Helm charts
helm lint $(HELM_OPERATOR_CHART)

.PHONY: helm-test
helm-test: setup/helm-unittest ## Run Helm chart unit tests
helm unittest $(HELM_OPERATOR_CHART)

.PHONY: helm-check
helm-check: helm-lint helm-test ## Run Helm lint and unit tests

##@ Build

build: setup/ginkgo manifests generate fmt vet ## Build manager binary.
Expand All @@ -168,12 +183,12 @@ docker-push: ## Push docker image with the manager.
# Defaults:
# Build Platform: linux/amd64,linux/arm64
# Build Base OS: registry.access.redhat.com/ubi8/ubi-minimal
# Build Base OS Version: 8.10-1775152441
# Build Base OS Version: 8.10-1776645784
# Pass only what is required, the rest will be defaulted
# Setup defaults for build arguments
PLATFORMS ?= linux/amd64,linux/arm64
BASE_IMAGE ?= registry.access.redhat.com/ubi8/ubi-minimal
BASE_IMAGE_VERSION ?= 8.10-1775152441
BASE_IMAGE_VERSION ?= 8.10-1776645784

docker-buildx:
@if [ -z "${IMG}" ]; then \
Expand Down Expand Up @@ -226,6 +241,7 @@ $(LOCALBIN):
KUSTOMIZE_VERSION ?= v5.4.3
CONTROLLER_TOOLS_VERSION ?= v0.18.0
GOLANGCI_LINT_VERSION ?= v2.1.0
HELM_UNITTEST_VERSION ?= v1.0.3

CONTROLLER_GEN = $(LOCALBIN)/controller-gen
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
Expand Down Expand Up @@ -464,6 +480,11 @@ setup/ginkgo:
@echo Installing gomega
@go get github.com/onsi/gomega/...

.PHONY: setup/helm-unittest
setup/helm-unittest:
@helm plugin list 2>/dev/null | grep -q unittest || \
helm plugin install https://github.com/helm-unittest/helm-unittest.git --version $(HELM_UNITTEST_VERSION)

.PHONY: build-installer
build-installer: manifests generate kustomize
mkdir -p dist
Expand Down
4 changes: 2 additions & 2 deletions api/v4/ingestorcluster_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ type IngestorClusterStatus struct {
// Telemetry App installation flag
TelAppInstalled bool `json:"telAppInstalled"`

// Auxillary message describing CR status
// Auxiliary message describing CR status
Message string `json:"message"`

// Credential secret version to track changes to the secret and trigger rolling restart of indexer cluster peers when the secret is updated
Expand All @@ -95,7 +95,7 @@ type IngestorClusterStatus struct {
// +kubebuilder:printcolumn:name="Desired",type="integer",JSONPath=".status.replicas",description="Number of desired ingestor cluster pods"
// +kubebuilder:printcolumn:name="Ready",type="integer",JSONPath=".status.readyReplicas",description="Current number of ready ingestor cluster pods"
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Age of ingestor cluster resource"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message",description="Auxillary message describing CR status"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message",description="Auxiliary message describing CR status"
// +kubebuilder:storageversion

// IngestorCluster is the Schema for the ingestorclusters API
Expand Down
4 changes: 2 additions & 2 deletions api/v4/objectstorage_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ type ObjectStorageStatus struct {
// Resource revision tracker
ResourceRevMap map[string]string `json:"resourceRevMap"`

// Auxillary message describing CR status
// Auxiliary message describing CR status
Message string `json:"message"`
}

Expand All @@ -73,7 +73,7 @@ type ObjectStorageStatus struct {
// +kubebuilder:resource:path=objectstorages,scope=Namespaced,shortName=os
// +kubebuilder:printcolumn:name="Phase",type="string",JSONPath=".status.phase",description="Status of object storage"
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Age of object storage resource"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message",description="Auxillary message describing CR status"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message",description="Auxiliary message describing CR status"
// +kubebuilder:storageversion

// ObjectStorage is the Schema for the objectstorages API
Expand Down
4 changes: 2 additions & 2 deletions api/v4/queue_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ type QueueStatus struct {
// Resource revision tracker
ResourceRevMap map[string]string `json:"resourceRevMap"`

// Auxillary message describing CR status
// Auxiliary message describing CR status
Message string `json:"message"`
}

Expand All @@ -102,7 +102,7 @@ type QueueStatus struct {
// +kubebuilder:resource:path=queues,scope=Namespaced,shortName=queue
// +kubebuilder:printcolumn:name="Phase",type="string",JSONPath=".status.phase",description="Status of queue"
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Age of queue resource"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message",description="Auxillary message describing CR status"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message",description="Auxiliary message describing CR status"
// +kubebuilder:storageversion

// Queue is the Schema for the queues API
Expand Down
4 changes: 2 additions & 2 deletions bundle/manifests/enterprise.splunk.com_ingestorclusters.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions bundle/manifests/enterprise.splunk.com_objectstorages.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions bundle/manifests/enterprise.splunk.com_queues.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading