Skip to content

Commit e971ea4

Browse files
authored
Merge pull request #610 from openshift-cherrypick-robot/cherry-pick-606-to-release-4.16
[release-4.16] csv: update csv version to 4.16
2 parents 7b19ad3 + 3dc1590 commit e971ea4

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

.commitlintrc.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"core",
1616
"cosi",
1717
"csi",
18+
"csv",
1819
"doc",
1920
"docs",
2021
"exporter",

build/common.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,21 @@ set -u
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
BUILD_ROOT=$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd -P)
17+
BUILD_ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)
1818
SHA256CMD=${SHA256CMD:-shasum -a 256}
1919

2020
DOCKERCMD=${DOCKERCMD:-docker}
2121

2222
export scriptdir
23-
scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
23+
scriptdir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
2424
export OUTPUT_DIR=${BUILD_ROOT}/_output
2525
export WORK_DIR=${BUILD_ROOT}/.work
2626
export CACHE_DIR=${BUILD_ROOT}/.cache
2727
export GOOS
2828
GOOS=$(go env GOOS)
2929
export GOARCH
3030
GOARCH=$(go env GOARCH)
31-
DEFAULT_CSV_VERSION="4.15.0"
31+
DEFAULT_CSV_VERSION="4.16.0"
3232
CSV_VERSION="${CSV_VERSION:-${DEFAULT_CSV_VERSION}}"
3333
SKIP_RANGE="${SKIP_RANGE:-""}"
3434
REPLACES_CSV_VERSION="${REPLACES_CSV_VERSION:-""}"
@@ -39,12 +39,12 @@ BUNDLE_IMAGE="${BUNDLE_IMAGE:-${DEFAULT_BUNDLE_IMAGE}}"
3939

4040
function ver() {
4141
local full_ver maj min bug build
42-
full_ver="$1" # functions should name input params for easier understanding
42+
full_ver="$1" # functions should name input params for easier understanding
4343
maj="$(echo "${full_ver}" | cut -f1 -d'.')" # when splitting a param, name the components for easier understanding
4444
min="$(echo "${full_ver}" | cut -f2 -d'.')"
4545
bug="$(echo "${full_ver}" | cut -f3 -d'.')"
4646
build="$(echo "${full_ver}" | cut -f4 -d'.')"
47-
printf "%d%03d%03d%03d" "${maj}" "${min}" "${bug}" "${build}"
47+
printf "%d%03d%03d%03d" "${maj}" "${min}" "${bug}" "${build}"
4848
}
4949

5050
function check_git() {
@@ -54,7 +54,7 @@ function check_git() {
5454
local gitversion
5555
gitversion=$(git --version | cut -d" " -f3)
5656

57-
if (( $(ver "${gitversion}") > $(ver 2.6.6) && $(ver "${gitversion}") < $(ver 2.8.3) )); then
57+
if (($(ver "${gitversion}") > $(ver 2.6.6) && $(ver "${gitversion}") < $(ver 2.8.3))); then
5858
echo WARN: you are running git version "${gitversion}" which has a bug related to relative
5959
echo WARN: submodule paths. Please consider upgrading to 2.8.3 or later
6060
fi

build/csv/ceph/rook-ceph-operator.clusterserviceversion.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1860,7 +1860,7 @@ metadata:
18601860
OgogICAgICAgIHByaW50KGYiS2V5RXJyb3I6IHtrRXJyfSIpCiAgICBleGNlcHQgT1NFcnJvciBh
18611861
cyBvc0VycjoKICAgICAgICBwcmludChmIkVycm9yIHdoaWxlIHRyeWluZyB0byBvdXRwdXQgdGhl
18621862
IGRhdGE6IHtvc0Vycn0iKQogICAgZmluYWxseToKICAgICAgICByak9iai5zaHV0ZG93bigpCg==
1863-
name: rook-ceph-operator.v4.15.0
1863+
name: rook-ceph-operator.v4.16.0
18641864
namespace: placeholder
18651865
spec:
18661866
apiservicedefinitions: {}
@@ -3384,7 +3384,7 @@ spec:
33843384
provider:
33853385
name: Red Hat
33863386
url: https://www.redhat.com
3387-
version: 4.15.0
3387+
version: 4.16.0
33883388
minKubeVersion: 1.16.0
33893389
relatedImages:
33903390
- image: docker.io/rook/ceph:v1.13.0.399.g9c0d795e2

0 commit comments

Comments
 (0)