Merge pull request #13428 from BlaineEXE/update-ceph-18.2.1
build: update base and manifests to ceph v18.2.1
This commit is contained in:
9 files changed
+10
-10
No files matched your search
@@ -19,4 +19,4 @@ spec:
|
||||
dataDirHostPath: /var/lib/rook
|
||||
# providing an image is required, if you want to create other CRs (rgw, mds, nfs)
|
||||
cephVersion:
|
||||
image: quay.io/ceph/ceph:v18.2.0 # Should match external cluster version
|
||||
image: quay.io/ceph/ceph:v18.2.1 # Should match external cluster version
|
||||
@@ -173,7 +173,7 @@ spec:
|
||||
requests:
|
||||
storage: 10Gi
|
||||
cephVersion:
|
||||
image: quay.io/ceph/ceph:v18.2.0
|
||||
image: quay.io/ceph/ceph:v18.2.1
|
||||
allowUnsupported: false
|
||||
skipUpgradeChecks: false
|
||||
continueUpgradeAfterChecksEvenIfNotHealthy: false
|
||||
|
||||
@@ -33,7 +33,7 @@ spec:
|
||||
requests:
|
||||
storage: 10Gi
|
||||
cephVersion:
|
||||
image: quay.io/ceph/ceph:v18.2.0
|
||||
image: quay.io/ceph/ceph:v18.2.1
|
||||
allowUnsupported: false
|
||||
skipUpgradeChecks: false
|
||||
continueUpgradeAfterChecksEvenIfNotHealthy: false
|
||||
|
||||
@@ -44,7 +44,7 @@ spec:
|
||||
mgr:
|
||||
count: 2
|
||||
cephVersion:
|
||||
image: quay.io/ceph/ceph:v18.2.0
|
||||
image: quay.io/ceph/ceph:v18.2.1
|
||||
allowUnsupported: true
|
||||
skipUpgradeChecks: false
|
||||
continueUpgradeAfterChecksEvenIfNotHealthy: false
|
||||
|
||||
@@ -38,7 +38,7 @@ spec:
|
||||
mgr:
|
||||
count: 2
|
||||
cephVersion:
|
||||
image: quay.io/ceph/ceph:v18.2.0
|
||||
image: quay.io/ceph/ceph:v18.2.1
|
||||
allowUnsupported: true
|
||||
skipUpgradeChecks: false
|
||||
continueUpgradeAfterChecksEvenIfNotHealthy: false
|
||||
|
||||
@@ -21,7 +21,7 @@ spec:
|
||||
# versions running within the cluster. See tags available at https://hub.docker.com/r/ceph/ceph/tags/.
|
||||
# If you want to be more precise, you can always use a timestamp tag such as quay.io/ceph/ceph:v17.2.6-20231027
|
||||
# This tag might not contain a new Ceph version, just security fixes from the underlying operating system, which will reduce vulnerabilities
|
||||
image: quay.io/ceph/ceph:v18.2.0
|
||||
image: quay.io/ceph/ceph:v18.2.1
|
||||
# Whether to allow unsupported versions of Ceph. Currently `quincy` and `reef` are supported.
|
||||
# Future versions such as `squid` (v19) would require this to be set to `true`.
|
||||
# Do not set to true in production.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
gcr.io/k8s-staging-sig-storage/objectstorage-sidecar/objectstorage-sidecar:v20230130-v0.1.0-24-gc0cf995
|
||||
quay.io/ceph/ceph:v18.2.0
|
||||
quay.io/ceph/ceph:v18.2.1
|
||||
quay.io/ceph/cosi:v0.1.1
|
||||
quay.io/cephcsi/cephcsi:v3.10.0
|
||||
quay.io/csiaddons/k8s-sidecar:v0.7.0
|
||||
|
||||
@@ -18,7 +18,7 @@ spec:
|
||||
dnsPolicy: ClusterFirstWithHostNet
|
||||
containers:
|
||||
- name: rook-ceph-tools
|
||||
image: quay.io/ceph/ceph:v18.2.0
|
||||
image: quay.io/ceph/ceph:v18.2.1
|
||||
command:
|
||||
- /bin/bash
|
||||
- -c
|
||||
|
||||
@@ -18,9 +18,9 @@ include ../image.mk
|
||||
# Image Build Options
|
||||
|
||||
ifeq ($(GOARCH),amd64)
|
||||
CEPH_VERSION ?= v18.2.0-20231018
|
||||
CEPH_VERSION ?= v18.2.1-20231215
|
||||
else
|
||||
CEPH_VERSION ?= v18.2.0-20231018
|
||||
CEPH_VERSION ?= v18.2.1-20231215
|
||||
endif
|
||||
REGISTRY_NAME = quay.io
|
||||
BASEIMAGE = $(REGISTRY_NAME)/ceph/ceph-$(GOARCH):$(CEPH_VERSION)
|
||||
|
||||
Reference in new issue
Block a user