Random fixes for clean install
- Dependencies should work better for new developers
- Fixed version matrix
diff --git a/Makefile b/Makefile
index 1f5188c..8c76497 100644
--- a/Makefile
+++ b/Makefile
@@ -44,6 +44,7 @@
GO_LICENSES_VERSION=v1.5.0
GINKGO_VERSION = $(shell cat go.mod | grep 'github.com/onsi/ginkgo' | sed 's/.*\(v.*\)$$/\1/g')
KIND_VERSION=v0.17.0
+YQ_VERSION=v4.33.3
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
ENVTEST_K8S_VERSION ?= 1.25.0
@@ -137,9 +138,21 @@
.PHONY: build-release-artifacts
# Use path for subcommands so that we use the correct dev-dependencies rather than those installed globally
build-release-artifacts: export PATH:=$(LOCALBIN):${PATH}
-build-release-artifacts: clean prepare docker-build ## Build all release artifacts for the Solr Operator
+build-release-artifacts: clean prepare docker-build yq kind ## Build all release artifacts for the Solr Operator
./hack/release/artifacts/create_artifacts.sh -d $(or $(ARTIFACTS_DIR),release-artifacts) -v $(VERSION)
+.PHONY: remove-version-specific-info
+# Use path for subcommands so that we use the correct dev-dependencies rather than those installed globally
+remove-version-specific-info: export PATH:=$(LOCALBIN):${PATH}
+remove-version-specific-info: yq ## Remove information specific to a version throughout the codebase
+ ./hack/release/version/remove_version_specific_info.sh
+
+.PHONY: propagate-version
+# Use path for subcommands so that we use the correct dev-dependencies rather than those installed globally
+propagate-version: export PATH:=$(LOCALBIN):${PATH}
+propagate-version: yq ## Remove information specific to a version throughout the codebase
+ ./hack/release/version/propagate_version.sh
+
.PHONY: idea
idea: ginkgo setup-envtest ## Setup the project so to be able to run tests via IntelliJ/GoLand
cat hack/idea/idea-setup.txt
@@ -230,7 +243,8 @@
$(GO_LICENSES) report . --ignore github.com/apache/solr-operator 2>/dev/null | diff dependency_licenses.csv -
.PHONY: check-zk-op-version
-check-zk-op-version: ## Ensure the zookeeper-operator version is standard throughout the codebase
+check-zk-op-version: export PATH:=$(LOCALBIN):${PATH}
+check-zk-op-version: yq ## Ensure the zookeeper-operator version is standard throughout the codebase
./hack/zk-operator/check-version.sh
.PHONY: check-manifests
@@ -351,6 +365,12 @@
$(KIND): $(LOCALBIN)
$(call go-get-tool,$(KIND),sigs.k8s.io/kind@$(KIND_VERSION))
+YQ = $(LOCALBIN)/yq
+.PHONY: yq
+yq: $(YQ) ## Download yq locally if necessary.
+$(YQ): $(LOCALBIN)
+ $(call go-get-tool,$(YQ),github.com/mikefarah/yq/v4@$(YQ_VERSION))
+
SETUP_ENVTEST = $(LOCALBIN)/setup-envtest
.PHONY: setup-envtest
setup-envtest: $(SETUP_ENVTEST) ## Download setup-envtest locally if necessary.
diff --git a/docs/development.md b/docs/development.md
index 4eab855..f8d005a 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -30,6 +30,11 @@
## Setup
+### Install a newer version of Bash
+
+If you are running on a Mac, you need to download a newer version of bash and have it used as your default version of bash.
+An easy way to do this is via Homebrew.
+
### Setup Docker for Mac with K8S with an Ingress Controller
Please follow the instructions from the [local tutorial](local_tutorial.md#setup-docker-for-mac-with-k8s).
diff --git a/docs/upgrade-notes.md b/docs/upgrade-notes.md
index 4a12451..7d8bf92 100644
--- a/docs/upgrade-notes.md
+++ b/docs/upgrade-notes.md
@@ -27,16 +27,16 @@
### Kubernetes Versions
-| Solr Operator Version | `1.15` | `1.16` - `1.18` | `1.19` - `1.21` | `1.22`+ |
-|:---------------------:| :---: | :---: |:------------------:| :---: |
-| `v0.2.6` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: |
-| `v0.2.7` | :x: | :heavy_check_mark: | :heavy_check_mark: | :x: |
-| `v0.2.8` | :x: | :heavy_check_mark: | :heavy_check_mark: | :x: |
-| `v0.3.x` | :x: | :heavy_check_mark: | :heavy_check_mark: | :x: |
-| `v0.4.x` | :x: | :heavy_check_mark: | :heavy_check_mark: | :x: |
-| `v0.5.x` | :x: | :x: | :heavy_check_mark: | :heavy_check_mark: |
-| `v0.6.x` | :x: | :x: | :heavy_check_mark: | :heavy_check_mark: |
-| `v0.7.x` | :x: | :x: | :x: | :heavy_check_mark: |
+| Solr Operator Version | `1.15` | `1.16` - `1.18` | `1.19` - `1.20` | `1.21` | `1.22`+ |
+|:---------------------:| :---: | :---: |:------------------:|:------------------:|:------------------:|
+| `v0.2.6` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: |
+| `v0.2.7` | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: |
+| `v0.2.8` | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: |
+| `v0.3.x` | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: |
+| `v0.4.x` | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: |
+| `v0.5.x` | :x: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
+| `v0.6.x` | :x: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
+| `v0.7.x` | :x: | :x: | :x: | :heavy_check_mark: | :heavy_check_mark: |
### Solr Versions
diff --git a/hack/release/wizard/releaseWizard.yaml b/hack/release/wizard/releaseWizard.yaml
index 494e245..6b8a269 100644
--- a/hack/release/wizard/releaseWizard.yaml
+++ b/hack/release/wizard/releaseWizard.yaml
@@ -450,13 +450,13 @@
cmd: git pull --ff-only
tee: true
- !Command
- cmd: ./hack/release/version/remove_version_specific_info.sh
+ cmd: make remove-version-specific-info
tee: true
- !Command
cmd: ./hack/release/version/update_version.sh -v {{ next_version }}
tee: true
- !Command
- cmd: ./hack/release/version/propagate_version.sh
+ cmd: make propagate-version
tee: true
- !Command
comment: Make sure the edits done by propagating the version are ok, then push
@@ -482,13 +482,13 @@
cmd: git pull --ff-only
tee: true
- !Command
- cmd: ./hack/release/version/remove_version_specific_info.sh
+ cmd: make remove-version-specific-info
tee: true
- !Command
cmd: ./hack/release/version/update_version.sh -v {{ next_version }}
tee: true
- !Command
- cmd: ./hack/release/version/propagate_version.sh
+ cmd: make propagate-version
tee: true
- !Command
comment: Make sure the edits done by propagating the version are ok, then push
@@ -1055,10 +1055,10 @@
cmd: ./hack/release/version/change_suffix.sh -s "prerelease"
tee: true
- !Command
- cmd: ./hack/release/version/propagate_version.sh
+ cmd: make propagate-version
tee: true
- !Command
- cmd: ./hack/release/version/remove_version_specific_info.sh
+ cmd: make remove-version-specific-info
tee: true
- !Command
cmd: git diff
