feedc0de/my-rook-config
1
0 Fork 0
forked from rook/rook
Code Pull Requests Activity

rename deployment name for consistency

Browse Source
This commit is contained in:
Travis Nielsen committed 2017-02-08 15:46:51 -08:00
1 parent a414d64b82
commit 5fbe0d385b
4 files changed
+24 -28
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pkg/operator/mon/mon.go
+3 -4
View File
@@ -28,11 +28,10 @@ import (
)
const (
monApp = "cephmon"
appName = "mon"
monNodeAttr = "mon_node"
monClusterAttr = "mon_cluster"
tprName = "mon.rook.io"
monSecretsName = "mon-secrets"
fsidSecretName = "fsid"
monSecretName = "mon-secret"
adminSecretName = "admin-secret"
@@ -90,7 +89,7 @@ func (c *Cluster) Start(clientset *kubernetes.Clientset) (*mon.ClusterInfo, erro
// Retrieve the ceph cluster info if it already exists.
// If a new cluster create new keys.
func (c *Cluster) initClusterInfo(clientset *kubernetes.Clientset) (*mon.ClusterInfo, error) {
secrets, err := clientset.Secrets(c.Namespace).Get(monSecretsName)
secrets, err := clientset.Secrets(c.Namespace).Get(appName)
if err != nil {
if !k8sutil.IsKubernetesResourceNotFoundError(err) {
return nil, fmt.Errorf("failed to get mon secrets. %+v", err)
@@ -124,7 +123,7 @@ func (c *Cluster) createMonSecretsAndSave(clientset *kubernetes.Clientset) (*mon
monSecretName: info.MonitorSecret,
adminSecretName: info.AdminSecret,
}
_, err = clientset.Secrets(c.Namespace).Create(&v1.Secret{ObjectMeta: v1.ObjectMeta{Name: monSecretsName}, StringData: secrets})
_, err = clientset.Secrets(c.Namespace).Create(&v1.Secret{ObjectMeta: v1.ObjectMeta{Name: appName}, StringData: secrets})
if err != nil {
return nil, fmt.Errorf("failed to save mon secrets. %+v", err)
}
pkg/operator/mon/pod.go
+5 -5
View File
@@ -27,16 +27,16 @@ import (
)
func MonSecretEnvVar() v1.EnvVar {
return v1.EnvVar{Name: "ROOKD_MON_SECRET", ValueFrom: &v1.EnvVarSource{SecretKeyRef: &v1.SecretKeySelector{LocalObjectReference: v1.LocalObjectReference{Name: monSecretsName}, Key: monSecretName}}}
return v1.EnvVar{Name: "ROOKD_MON_SECRET", ValueFrom: &v1.EnvVarSource{SecretKeyRef: &v1.SecretKeySelector{LocalObjectReference: v1.LocalObjectReference{Name: appName}, Key: monSecretName}}}
}
func AdminSecretEnvVar() v1.EnvVar {
return v1.EnvVar{Name: "ROOKD_ADMIN_SECRET", ValueFrom: &v1.EnvVarSource{SecretKeyRef: &v1.SecretKeySelector{LocalObjectReference: v1.LocalObjectReference{Name: monSecretsName}, Key: adminSecretName}}}
return v1.EnvVar{Name: "ROOKD_ADMIN_SECRET", ValueFrom: &v1.EnvVarSource{SecretKeyRef: &v1.SecretKeySelector{LocalObjectReference: v1.LocalObjectReference{Name: appName}, Key: adminSecretName}}}
}
func getLabels(clusterName string) map[string]string {
return map[string]string{
k8sutil.AppAttr: monApp,
k8sutil.AppAttr: appName,
monClusterAttr: clusterName,
}
}
@@ -76,7 +76,7 @@ func (c *Cluster) monContainer(config *MonConfig, clusterInfo *mon.ClusterInfo)
// TODO: fix "sleep 5".
// Without waiting some time, there is highly probable flakes in network setup.
Command: []string{"/bin/sh", "-c", fmt.Sprintf("sleep 5; %s", command)},
Name: "cephmon",
Name: appName,
Image: k8sutil.MakeRookImage(c.Version),
Ports: []v1.ContainerPort{
{
@@ -124,7 +124,7 @@ func listOptions(clusterName string) api.ListOptions {
return api.ListOptions{
LabelSelector: labels.SelectorFromSet(map[string]string{
monClusterAttr: clusterName,
k8sutil.AppAttr: monApp,
k8sutil.AppAttr: appName,
}),
}
}
pkg/operator/osd/osd.go
+5 -6
View File
@@ -27,8 +27,7 @@ import (
)
const (
osdApp = "cephosd"
daemonSetName = "osd"
appName = "osd"
)
type Cluster struct {
@@ -67,14 +66,14 @@ func (c *Cluster) Start(clientset *kubernetes.Clientset, cluster *mon.ClusterInf
func (c *Cluster) makeDaemonSet(cluster *mon.ClusterInfo) (*extensions.DaemonSet, error) {
ds := &extensions.DaemonSet{}
ds.Name = daemonSetName
ds.Name = appName
ds.Namespace = c.Namespace
podSpec := v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{
Name: "rookosd",
Name: appName,
Labels: map[string]string{
k8sutil.AppAttr: osdApp,
k8sutil.AppAttr: appName,
k8sutil.ClusterAttr: cluster.Name,
},
Annotations: map[string]string{},
@@ -103,7 +102,7 @@ func (c *Cluster) osdContainer(cluster *mon.ClusterInfo) v1.Container {
// TODO: fix "sleep 5".
// Without waiting some time, there is highly probable flakes in network setup.
Command: []string{"/bin/sh", "-c", fmt.Sprintf("sleep 5; %s", command)},
Name: "cephosd",
Name: appName,
Image: k8sutil.MakeRookImage(c.Version),
VolumeMounts: []v1.VolumeMount{
{Name: k8sutil.DataDirVolume, MountPath: k8sutil.DataDir},
pkg/operator/rgw/rgw.go
+11 -13
View File
@@ -31,10 +31,8 @@ import (
)
const (
rgwApp = "cephrgw"
deploymentName = "rgw"
rgwSecretsName = "rgw-secrets"
rgwKeyringName = "keyring"
appName = "rgw"
keyringName = "keyring"
)
type Cluster struct {
@@ -87,7 +85,7 @@ func (c *Cluster) Start(clientset *kubernetes.Clientset, cluster *mon.ClusterInf
}
func (c *Cluster) createKeyring(clientset *kubernetes.Clientset, cluster *mon.ClusterInfo) error {
_, err := clientset.Secrets(c.Namespace).Get(rgwSecretsName)
_, err := clientset.Secrets(c.Namespace).Get(appName)
if err == nil {
logger.Infof("the rgw keyring was already generated")
return nil
@@ -113,9 +111,9 @@ func (c *Cluster) createKeyring(clientset *kubernetes.Clientset, cluster *mon.Cl
// store the secrets
secrets := map[string]string{
rgwKeyringName: keyring,
keyringName: keyring,
}
_, err = clientset.Secrets(c.Namespace).Create(&v1.Secret{ObjectMeta: v1.ObjectMeta{Name: rgwSecretsName}, StringData: secrets})
_, err = clientset.Secrets(c.Namespace).Create(&v1.Secret{ObjectMeta: v1.ObjectMeta{Name: appName}, StringData: secrets})
if err != nil {
return fmt.Errorf("failed to save rgw secrets. %+v", err)
}
@@ -125,7 +123,7 @@ func (c *Cluster) createKeyring(clientset *kubernetes.Clientset, cluster *mon.Cl
func (c *Cluster) makeDeployment(cluster *mon.ClusterInfo) (*extensions.Deployment, error) {
deployment := &extensions.Deployment{}
deployment.Name = deploymentName
deployment.Name = appName
deployment.Namespace = c.Namespace
podSpec := v1.PodTemplateSpec{
@@ -156,13 +154,13 @@ func (c *Cluster) rgwContainer(cluster *mon.ClusterInfo) v1.Container {
// TODO: fix "sleep 5".
// Without waiting some time, there is highly probable flakes in network setup.
Command: []string{"/bin/sh", "-c", fmt.Sprintf("sleep 5; %s", command)},
Name: rgwApp,
Name: appName,
Image: k8sutil.MakeRookImage(c.Version),
VolumeMounts: []v1.VolumeMount{
{Name: k8sutil.DataDirVolume, MountPath: k8sutil.DataDir},
},
Env: []v1.EnvVar{
{Name: "ROOKD_RGW_KEYRING", ValueFrom: &v1.EnvVarSource{SecretKeyRef: &v1.SecretKeySelector{LocalObjectReference: v1.LocalObjectReference{Name: rgwSecretsName}, Key: rgwKeyringName}}},
{Name: "ROOKD_RGW_KEYRING", ValueFrom: &v1.EnvVarSource{SecretKeyRef: &v1.SecretKeySelector{LocalObjectReference: v1.LocalObjectReference{Name: appName}, Key: keyringName}}},
k8smon.MonSecretEnvVar(),
k8smon.AdminSecretEnvVar(),
},
@@ -173,13 +171,13 @@ func (c *Cluster) startService(clientset *kubernetes.Clientset, clusterInfo *mon
labels := getLabels(clusterInfo.Name)
s := &v1.Service{
ObjectMeta: v1.ObjectMeta{
Name: "ceph-rgw",
Name: appName,
Labels: labels,
},
Spec: v1.ServiceSpec{
Ports: []v1.ServicePort{
{
Name: "ceph-rgw",
Name: appName,
Port: cephrgw.RGWPort,
TargetPort: intstr.FromInt(int(cephrgw.RGWPort)),
Protocol: v1.ProtocolTCP,
@@ -202,7 +200,7 @@ func (c *Cluster) startService(clientset *kubernetes.Clientset, clusterInfo *mon
func getLabels(clusterName string) map[string]string {
return map[string]string{
k8sutil.AppAttr: rgwApp,
k8sutil.AppAttr: appName,
k8sutil.ClusterAttr: clusterName,
}
}