You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ho...@apache.org on 2021/04/14 22:42:09 UTC
[solr-operator] branch release-0.3 updated: Fixes for release.
This is an automated email from the ASF dual-hosted git repository.
houston pushed a commit to branch release-0.3
in repository https://gitbox.apache.org/repos/asf/solr-operator.git
The following commit(s) were added to refs/heads/release-0.3 by this push:
new 57dbf98 Fixes for release.
57dbf98 is described below
commit 57dbf98d4e0d86866b24d118e5c7541999e00cc8
Author: Houston Putman <ho...@apache.org>
AuthorDate: Wed Apr 14 17:39:43 2021 -0500
Fixes for release.
---
controllers/solrcloud_controller.go | 2 ++
hack/install_dependencies.sh | 2 +-
hack/release/artifacts/create_artifacts.sh | 6 +++---
hack/release/smoke_test/verify_all.sh | 6 +++---
hack/release/wizard/releaseWizard.py | 10 +++++-----
hack/release/wizard/releaseWizard.yaml | 4 ++--
hack/release/wizard/scriptutil.py | 4 ++--
7 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/controllers/solrcloud_controller.go b/controllers/solrcloud_controller.go
index 9bd11e1..851a99a 100644
--- a/controllers/solrcloud_controller.go
+++ b/controllers/solrcloud_controller.go
@@ -571,6 +571,8 @@ func reconcileCloudStatus(r *SolrCloudReconciler, solrCloud *solr.SolrCloud, log
backupRestoreReadyPods := 0
updateRevision := statefulSetStatus.UpdateRevision
+
+ newStatus.Replicas = statefulSetStatus.Replicas
newStatus.UpToDateNodes = int32(0)
newStatus.ReadyReplicas = int32(0)
selector, err := metav1.LabelSelectorAsSelector(&metav1.LabelSelector{
diff --git a/hack/install_dependencies.sh b/hack/install_dependencies.sh
index b92e671..0e2392b 100755
--- a/hack/install_dependencies.sh
+++ b/hack/install_dependencies.sh
@@ -15,7 +15,7 @@ GO111MODULE=on go mod tidy
#Install Kustomize
if ! (which kustomize); then
- (cd /tmp && curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | bash -s -- ${kustomize_version} /usr/local/bin)
+ (cd /tmp && curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | sudo bash -s -- ${kustomize_version} /usr/local/bin)
echo "Installed kustomize at /usr/local/bin/kustomize, version: $(kustomize version --short)"
else
echo "Kustomize already installed at $(which kustomize), version: $(kustomize version --short)"
diff --git a/hack/release/artifacts/create_artifacts.sh b/hack/release/artifacts/create_artifacts.sh
index ba82907..c5a0abc 100755
--- a/hack/release/artifacts/create_artifacts.sh
+++ b/hack/release/artifacts/create_artifacts.sh
@@ -84,11 +84,11 @@ echo "Setting up Solr Operator ${VERSION} release artifacts at '${ARTIFACTS_DIR}
(
cd "${ARTIFACTS_DIR}"
- for artifact_directory in $(find '*' -type d); do
+ for artifact_directory in $(find * -type d -maxdepth 0); do
(
cd "${artifact_directory}"
- for artifact in $(find '*' -type f -maxdepth 1 ! \( -name '*.asc' -o -name '*.sha512' -o -name '*.prov' \) ); do
+ for artifact in $(find * -type f -maxdepth 0 ! \( -name '*.asc' -o -name '*.sha512' -o -name '*.prov' \) ); do
if [ ! -f "${artifact}.asc" ]; then
gpg "${GPG_USER[@]}" -ab "${artifact}"
fi
@@ -99,7 +99,7 @@ echo "Setting up Solr Operator ${VERSION} release artifacts at '${ARTIFACTS_DIR}
)
done
- for artifact in $(find '*' -type f -maxdepth 1 ! \( -name '*.asc' -o -name '*.sha512' -o -name '*.prov' \) ); do
+ for artifact in $(find * -type f -maxdepth 0 ! \( -name '*.asc' -o -name '*.sha512' -o -name '*.prov' \) ); do
if [ ! -f "${artifact}.asc" ]; then
gpg "${GPG_USER[@]}" -ab "${artifact}"
fi
diff --git a/hack/release/smoke_test/verify_all.sh b/hack/release/smoke_test/verify_all.sh
index edcdbef..2be8838 100755
--- a/hack/release/smoke_test/verify_all.sh
+++ b/hack/release/smoke_test/verify_all.sh
@@ -91,11 +91,11 @@ echo "Download all artifacts and verify signatures"
cp -r "${LOCATION}/"* .
fi
- for artifact_directory in $(find '*' -type d); do
+ for artifact_directory in $(find * -type d -maxdepth 0); do
(
cd "${artifact_directory}"
- for artifact in $(find '*' -type f -maxdepth 1 ! \( -name '*.asc' -o -name '*.sha512' -o -name '*.prov' \) ); do
+ for artifact in $(find * -type f -maxdepth 0 ! \( -name '*.asc' -o -name '*.sha512' -o -name '*.prov' \) ); do
echo "Veryifying: ${artifact_directory}/${artifact}"
sha512sum -c "${artifact}.sha512" \
|| { echo "Invalid sha512 for ${artifact}. Aborting!"; exit 1; }
@@ -110,7 +110,7 @@ echo "Download all artifacts and verify signatures"
)
done
- for artifact in $(find '*' -type f -maxdepth 1 ! \( -name '*.asc' -o -name '*.sha512' -o -name '*.prov' \) ); do
+ for artifact in $(find * -type f -maxdepth 0 ! \( -name '*.asc' -o -name '*.sha512' -o -name '*.prov' \) ); do
echo "Veryifying: ${artifact}"
sha512sum -c "${artifact}.sha512" \
|| { echo "Invalid sha512 for ${artifact}. Aborting!"; exit 1; }
diff --git a/hack/release/wizard/releaseWizard.py b/hack/release/wizard/releaseWizard.py
index 6fe29e0..7bc851d 100755
--- a/hack/release/wizard/releaseWizard.py
+++ b/hack/release/wizard/releaseWizard.py
@@ -380,20 +380,20 @@ class ReleaseState:
ver = Version.parse(release_version)
# print("release_version=%s, ver=%s" % (release_version, ver))
if branch_type == BranchType.release:
- if not branch.startswith('branch_'):
+ if not branch.startswith('release-'):
sys.exit("Incompatible branch and branch_type")
- if not ver.is_bugfix_release():
+ if not ver.is_bugfix_release() and '.' in branch:
sys.exit("You can only release bugfix releases from an existing release branch")
elif branch_type == BranchType.stable:
- if not branch.startswith('branch_') and branch.endswith('x'):
+ if not branch.startswith('release-') and '.' not in branch:
sys.exit("Incompatible branch and branch_type")
if not ver.is_minor_release():
sys.exit("You can only release minor releases from an existing stable branch")
elif branch_type == BranchType.unstable:
if not branch == 'main':
sys.exit("Incompatible branch and branch_type")
- if not ver.is_major_release():
- sys.exit("You can only release a new major version from main branch")
+ if not (ver.is_major_release() or ver.is_minor_release()):
+ sys.exit("You can only release a new major or minor version from main branch")
if not getScriptVersion() == release_version:
print("WARNING: Expected release version %s when on branch %s, but got %s" % (
getScriptVersion(), branch, release_version))
diff --git a/hack/release/wizard/releaseWizard.yaml b/hack/release/wizard/releaseWizard.yaml
index 1de710d..cfbbb3d 100644
--- a/hack/release/wizard/releaseWizard.yaml
+++ b/hack/release/wizard/releaseWizard.yaml
@@ -492,7 +492,7 @@ groups:
.Mail template
----
To: dev@solr.apache.org
- Subject: New branch and feature freeze for the Solr Operator {{ release_version }}
+ Subject: [Operator] New branch and feature freeze for the Solr Operator {{ release_version }}
NOTICE:
@@ -532,7 +532,7 @@ groups:
.Mail template
----
To: dev@solr.apache.org
- Subject: Bugfix release Solr Operator {{ release_version }}
+ Subject: [Operator] Bugfix release Solr Operator {{ release_version }}
NOTICE:
diff --git a/hack/release/wizard/scriptutil.py b/hack/release/wizard/scriptutil.py
index 85ab718..d74f681 100644
--- a/hack/release/wizard/scriptutil.py
+++ b/hack/release/wizard/scriptutil.py
@@ -130,9 +130,9 @@ def find_branch_type():
if branchName == b'main':
return BranchType.unstable
- if re.match(r'branch_(\d+)x', branchName.decode('UTF-8')):
+ if re.match(r'release-(\d+)', branchName.decode('UTF-8')):
return BranchType.stable
- if re.match(r'branch_(\d+)_(\d+)', branchName.decode('UTF-8')):
+ if re.match(r'release-(\d+)\.(\d+)', branchName.decode('UTF-8')):
return BranchType.release
raise Exception('Cannot run %s on feature branch' % sys.argv[0].rsplit('/', 1)[-1])