Install and configure docker registry chart

Deploys docker-registry chart and configures dispatch's
imageRegistry with the Cluster IP of the docker-registry
service.

Also, adds a skipAuth flag to the install config.

Author: neosab

README.md

@@ -37,12 +37,6 @@ $ brew install kubernetes-helm
 $ helm init
 ```
 
-### Configure Authentication
-Configure an OAuth2 Client App at GitHub with instruction [How to Create OAuth Client
-App](https://vmware.github.io/dispatch/guides/create-oauth-client-app.html)
-
-You should have ``<oauth-client-id>``, ``<oauth-client-secret>`` and ``<oauth-cookie-secret>`` now.
-
 ### Download Dispatch CLI
 Get the dispatch command:
 ```
@@ -57,31 +51,15 @@ Fetch the IP address of minikube as this will be used the host for dispatch serv
 export DISPATCH_HOST=$(minikube ip)
 ```
 
-Dispatch requires a container registry to build and push images for your functions. If you don't have a
-container registry, you can always use DockerHub by specifying your credentials.
-
-Configure the installation by substituting docker credentials and OAuth2 client details.
+Configure the installation
 ```
 $ cat << EOF > config.yaml
 apiGateway:
   host: $DISPATCH_HOST
 dispatch:
   host: $DISPATCH_HOST
   debug: true
-  imageRegistry:
-    # The <registry name> format varies by the container registry provider.
-    # For dockerhub, use your <username>
-    # For Google Container Registry, use gcr.io/[GCR-PROJECT-ID]
-    name: <registry name>
-    # Username for registry authentication
-    username: <username>
-    # Password for registry authentication
-    password: <password>
-    # Email for registry authentication
-    email: <email>
-  oauth2Proxy:
-    clientID: <oauth2-client-id>
-    clientSecret: <oauth2-client-secret>
+  skipAuth: true
 EOF
 ```
 
@@ -100,28 +78,10 @@ cat $HOME/.dispatch/config.json
     "organization": "",
     "cookie": "",
     "insecure": true,
-    "skipauth": false,
+    "skipauth": true,
     "Json": false
 }
 ```
-Make a note of the `<port>` as this will be used in the next step.
-
-#### Update the Callback URL of your OAuth2 Client App:
-
-Dispatch runs on a non-standard https port on minikube since it uses
-NodePort for the ingress controller service. Hence, update the
-Authorization callback URL of your OAuth2 Client App (created by following
-[How to Create OAuth Client App](docs/_guides/create-oauth-client-app.md)) from
-`https://<DISPATCH_HOST>/oauth2` to `https://<DISPATCH_HOST>:<port>/oauth2`
-where `<port>` can be found in your dispatch config file available at
-$HOME/.dispatch/config.json.
-
-### Login to Dispatch:
-Note:- You will be directed to github for authorization
-```
-$ ./dispatch-darwin login
-You have successfully logged in, cookie saved to /Users/bjung/.dispatch/config.json
-```
 
 At this point, the environment is up and working.  Let's seed the service
 with some images and functions.  In order to get the examples, you will need

pkg/dispatchcli/cmd/install.go

@@ -42,6 +42,10 @@ type chartConfig struct {
 	Version   string `json:"version,omitempty" validate:"omitempty"`
 }
 
