-
Notifications
You must be signed in to change notification settings - Fork 115
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1119 from splunk/promote-develop-to-main-2.2.1
Promote Develop to main for Splunk Operator Release 2.2.1
- Loading branch information
Showing
189 changed files
with
7,661 additions
and
419 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -38,7 +38,7 @@ RUN yum -y update-minimal --security --sec-severity=Low | |
LABEL name="splunk" \ | ||
maintainer="[email protected]" \ | ||
vendor="splunk" \ | ||
version="2.2.0" \ | ||
version="2.2.1" \ | ||
release="1" \ | ||
summary="Simplify the Deployment & Management of Splunk Products on Kubernetes" \ | ||
description="The Splunk Operator for Kubernetes (SOK) makes it easy for Splunk Administrators to deploy and operate Enterprise deployments in a Kubernetes infrastructure. Packaged as a container, it uses the operator pattern to manage Splunk-specific custom resources, following best practices to manage all the underlying Kubernetes objects for you." | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,7 @@ | |
# To re-generate a bundle for another specific version without changing the standard setup, you can: | ||
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2) | ||
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2) | ||
VERSION ?= 2.2.0 | ||
VERSION ?= 2.2.1 | ||
|
||
# SPLUNK_ENTERPRISE_IMAGE defines the splunk docker tag that is used as default image. | ||
SPLUNK_ENTERPRISE_IMAGE ?= "docker.io/splunk/splunk:edge" | ||
|
@@ -73,13 +73,13 @@ else | |
SCANNER_FILE = clair-scanner_windows_amd64.exe | ||
endif | ||
|
||
SED := sed -i | ||
SED := sed -i | ||
ifeq ($(shell uname), Linux) | ||
SED = sed -i | ||
SED = sed -i | ||
else ifeq ($(shell uname), Darwin) | ||
SED = sed -i "" | ||
SED = sed -i "" | ||
else | ||
SED = sed -i | ||
SED = sed -i | ||
endif | ||
|
||
# Setting SHELL to bash allows bash commands to be executed by recipes. | ||
|
@@ -122,15 +122,16 @@ scheck: ## Run static check against code | |
go install honnef.co/go/tools/cmd/[email protected] | ||
staticcheck ./... | ||
|
||
vet: ## Run go vet against code. | ||
vet: setup/ginkgo ## Run go vet against code. | ||
go vet ./... | ||
|
||
test: manifests generate fmt vet envtest ## Run tests. | ||
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test -v -covermode=count -coverprofile=coverage.out --timeout=300s ./pkg/splunk/common ./pkg/splunk/enterprise ./pkg/splunk/controller ./pkg/splunk/client ./pkg/splunk/util ./controllers | ||
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" ginkgo --junit-report=unit_test.xml --output-dir=`pwd` -vv --trace --keep-going --timeout=3h --cover --covermode=count --coverprofile=coverage.out ./pkg/splunk/common ./pkg/splunk/enterprise ./pkg/splunk/controller ./pkg/splunk/client ./pkg/splunk/util ./controllers | ||
|
||
|
||
##@ Build | ||
|
||
build: generate fmt vet ## Build manager binary. | ||
build: setup/ginkgo generate fmt vet ## Build manager binary. | ||
go build -o bin/manager main.go | ||
|
||
run: manifests generate fmt vet ## Run a controller from your host. | ||
|
@@ -176,7 +177,7 @@ deploy: manifests kustomize uninstall ## Deploy controller to the K8s cluster sp | |
$(SED) "s/namespace: ${NAMESPACE}/namespace: splunk-operator/g" config/default/kustomization.yaml | ||
$(SED) "s/value: \"${WATCH_NAMESPACE}\"/value: WATCH_NAMESPACE_VALUE/g" config/default/kustomization.yaml | ||
$(SED) "s|${SPLUNK_ENTERPRISE_IMAGE}|SPLUNK_ENTERPRISE_IMAGE|g" config/default/kustomization.yaml | ||
|
||
undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config. | ||
$(KUSTOMIZE) build config/default | kubectl delete -f - | ||
|
||
|
@@ -363,20 +364,21 @@ setup/devsetup: | |
@echo Installing operator-sdk | ||
@curl -LO ${OPERATOR_SDK_DL_URL}/operator-sdk_${OS}_${ARCH} | ||
@sudo chmod +x operator-sdk_${OS}_${ARCH} && sudo mv operator-sdk_${OS}_${ARCH} /usr/local/bin/operator-sdk | ||
|
||
|
||
clean: stop_clair_scanner | ||
@rm -rf ./build/_output | ||
@docker rmi $(IMG) || true | ||
@rm -f clair-scanner | ||
@rm -rf clair-scanner-logs | ||
|
||
cleanup: | ||
cleanup: | ||
@./tools/cleanup.sh | ||
|
||
.PHONY: setup/ginkgo | ||
setup/ginkgo: | ||
@echo Installing ginkgo | ||
@go get github.com/onsi/ginkgo/ginkgo | ||
@go get github.com/onsi/ginkgo/v2 | ||
@go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo@latest | ||
@echo Installing gomega | ||
@go get github.com/onsi/gomega/... |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.