Skip to content

csv: Update images #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Sep 13, 2019
Merged

csv: Update images #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions deploy/olm-catalog/ocs-operator/0.0.1/noobaa.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ spec:
description: CoreResources (optional) overrides the default resource
requirements for the server container
type: object
dbVolumeResources:
description: 'DBVolumeResources (optional) overrides the default PVC
resource requirements for the database volume (mongo). Updates to
this value are supported only for increasing the size, and only if
the storage class specifies `allowVolumeExpansion: true`.'
type: object
image:
description: Image (optional) overrides the default image for the server
container
Expand Down
6 changes: 3 additions & 3 deletions deploy/olm-catalog/ocs-operator/0.0.1/ocs-operator.v0.0.1.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,7 +820,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: rook/ceph:v1.1.0-beta.1
image: rook/ceph:v1.1.0
name: rook-ceph-operator
resources: {}
volumeMounts:
Expand Down Expand Up @@ -864,7 +864,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: noobaa/noobaa-operator:1.1.0
image: noobaa/noobaa-operator:1.1.1
imagePullPolicy: IfNotPresent
name: noobaa-operator
resources:
Expand Down Expand Up @@ -904,7 +904,7 @@ spec:
- name: OPERATOR_NAME
value: ocs-operator
- name: CEPH_IMAGE
value: ceph/ceph:v14.2.2-20190826
value: ceph/ceph:v14.2.3-20190904
image: quay.io/ocs-dev/ocs-operator:latest
imagePullPolicy: Always
name: ocs-operator
Expand Down
8 changes: 4 additions & 4 deletions hack/generate-latest-csv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ CSV_CHECKSUM="tools/csv-checksum/csv-checksum"
(cd tools/csv-checksum/ && go build)

NOOBAA_VERSION="1.1.0"
ROOK_VERSION="v1.1.0-beta.1"
ROOK_VERSION="v1.1.0"

export CSV_CHECKSUM_OUTFILE="hack/latest-csv-checksum.md5"

# Current DEV version of the CSV
export CSV_VERSION=0.0.1

# Current dependency images our DEV CSV are pinned to
export ROOK_IMAGE=rook/ceph:$ROOK_VERSION
export NOOBAA_IMAGE=noobaa/noobaa-operator:$NOOBAA_VERSION
export CEPH_IMAGE=ceph/ceph:v14.2.2-20190826
export ROOK_IMAGE=rook/ceph:v1.1.0
export NOOBAA_IMAGE=noobaa/noobaa-operator:1.1.1
export CEPH_IMAGE=ceph/ceph:v14.2.3-20190904
export OCS_IMAGE=quay.io/ocs-dev/ocs-operator:latest

echo "=== Generating DEV CSV with the following vars ==="
Expand Down
2 changes: 1 addition & 1 deletion hack/latest-csv-checksum.md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a3908775dc6200521700b9c48270d134
9ab1a48e49408fb4a829ad5c9113cb1f