+type dockerRegistry struct {
+	Chart *chartConfig `json:"chart,omitempty" validate:"required"`
+}
+
 type ingressConfig struct {
 	Chart       *chartConfig `json:"chart,omitempty" validate:"required"`
 	ServiceType string       `json:"serviceType,omitempty" validate:"required,eq=NodePort|eq=LoadBalancer|eq=ClusterIP"`
@@ -92,18 +96,19 @@ type imageRegistryConfig struct {
 	Username string `json:"username,omitempty" validate:"required"`
 }
 type dispatchInstallConfig struct {
-	Chart         *chartConfig        `json:"chart,omitempty" validate:"required"`
-	Host          string              `json:"host,omitempty" validate:"required,hostname|ip"`
-	Port          int                 `json:"port,omitempty" validate:"required"`
-	Organization  string              `json:"organization,omitempty" validate:"required"`
-	Image         *imageConfig        `json:"image,omitempty" validate:"omitempty"`
-	Debug         bool                `json:"debug,omitempty" validate:"omitempty"`
-	Trace         bool                `json:"trace,omitempty" validate:"omitempty"`
-	Database      string              `json:"database,omitempty" validate:"required,eq=postgres"`
-	PersistData   bool                `json:"persistData,omitempty" validate:"omitempty"`
-	ImageRegistry imageRegistryConfig `json:"imageRegistry,omitempty" validate:"required"`
-	OAuth2Proxy   *oauth2ProxyConfig  `json:"oauth2Proxy,omitempty" validate:"required"`
-	TLS           *tlsConfig          `json:"tls,omitempty" validate:"required"`
+	Chart         *chartConfig         `json:"chart,omitempty" validate:"required"`
+	Host          string               `json:"host,omitempty" validate:"required,hostname|ip"`
+	Port          int                  `json:"port,omitempty" validate:"required"`
+	Organization  string               `json:"organization,omitempty" validate:"required"`
+	Image         *imageConfig         `json:"image,omitempty" validate:"omitempty"`
+	Debug         bool                 `json:"debug,omitempty" validate:"omitempty"`
+	Trace         bool                 `json:"trace,omitempty" validate:"omitempty"`
+	Database      string               `json:"database,omitempty" validate:"required,eq=postgres"`
+	PersistData   bool                 `json:"persistData,omitempty" validate:"omitempty"`
+	ImageRegistry *imageRegistryConfig `json:"imageRegistry,omitempty" validate:"omitempty"`
+	OAuth2Proxy   *oauth2ProxyConfig   `json:"oauth2Proxy,omitempty" validate:"required"`
+	TLS           *tlsConfig           `json:"tls,omitempty" validate:"required"`
+	SkipAuth      bool                 `json:"skipAuth,omitempty" validate:"omitempty"`
 }
 
 type installConfig struct {
@@ -113,6 +118,7 @@ type installConfig struct {
 	APIGateway        *apiGatewayConfig      `json:"apiGateway,omitempty" validate:"required"`
 	OpenFaas          *openfaasConfig        `json:"openfaas,omitempty" validate:"required"`
 	DispatchConfig    *dispatchInstallConfig `json:"dispatch,omitempty" validate:"required"`
+	DockerRegistry    *dockerRegistry        `json:"dockerRegistry,omitempty" validate:"omitempty"`
 }
 
 var (
@@ -303,6 +309,7 @@ func writeConfig(out, errOut io.Writer, configDir string, config *installConfig)
 	dispatchConfig.Organization = config.DispatchConfig.Organization
 	dispatchConfig.Host = config.DispatchConfig.Host
 	dispatchConfig.Port = config.DispatchConfig.Port
+	dispatchConfig.SkipAuth = config.DispatchConfig.SkipAuth
 	b, err := json.MarshalIndent(dispatchConfig, "", "    ")
 	if err != nil {
 		return err
@@ -384,6 +391,19 @@ func getK8sServiceNodePort(service, namespace string, https bool) (int, error) {
 	return nodePort, nil
 }
 
+func getK8sServiceClusterIP(service, namespace string) (string, error) {
+
+	kubectl := exec.Command(
+		"kubectl", "get", "svc", service, "-n", namespace,
+		"-o", fmt.Sprintf("jsonpath={.spec.clusterIP}"))
+
+	kubectlOut, err := kubectl.CombinedOutput()
+	if err != nil {
+		return "", errors.Wrapf(err, string(kubectlOut))
+	}
+	return string(kubectlOut), nil
+}
+
 func runInstall(out, errOut io.Writer, cmd *cobra.Command, args []string) error {
 
 	config, err := readConfig(out, errOut, installConfigFile)
@@ -510,6 +530,29 @@ func runInstall(out, errOut io.Writer, cmd *cobra.Command, args []string) error
 			return errors.Wrapf(err, "Error installing openfaas chart")
 		}
 	}
+
+	if config.DispatchConfig.ImageRegistry == nil && installService("docker-registry") {
+		if config.DockerRegistry == nil {
+			return errors.New("Missing docker-registry chart configuration")
+		}
+		err = helmInstall(out, errOut, config.DockerRegistry.Chart, nil)
+		if err != nil {
+			return errors.Wrapf(err, "Error installing docker-registry chart")
+		}
+		serviceName := fmt.Sprintf("%s-%s", config.DockerRegistry.Chart.Chart, config.DockerRegistry.Chart.Release)
+		serviceIP, err := getK8sServiceClusterIP(serviceName, config.DockerRegistry.Chart.Namespace)
+		if err != nil {
+			return err
+		}
+		registryName := fmt.Sprintf("%s:5000", serviceIP)
+		config.DispatchConfig.ImageRegistry = &imageRegistryConfig{
+			Name:     registryName,
+			Username: "",
+			Password: "",
+			Email:    "",
+		}
+	}
+
 	if installService("dispatch") {
 		chart := path.Join(installChartsDir, "dispatch")
 		if installChartsDir != "dispatch" {
@@ -529,6 +572,10 @@ func runInstall(out, errOut io.Writer, cmd *cobra.Command, args []string) error
 			config.DispatchConfig.OAuth2Proxy.CookieSecret = base64.StdEncoding.EncodeToString(cookie)
 		}
 
+		// To handle the case if only dispatch service was installed.
+		if config.DispatchConfig.ImageRegistry == nil {
+			return errors.New("Missing Image Registry configuration")
+		}
 		// we need to marshal username, password and email to ensure they are properly escaped
 		dockerAuth := struct {
 			Username string `json:"username"`

pkg/dispatchcli/cmd/install_config.go

@@ -7,6 +7,12 @@ package cmd
 
 const defaultInstallConfigYaml = `
 HelmRepositoryURL: https://s3-us-west-2.amazonaws.com/dispatch-charts
+dockerRegistry:
+  chart:
+    chart: docker-registry
+    namespace: dispatch
+    release: docker-registry
+    repo: https://kubernetes-charts.storage.googleapis.com
 ingress:
   chart:
     chart: nginx-ingress
@@ -59,11 +65,12 @@ dispatch:
   debug: true
   trace: true
   persistData: false
-  imageRegistry:
-    name:
-    username: <username>
-    email:
-    password: <password>
+  skipAuth: false
+  #imageRegistry:
+  #  name:
+  #  username:
+  #  email:
+  #  password:
   oauth2Proxy:
     clientID: <client-id>
     clientSecret: <client-secret>