From 73689a0afcb2201fcf271370344572e43d17e14b Mon Sep 17 00:00:00 2001
From: Frank Ritchie <fr801x@att.com>
Date: Tue, 11 May 2021 13:56:37 -0400
Subject: [PATCH] Update rook operator to v1.6.3

This PS is to update the rook operator image to v1.6.3.

Release notes:

https://github.com/rook/rook/releases/tag/v1.6.3

The storage team is specifically interested in:

https://github.com/rook/rook/pull/7951
https://github.com/rook/rook/pull/7884

Change-Id: Iea9479ccb6664d499e90cbad46a43912f7936530
---
 manifests/composite/storage-cluster/rook-ceph-tools.yaml      | 2 +-
 manifests/function/rook-operator/upstream/crds.yaml           | 2 ++
 manifests/function/rook-operator/upstream/operator.yaml       | 2 +-
 .../treasuremap-base-catalogues/versions-treasuremap.yaml     | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/manifests/composite/storage-cluster/rook-ceph-tools.yaml b/manifests/composite/storage-cluster/rook-ceph-tools.yaml
index 9e7c0112c..e3c236985 100644
--- a/manifests/composite/storage-cluster/rook-ceph-tools.yaml
+++ b/manifests/composite/storage-cluster/rook-ceph-tools.yaml
@@ -19,7 +19,7 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
         - name: rook-ceph-tools
-          image: rook/ceph:v1.6.2
+          image: rook/ceph:v1.6.3
           command: ["/tini"]
           args: ["-g", "--", "/usr/local/bin/toolbox.sh"]
           imagePullPolicy: IfNotPresent
diff --git a/manifests/function/rook-operator/upstream/crds.yaml b/manifests/function/rook-operator/upstream/crds.yaml
index ac5118692..880a888db 100644
--- a/manifests/function/rook-operator/upstream/crds.yaml
+++ b/manifests/function/rook-operator/upstream/crds.yaml
@@ -6026,6 +6026,7 @@ spec:
                       format: int32
                       maximum: 65535
                       minimum: 0
+                      nullable: true
                       type: integer
                     service:
                       description: The configuration related to add/set on each rgw service.
@@ -6039,6 +6040,7 @@ spec:
                       type: object
                     sslCertificateRef:
                       description: The name of the secret that stores the ssl certificate for secure rgw connections
+                      nullable: true
                       type: string
                   required:
                     - instances
diff --git a/manifests/function/rook-operator/upstream/operator.yaml b/manifests/function/rook-operator/upstream/operator.yaml
index 38e902f0c..ccc74542b 100644
--- a/manifests/function/rook-operator/upstream/operator.yaml
+++ b/manifests/function/rook-operator/upstream/operator.yaml
@@ -323,7 +323,7 @@ spec:
       serviceAccountName: rook-ceph-system
       containers:
         - name: rook-ceph-operator
-          image: rook/ceph:v1.6.2
+          image: rook/ceph:v1.6.3
           args: ["ceph", "operator"]
           volumeMounts:
             - mountPath: /var/lib/rook
diff --git a/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml b/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml
index ef5632580..e0b6fac89 100644
--- a/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml
+++ b/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml
@@ -114,7 +114,7 @@ spec:
     rook-operator:
       rook-ceph-operator:
         rook-ceph-operator:
-          image: rook/ceph:v1.6.2
+          image: rook/ceph:v1.6.3
       rook-ceph-operator-config:
         ceph_daemon:
           image: ceph/ceph:v15.2.11
@@ -135,7 +135,7 @@ spec:
         ceph-version:
           image: ceph/ceph:v15.2.11
         rook-ceph-tools:
-          image: rook/ceph:v1.6.2
+          image: rook/ceph:v1.6.3
 
   image_components:
   # image_components are organized by