airship/treasuremap
Code Issues Proposed changes

Merge "Update rook operator to v1.6.3"

Browse Source
This commit is contained in:
Zuul 2021-06-07 19:56:37 +00:00 committed by Gerrit Code Review
commit b538fedb99
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/composite/storage-cluster/rook-ceph-tools.yaml
View File

@ -19,7 +19,7 @@ spec:
dnsPolicy: ClusterFirstWithHostNet dnsPolicy: ClusterFirstWithHostNet
containers: containers:
- name: rook-ceph-tools - name: rook-ceph-tools
image: rook/ceph:v1.6.2 image: rook/ceph:v1.6.3
command: ["/tini"] command: ["/tini"]
args: ["-g", "--", "/usr/local/bin/toolbox.sh"] args: ["-g", "--", "/usr/local/bin/toolbox.sh"]
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent

2
manifests/function/rook-operator/upstream/crds.yaml
View File

@ -6026,6 +6026,7 @@ spec:
format: int32 format: int32
maximum: 65535 maximum: 65535
minimum: 0 minimum: 0
nullable: true
type: integer type: integer
service: service:
description: The configuration related to add/set on each rgw service. description: The configuration related to add/set on each rgw service.
@ -6039,6 +6040,7 @@ spec:
type: object type: object
sslCertificateRef: sslCertificateRef:
description: The name of the secret that stores the ssl certificate for secure rgw connections description: The name of the secret that stores the ssl certificate for secure rgw connections
nullable: true
type: string type: string
required: required:
- instances - instances

2
manifests/function/rook-operator/upstream/operator.yaml
View File

@ -323,7 +323,7 @@ spec:
serviceAccountName: rook-ceph-system serviceAccountName: rook-ceph-system
containers: containers:
- name: rook-ceph-operator - name: rook-ceph-operator
image: rook/ceph:v1.6.2 image: rook/ceph:v1.6.3
args: ["ceph", "operator"] args: ["ceph", "operator"]
volumeMounts: volumeMounts:
- mountPath: /var/lib/rook - mountPath: /var/lib/rook

4
manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml
View File

@ -114,7 +114,7 @@ spec:
rook-operator: rook-operator:
rook-ceph-operator: rook-ceph-operator:
rook-ceph-operator: rook-ceph-operator:
image: rook/ceph:v1.6.2 image: rook/ceph:v1.6.3
rook-ceph-operator-config: rook-ceph-operator-config:
ceph_daemon: ceph_daemon:
image: ceph/ceph:v15.2.11 image: ceph/ceph:v15.2.11
@ -135,7 +135,7 @@ spec:
ceph-version: ceph-version:
image: ceph/ceph:v15.2.11 image: ceph/ceph:v15.2.11
rook-ceph-tools: rook-ceph-tools:
image: rook/ceph:v1.6.2 image: rook/ceph:v1.6.3
image_components: image_components:
# image_components are organized by # image_components are organized by