cluster up: optionally install metrics components

csrwng · csrwng · commit 3f244831b82a · 2016-06-13T16:45:19.000-04:00
diff --git a/contrib/completions/bash/oc b/contrib/completions/bash/oc
@@ -648,6 +648,7 @@ _oc_cluster_up()
     flags+=("--host-data-dir=")
     flags+=("--host-volumes-dir=")
     flags+=("--image=")
+    flags+=("--metrics")
     flags+=("--public-hostname=")
     flags+=("--routing-suffix=")
     flags+=("--server-loglevel=")
diff --git a/contrib/completions/bash/openshift b/contrib/completions/bash/openshift
@@ -4236,6 +4236,7 @@ _openshift_cli_cluster_up()
     flags+=("--host-data-dir=")
     flags+=("--host-volumes-dir=")
     flags+=("--image=")
+    flags+=("--metrics")
     flags+=("--public-hostname=")
     flags+=("--routing-suffix=")
     flags+=("--server-loglevel=")
diff --git a/pkg/bootstrap/docker/dockerhelper/helper.go b/pkg/bootstrap/docker/dockerhelper/helper.go
@@ -220,7 +220,9 @@ func (h *Helper) ListContainerNames() ([]string, error) {
 	}
 	names := []string{}
 	for _, c := range containers {
-		names = append(names, c.Names[0])
+		if len(c.Names) > 0 {
+			names = append(names, c.Names[0])
+		}
 	}
 	return names, nil
 }
diff --git a/pkg/bootstrap/docker/openshift/helper.go b/pkg/bootstrap/docker/openshift/helper.go
@@ -68,6 +68,7 @@ type StartOptions struct {
 	UseExistingConfig bool
 	Environment       []string
 	LogLevel          int
+	MetricsHost       string
 }
 
 // NewHelper creates a new OpenShift helper
