Sébastien Han
ad95c7296f
When using the "errors" package, using `%+v` (extended format), each Frame of the error's StackTrace will be printed in detail. Let's only print `%v` to print the error. If the error has a Cause it will be printed recursively. Basically `%+v` has been replaced with `%v` for all `error` type interfaces, whether the logger is Info, Warning or Error. Signed-off-by: Sébastien Han <seb@redhat.com>
88 lines
2.6 KiB
Go
88 lines
2.6 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"
|
|
apps "k8s.io/api/apps/v1"
|
|
"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", ...)
|
|
DataPathMap *config.DataPathMap // location to store data in container
|
|
}
|
|
|
|
func (c *Cluster) dashboardPort() int {
|
|
if c.dashboard.Port == 0 {
|
|
// default port for HTTP/HTTPS
|
|
if c.dashboard.SSL {
|
|
return dashboardPortHTTPS
|
|
} else {
|
|
return dashboardPortHTTP
|
|
}
|
|
}
|
|
// crd validates port >= 0
|
|
return c.dashboard.Port
|
|
}
|
|
|
|
func (c *Cluster) generateKeyring(m *mgrConfig) (string, 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 *"}
|
|
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 %q is already removed", m.ResourceName)
|
|
} else {
|
|
logger.Warningf("legacy mgr key %q could not be removed. %v", m.ResourceName, err)
|
|
}
|
|
}
|
|
|
|
keyring := fmt.Sprintf(keyringTemplate, m.DaemonID, key)
|
|
return keyring, s.CreateOrUpdate(m.ResourceName, keyring)
|
|
}
|
|
|
|
func (c *Cluster) associateKeyring(existingKeyring string, d *apps.Deployment) error {
|
|
s := keyring.GetSecretStoreForDeployment(c.context, d)
|
|
return s.CreateOrUpdate(d.GetName(), existingKeyring)
|
|
}
|