This commit does multiple things:
* remove support for AllNodes where we would deploy one rgw per node on
all the nodes.
* a transition path is implemented in the code so that if someone has an
existing deployment, daemonsets will be removed and replaced by an
deployments.
* when using "instances", each rgw deployed has its own key which makes
Ceph reporting the exact number of rgw running, see:
```
[root@rook-ceph-operator-775cf575c5-bh4sr /]# ceph -s
cluster:
id: 611fcf39-0669-4864-9a12-debb35c0397a
health: HEALTH_OK
services:
mon: 3 daemons, quorum a,b,c (age 12h)
mgr: a(active, since 12h)
osd: 3 osds: 3 up (since 12h), 3 in (since 12h)
rgw: 3 daemons active (my.store.a, my.store.b, my.store.c)
data:
pools: 6 pools, 600 pgs
objects: 235 objects, 3.8 KiB
usage: 3.0 GiB used, 84 GiB / 87 GiB avail
pgs: 600 active+clean
```
Closes: https://github.com/rook/rook/issues/2474, https://github.com/rook/rook/issues/2957 and https://github.com/rook/rook/issues/3245
Signed-off-by: Sébastien Han <seb@redhat.com>
83 lines
2.5 KiB
Go
83 lines
2.5 KiB
Go
/*
|
|
Copyright 2019 The Rook Authors. All rights reserved.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package mgr
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/rook/rook/pkg/operator/ceph/config"
|
|
"github.com/rook/rook/pkg/operator/ceph/config/keyring"
|
|
"k8s.io/apimachinery/pkg/api/errors"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
)
|
|
|
|
const (
|
|
keyringTemplate = `
|
|
[mgr.%s]
|
|
key = %s
|
|
caps mon = "allow *"
|
|
caps mds = "allow *"
|
|
caps osd = "allow *"
|
|
`
|
|
)
|
|
|
|
// mgrConfig for a single mgr
|
|
type mgrConfig struct {
|
|
ResourceName string // the name rook gives to mgr resources in k8s metadata
|
|
DaemonID string // the ID of the Ceph daemon ("a", "b", ...)
|
|
DashboardPort int // port used by Ceph dashboard
|
|
DataPathMap *config.DataPathMap // location to store data in container
|
|
}
|
|
|
|
func (c *Cluster) dashboardPort() int {
|
|
if c.dashboard.Port == 0 {
|
|
// select default ports
|
|
if c.clusterInfo.CephVersion.IsLuminous() {
|
|
return dashboardPortHTTP
|
|
}
|
|
return dashboardPortHTTPS
|
|
}
|
|
// crd validates port >= 0
|
|
return c.dashboard.Port
|
|
}
|
|
|
|
func (c *Cluster) generateKeyring(m *mgrConfig) error {
|
|
user := fmt.Sprintf("mgr.%s", m.DaemonID)
|
|
/* TODO: the access string here does not match the access from the keyring template. should they match? */
|
|
access := []string{"mon", "allow *", "mds", "allow *", "osd", "allow *"}
|
|
/* TODO: can we change this ownerref to be the deployment or service? */
|
|
s := keyring.GetSecretStore(c.context, c.Namespace, &c.ownerRef)
|
|
|
|
key, err := s.GenerateKey(user, access)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// Delete legacy key store for upgrade from Rook v0.9.x to v1.0.x
|
|
err = c.context.Clientset.CoreV1().Secrets(c.Namespace).Delete(m.ResourceName, &metav1.DeleteOptions{})
|
|
if err != nil {
|
|
if errors.IsNotFound(err) {
|
|
logger.Debugf("legacy mgr key %s is already removed", m.ResourceName)
|
|
} else {
|
|
logger.Warningf("legacy mgr key %s could not be removed: %+v", m.ResourceName, err)
|
|
}
|
|
}
|
|
|
|
keyring := fmt.Sprintf(keyringTemplate, m.DaemonID, key)
|
|
return s.CreateOrUpdate(m.ResourceName, keyring)
|
|
}
|