@@ -223,7 +224,7 @@ func (h *Helper) Start(opt *StartOptions, out io.Writer) (string, error) {
 		if err != nil {
 			return "", errors.NewError("could not copy OpenShift configuration").WithCause(err)
 		}
-		err = h.updateConfig(configDir, opt.HostConfigDir, opt.ServerIP)
+		err = h.updateConfig(configDir, opt.HostConfigDir, opt.ServerIP, opt.MetricsHost)
 		if err != nil {
 			cleanupConfig()
 			return "", errors.NewError("could not update OpenShift configuration").WithCause(err)
@@ -351,7 +352,7 @@ func (h *Helper) copyConfig(hostDir string) (string, error) {
 	return filepath.Join(tempDir, filepath.Base(hostDir)), nil
 }
 
-func (h *Helper) updateConfig(configDir, hostDir, serverIP string) error {
+func (h *Helper) updateConfig(configDir, hostDir, serverIP, metricsHost string) error {
 	masterConfig := filepath.Join(configDir, "master", "master-config.yaml")
 	glog.V(1).Infof("Reading master config from %s", masterConfig)
 	cfg, err := configapilatest.ReadMasterConfig(masterConfig)
@@ -366,6 +367,10 @@ func (h *Helper) updateConfig(configDir, hostDir, serverIP string) error {
 		cfg.RoutingConfig.Subdomain = fmt.Sprintf("%s.xip.io", serverIP)
 	}
 
+	if len(metricsHost) > 0 && cfg.AssetConfig != nil {
+		cfg.AssetConfig.MetricsPublicURL = fmt.Sprintf("https://%s/hawkular/metrics", metricsHost)
+	}
+
 	cfgBytes, err := configapilatest.WriteYAML(cfg)
 	if err != nil {
 		return err
diff --git a/pkg/bootstrap/docker/openshift/metrics.go b/pkg/bootstrap/docker/openshift/metrics.go
@@ -0,0 +1,210 @@
+package openshift
+
+import (
+	"fmt"
+
+	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
+	kapi "k8s.io/kubernetes/pkg/api"
+	apierrors "k8s.io/kubernetes/pkg/api/errors"
+
+	"github.com/openshift/origin/pkg/bootstrap/docker/errors"
+	"github.com/openshift/origin/pkg/cmd/admin/policy"
+)
+
+const (
+	infraNamespace    = "openshift-infra"
+	svcMetrics        = "hawkular-metrics"
+	metricsDeployerSA = "metrics-deployer"
+)
+
+// InstallMetrics checks whether metrics is installed and installs it if not already installed
+func (h *Helper) InstallMetrics(f *clientcmd.Factory, hostName, prefix, imageVersion string) error {
+	osClient, kubeClient, err := f.Clients()
+	if err != nil {
+		return errors.NewError("cannot obtain API clients").WithCause(err).WithDetails(h.OriginLog())
+	}
+
+	_, err = kubeClient.Services(infraNamespace).Get(svcMetrics)
+	if err == nil {
+		// If there's no error, the registry already exists
+		return nil
+	}
+	if !apierrors.IsNotFound(err) {
+		return errors.NewError("error retrieving metrics service").WithCause(err).WithDetails(h.OriginLog())
+	}
+
+	// Create metrics deployer service account
+	routerSA := &kapi.ServiceAccount{}
+	routerSA.Name = metricsDeployerSA
+	_, err = kubeClient.ServiceAccounts(infraNamespace).Create(routerSA)
+	if err != nil {
+		return errors.NewError("cannot create metrics deployer service account").WithCause(err).WithDetails(h.OriginLog())
+	}
+
+	// Add edit role to deployer service account
+	roleBindingAccessor := policy.NewLocalRoleBindingAccessor(infraNamespace, osClient)
+	addEditRole := policy.RoleModificationOptions{
+		RoleName:            "edit",
+		RoleBindingAccessor: roleBindingAccessor,
+		Subjects: []kapi.ObjectReference{
+			{
+				Namespace: infraNamespace,
+				Name:      metricsDeployerSA,
+				Kind:      "ServiceAccount",
+			},
+		},
+	}
+	if err = addEditRole.AddRole(); err != nil {
+		return errors.NewError("cannot add edit role to metrics deployer service account").WithCause(err).WithDetails(h.OriginLog())
+	}
+
+	// Add cluster reader role to heapster service account
+	clusterRoleBindingAccessor := policy.NewClusterRoleBindingAccessor(osClient)
+	addClusterReaderRole := policy.RoleModificationOptions{
+		RoleName:            "cluster-reader",
+		RoleBindingAccessor: clusterRoleBindingAccessor,
+		Users:               []string{"system:serviceaccount:openshift-infra:heapster"},
+	}
+	if err = addClusterReaderRole.AddRole(); err != nil {
+		return errors.NewError("cannot add cluster reader role to heapster service account").WithCause(err).WithDetails(h.OriginLog())
+	}
+
+	// Create metrics deployer secret
+	deployerSecret := &kapi.Secret{}
+	deployerSecret.Name = "metrics-deployer"
+	deployerSecret.Data = map[string][]byte{"nothing": []byte("/dev/null")}
+	if _, err = kubeClient.Secrets(infraNamespace).Create(deployerSecret); err != nil {
+		return errors.NewError("cannot create metrics deployer secret").WithCause(err).WithDetails(h.OriginLog())
+	}
+
+	// Create deployer Pod
+	imagePrefix := fmt.Sprintf("%s-", prefix)
+	deployerPod := metricsDeployerPod(hostName, imagePrefix, imageVersion)
+	if _, err = kubeClient.Pods(infraNamespace).Create(deployerPod); err != nil {
+		return errors.NewError("cannot create metrics deployer pod").WithCause(err).WithDetails(h.OriginLog())
+	}
+	return nil
+}
+
+func metricsDeployerPod(hostName, imagePrefix, imageVersion string) *kapi.Pod {
+	env := []kapi.EnvVar{
+		{
+			Name: "PROJECT",
+			ValueFrom: &kapi.EnvVarSource{
+				FieldRef: &kapi.ObjectFieldSelector{
+					FieldPath: "metadata.namespace",
+				},
+			},
+		},
+		{
+			Name: "POD_NAME",
+			ValueFrom: &kapi.EnvVarSource{
+				FieldRef: &kapi.ObjectFieldSelector{
+					FieldPath: "metadata.name",
+				},
+			},
+		},
+		{
+			Name:  "IMAGE_PREFIX",
+			Value: imagePrefix,
+		},
+		{
+			Name:  "IMAGE_VERSION",
+			Value: imageVersion,
+		},
+		{
+			Name:  "MASTER_URL",
+			Value: "https://kubernetes.default.svc:443",
+		},
+		{
+			Name:  "HAWKULAR_METRICS_HOSTNAME",
+			Value: hostName,
+		},
+		{
+			Name:  "MODE",
+			Value: "deploy",
+		},
+		{
+			Name:  "REDEPLOY",
+			Value: "false",
+		},
+		{
+			Name:  "IGNORE_PREFLIGHT",
+			Value: "false",
+		},
+		{
+			Name:  "USE_PERSISTENT_STORAGE",
+			Value: "false",
+		},
+		{
+			Name:  "CASSANDRA_NODES",
+			Value: "1",
+		},
+		{
+			Name:  "CASSANDRA_PV_SIZE",
+			Value: "10Gi",
+		},
+		{
+			Name:  "METRIC_DURATION",
+			Value: "7",
+		},
+		{
+			Name:  "HEAPSTER_NODE_ID",
+			Value: "nodename",
+		},
+		{
+			Name:  "METRIC_RESOLUTION",
+			Value: "10s",
+		},
+	}
+	pod := &kapi.Pod{
+		Spec: kapi.PodSpec{
+			DNSPolicy:          kapi.DNSClusterFirst,
+			RestartPolicy:      kapi.RestartPolicyNever,
+			ServiceAccountName: "metrics-deployer",
+			Volumes: []kapi.Volume{
+				{
+					Name: "empty",
+					VolumeSource: kapi.VolumeSource{
+						EmptyDir: &kapi.EmptyDirVolumeSource{},
+					},
+				},
+				{
+					Name: "secret",
+					VolumeSource: kapi.VolumeSource{
+						Secret: &kapi.SecretVolumeSource{
+							SecretName: "metrics-deployer",
+						},
+					},
+				},
+			},
+		},
+	}
+	pod.GenerateName = "metrics-deployer-"
+	pod.Spec.Containers = []kapi.Container{
+		{
+			Image: fmt.Sprintf("%smetrics-deployer:%s", imagePrefix, imageVersion),
+			Name:  "deployer",
+			VolumeMounts: []kapi.VolumeMount{
+				{
+					Name:      "secret",
+					MountPath: "/secret",
+					ReadOnly:  true,
+				},
+				{
+					Name:      "empty",
+					MountPath: "/etc/deploy",
+				},
+			},
+			Env: env,
+		},
+	}
+	return pod
+}
+
+func MetricsHost(routingSuffix, serverIP string) string {
+	if len(routingSuffix) > 0 {
+		return fmt.Sprintf("metrics-openshift-infra.%s", routingSuffix)
+	}
+	return fmt.Sprintf("metrics-openshift-infra.%s.xip.io", serverIP)
+}
diff --git a/pkg/bootstrap/docker/up.go b/pkg/bootstrap/docker/up.go
@@ -126,6 +126,7 @@ func NewCmdUp(name, fullName string, f *osclientcmd.Factory, out io.Writer) *cob
 	cmd.Flags().StringVar(&config.HostDataDir, "host-data-dir", "", "Directory on Docker host for OpenShift data. If not specified, etcd data will not be persisted on the host.")
 	cmd.Flags().IntVar(&config.ServerLogLevel, "server-loglevel", 0, "Log level for OpenShift server")
 	cmd.Flags().StringSliceVarP(&config.Environment, "env", "e", config.Environment, "Specify key value pairs of environment variables to set on OpenShift container")
+	cmd.Flags().BoolVar(&config.ShouldInstallMetrics, "metrics", false, "Install metrics (experimental)")
 	return cmd
 }
 
@@ -145,8 +146,7 @@ type ClientStartConfig struct {
 	DockerMachine             string
 	ShouldCreateDockerMachine bool
 	SkipRegistryCheck         bool
-	InstallLogAggregation     bool
-	InstallMetrics            bool
+	ShouldInstallMetrics      bool
 
 	UseNsenterMount bool
 	Out             io.Writer
@@ -243,6 +243,11 @@ func (c *ClientStartConfig) Complete(f *osclientcmd.Factory, cmd *cobra.Command)
 	// Install a router
 	c.addTask("Installing router", c.InstallRouter)
 
+	// Install metrics
+	if c.ShouldInstallMetrics {
+		c.addTask("Install Metrics", c.InstallMetrics)
+	}
+
 	// Import default image streams
 	c.addTask("Importing image streams", c.ImportImageStreams)
 
@@ -471,6 +476,9 @@ func (c *ClientStartConfig) StartOpenShift(out io.Writer) error {
 		LogLevel:          c.ServerLogLevel,
 		DNSPort:           c.DNSPort,
 	}
+	if c.ShouldInstallMetrics {
+		opt.MetricsHost = openshift.MetricsHost(c.RoutingSuffix, c.ServerIP)
+	}
 	c.LocalConfigDir, err = c.OpenShiftHelper().Start(opt, out)
 	return err
 }
@@ -518,15 +526,19 @@ func (c *ClientStartConfig) ImportTemplates(out io.Writer) error {
 }
 
 /*
-// TODO: implement these
+// TODO: implement this
 func (c *ClientStartConfig) InstallLogging() error {
 	return nil
 }
+*/
 
-func (c *ClientStartConfig) InstallMetrics() error {
-	return nil
+func (c *ClientStartConfig) InstallMetrics(out io.Writer) error {
+	f, err := c.Factory()
+	if err != nil {
+		return err
+	}
+	return c.OpenShiftHelper().InstallMetrics(f, openshift.MetricsHost(c.RoutingSuffix, c.ServerIP), c.Image, c.ImageVersion)
 }
-*/
 
 // Login logs into the new server and sets up a default user and project
 func (c *ClientStartConfig) Login(out io.Writer) error {

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,9 @@ func (h *Helper) ListContainerNames() ([]string, error) {`
`220`	`220`	`}`
`221`	`221`	`names := []string{}`
`222`	`222`	`for _, c := range containers {`
`223`		`- names = append(names, c.Names[0])`
	`223`	`+ if len(c.Names) > 0 {`
	`224`	`+ names = append(names, c.Names[0])`
	`225`	`+ }`
`224`	`226`	`}`
`225`	`227`	`return names, nil`
`226`	`228`	`}`