copy the admin secret for storage class consumtpion

This commit is contained in:
Travis Nielsen committed 2017-02-21 16:11:59 -08:00
1 parent 623a8761eb
commit a7ee0edcb9
4 files changed
+40 -4

No files matched your search

+2
View File
@@ -29,6 +29,8 @@ const (
Namespace = "rook"
DataDirVolume = "rook-data"
DataDir = "/var/lib/rook"
RookType = "kubernetes.io/rook"
RbdType = "kubernetes.io/rbd"
)
func IsKubernetesResourceAlreadyExistError(err error) bool {
+6 -1
View File
@@ -107,7 +107,12 @@ func (c *Cluster) createKeyring(clientset *kubernetes.Clientset, context *cluste
secrets := map[string]string{
keyringName: keyring,
}
_, err = clientset.Secrets(c.Namespace).Create(&v1.Secret{ObjectMeta: v1.ObjectMeta{Name: appName}, StringData: secrets})
secret := &v1.Secret{
ObjectMeta: v1.ObjectMeta{Name: appName},
StringData: secrets,
Type: k8sutil.RookType,
}
_, err = clientset.Secrets(c.Namespace).Create(secret)
if err != nil {
return fmt.Errorf("failed to save mds secrets. %+v", err)
}
+26 -2
View File
@@ -116,18 +116,42 @@ func (c *Cluster) createMonSecretsAndSave(clientset *kubernetes.Clientset) (*mon
return nil, fmt.Errorf("failed to create mon secrets. %+v", err)
}
// store the secrets
// store the secrets for internal usage of the rook pods
secrets := map[string]string{
clusterSecretName: info.Name,
fsidSecretName: info.FSID,
monSecretName: info.MonitorSecret,
adminSecretName: info.AdminSecret,
}
_, err = clientset.Secrets(c.Namespace).Create(&v1.Secret{ObjectMeta: v1.ObjectMeta{Name: appName}, StringData: secrets})
secret := &v1.Secret{
ObjectMeta: v1.ObjectMeta{Name: appName},
StringData: secrets,
Type: k8sutil.RookType,
}
_, err = clientset.Secrets(c.Namespace).Create(secret)
if err != nil {
return nil, fmt.Errorf("failed to save mon secrets. %+v", err)
}
// store the secret for usage by the storage class
storageClassSecret := map[string]string{
"key": info.AdminSecret,
}
secret = &v1.Secret{
ObjectMeta: v1.ObjectMeta{Name: "rook-admin"},
StringData: storageClassSecret,
Type: k8sutil.RbdType,
}
_, err = clientset.Secrets(c.Namespace).Create(secret)
if err != nil {
if !k8sutil.IsKubernetesResourceAlreadyExistError(err) {
return nil, fmt.Errorf("failed to save rook-admin secret. %+v", err)
}
logger.Infof("rook-admin secret already exists")
} else {
logger.Infof("saved rook-admin secret")
}
return info, nil
}
+6 -1
View File
@@ -113,7 +113,12 @@ func (c *Cluster) createKeyring(clientset *kubernetes.Clientset, cluster *mon.Cl
secrets := map[string]string{
keyringName: keyring,
}
_, err = clientset.Secrets(c.Namespace).Create(&v1.Secret{ObjectMeta: v1.ObjectMeta{Name: appName}, StringData: secrets})
secret := &v1.Secret{
ObjectMeta: v1.ObjectMeta{Name: appName},
StringData: secrets,
Type: k8sutil.RookType,
}
_, err = clientset.Secrets(c.Namespace).Create(secret)
if err != nil {
return fmt.Errorf("failed to save rgw secrets. %+v", err)
}