Merge branch '0.26.2' into 0.27.0

Author: sunsingerus

deploy/builder/operatorhub.sh

@@ -8,21 +8,9 @@ SRC_ROOT="$(realpath "${CUR_DIR}/../..")"
 
 # 0.9.3
 VERSION=$(cd "${SRC_ROOT}"; cat release)
-PREVIOUS_VERSION="${PREVIOUS_VERSION}"
-
-if [[ -z "${PREVIOUS_VERSION}" ]]; then
-    echo "PREVIOUS_VERSION is not specified. Unable to proceed."
-    echo "Abort."
-    exit 1
-fi
-
 echo "=================================================================================="
-echo "PREVIOUS_VERSION: ${PREVIOUS_VERSION}"
 echo "VERSION: ${VERSION}"
-echo "!!! IMPORTANT !!!"
-echo "Please, ensure PREVIOUS_VERSION=$PREVIOUS_VERSION is what is needed"
 echo "=================================================================================="
-read -n 1 -r -s -p $'Press enter to continue...\n'
 
 OPERATORHUB_DIR="${SRC_ROOT}/deploy/operatorhub"
 MANIFESTS_DIR="${OPERATORHUB_DIR}/${VERSION}"
@@ -79,11 +67,20 @@ rm "${EXAMPLES_FILE}"
 cat "${CVV_FILE_TEMPLATE}" | \
   OPERATOR_VERSION="${VERSION}" \
   OPERATOR_RELEASE_DATE=$(date +'%Y-%m-%dT%H:%M:%SZ') \
-  PREVIOUS_OPERATOR_VERSION="${PREVIOUS_VERSION}" \
   envsubst > "${CVV_FILE}"
 
 rm "${CVV_FILE_TEMPLATE}"
 
+# Inject spec.skips from releases file (versions that may not be in the IIB from-index)
+SKIPS_FILE="skips.yaml"
+grep -v '^$' "${SRC_ROOT}/releases" | while IFS= read -r v; do
+    echo "- clickhouse-operator.v${v}"
+done > "${SKIPS_FILE}"
+if [[ -s "${SKIPS_FILE}" ]]; then
+    yq -i ".spec.skips = load(\"${SKIPS_FILE}\")" "${CVV_FILE}"
+fi
+rm "${SKIPS_FILE}"
+
 #$CHIT.crd.yaml
 #$CONF.crd.yaml
 

deploy/builder/templates-operatorhub/clickhouse-operator.vVERSION.clusterserviceversion-template.yaml

@@ -23,9 +23,9 @@ metadata:
       "{HERE WILL BE THE EXAMPLES}"
 spec:
   version: ${OPERATOR_VERSION}
-  minKubeVersion: 1.25.0
+  minKubeVersion: 1.16.0
   maturity: alpha
-  replaces: clickhouse-operator.v${PREVIOUS_OPERATOR_VERSION}
+  replaces: clickhouse-operator.v0.26.0
   maintainers:
     - email: support@altinity.com
       name: Altinity

deploy/operatorhub/0.26.2/clickhouse-operator.v0.26.2.clusterserviceversion.yaml

@@ -197,9 +197,11 @@ metadata:
       ]
 spec:
   version: 0.26.2
-  minKubeVersion: 1.25.0
+  minKubeVersion: 1.16.0
   maturity: alpha
-  replaces: clickhouse-operator.v0.26.1
+  replaces: clickhouse-operator.v0.26.0
+  skips:
+    - clickhouse-operator.v0.26.1
   maintainers:
     - email: support@altinity.com
       name: Altinity

releases

@@ -1,79 +1,2 @@
 0.26.2
 0.26.1
-0.26.0
-0.25.6
-0.25.5
-0.25.4
-0.25.3
-0.25.2
-0.25.1
-0.25.0
-0.24.5
-0.24.4
-0.24.3
-0.24.2
-0.24.1
-0.24.0
-0.23.7
-0.23.6
-0.23.5
-0.23.4
-0.23.3
-0.23.2
-0.23.1
-0.23.0
-0.22.2
-0.22.1
-0.22.0
-0.21.3
-0.21.2
-0.21.1
-0.21.0
-0.20.3
-0.20.2
-0.20.1
-0.20.0
-0.19.3
-0.19.2
-0.19.1
-0.19.0
-0.18.5
-0.18.4
-0.18.3
-0.18.2
-0.18.1
-0.18.0
-0.17.0
-0.16.1
-0.16.0
-0.15.0
-0.14.0
-0.13.5
-0.13.0
-0.12.0
-0.11.0
-0.10.0
-0.9.9
-0.9.8
-0.9.7
-0.9.6
-0.9.5
-0.9.4
-0.9.3
-0.9.2
-0.9.1
-0.9.0
-0.8.0
-0.7.0
-0.6.0
-0.5.0
-0.4.4
-0.4.3
-0.4.2
-0.4.1
-0.4.0
-0.3.0
-0.2.3
-0.2.2
-0.2.1
-0.2.0-beta