provider/cluster: Add DeploymentIngressDomain and generate short uuids for deployments (#393)

Signed-off-by: Greg Osuri <me@gregosuri.com>

Author: gosuri

_run/multi/Makefile

@@ -42,12 +42,14 @@ helm-install-provider-%:
 	helm install "$(PROVIDER_CHART)"                     \
 		-n "$(@:helm-install-provider-%=%)"                \
 		--set "ingress.domain=$(shell minikube ip).nip.io" \
+		--set "deployment.ingress.domain=$(shell minikube ip).nip.io" \
 		--set "provider.region=$(shell echo "$@" | sed -e 's/.*-\(.*-.*\)-[0-9][0-9]*/\1/')"
 
 helm-upgrade-provider-%:
 	helm upgrade "$(@:helm-upgrade-provider-%=%)" "$(PROVIDER_CHART)" \
 		--recreate-pods                                                 \
 		--set "ingress.domain=$(shell minikube ip).nip.io"              \
+		--set "deployment.ingress.domain=$(shell minikube ip).nip.io" \
 		--set "provider.region=$(shell echo "$@" | sed -e 's/.*-\(.*-.*\)-[0-9][0-9]*/\1/')"
 
 helm-delete-provider-%:

_run/multi/akash-provider/run.sh

@@ -33,7 +33,7 @@ if [ ! -s "$masterKey" ] || [ ! -s "$providerKey" ]; then
 
   echo "adding provider"
   eval $(./akash provider add /config/provider.yml -k master -m shell)
-  echo $akash_add_provider_0_data > "$providerKey"
+  echo $akash_add_provider_0_key > "$providerKey"
   echo "added provider: " $(cat "$providerKey")
 fi
 

_run/multi/akash-provider/templates/deployment.yaml

@@ -32,6 +32,8 @@ spec:
               value: ClusterIP
             - name: AKASH_DEPLOYMENT_INGRESS_STATIC_HOSTS
               value: "false"
+            - name: AKASH_DEPLOYMENT_INGRESS_DOMAIN
+              value: "{{ .Values.deployment.ingress.domain }}"
           ports:
             - containerPort: {{ .Values.provider.port }}
               name: http

_run/multi/akash-provider/values.yaml

@@ -1,11 +1,39 @@
+akash:
+  node: http://api.akashtest.net:80
+
+provider:
+  # Host URI to advertise
+  hostURI: http://example.com
+
+  # Create a key using: `akash key create`
+  privateKeyName: "KEY_NAME"
+
+  # Generate an address by registering the provider
+  # using: `akash provider add -k KEY_NAME`
+  address: "ADDRESS"
+
+  # name of the secret storing private key
+  privateKeySecretName: "PRIVATE_KEY_NAME"
+
+  # port to listen on
+  port: 3001
+
+deployment:
+  # ServiceType of the deployment. Some cloud providers 
+  # (like aws or gcp) require either LoadBalancer / NodeHost
+  serviceType: ClusterIP 
+  ingress:
+    # will generate a unique url for each deployment. 
+    # [uuid].domain
+    staticHosts: true
+    domain: example.com
+
 image:
   repository: ovrclk/akash
   tag: latest
   pullPolicy: Never
 
 ingress:
-  domain: 192.168.99.101.nip.io
-
-provider:
-  port: 3001
-  region: us-west
+  # Pubic routable Hostname of the the provider, 
+  # should match provider.hostURI
+  domain: example.com

_run/multi/run.sh

@@ -12,7 +12,7 @@ do_init(){
 	echo $akash_create_key_0_public_key > "$DATA_ROOT/master.key"
 	eval $(akash key create other -m shell)
 	echo $akash_create_key_0_public_key > "$DATA_ROOT/other.key"
-  _akashd init "$(cat "$DATA_ROOT/master.key")" -t helm -c "${HELM_NODE_COUNT:-4}"
+  _akashd init "$(cat "$DATA_ROOT/master.key")" -t helm -n "node-0,node-1,node-2"
 }
 
 case "$1" in

glide.lock

@@ -1,7 +1,7 @@
 package: github.com/ovrclk/akash
 import:
 - package: github.com/gogo/protobuf
-  version: ^1.1.1
+  version: 1.1.1
   subpackages:
   - gogoproto
   - proto
@@ -12,17 +12,17 @@ import:
 - package: github.com/prometheus/client_golang
   version: ae27198cdd90bf12cd134ad79d1366a6cf49f632
 - package: github.com/cosmos/cosmos-sdk
-  version: ~0.33.0
+  version: 0.33.0
   subpackages:
   - crypto
 - package: github.com/tendermint/go-amino
-  version: ~0.14.1
+  version: 0.14.1
 - package: github.com/tendermint/iavl
-  version: ~0.12.2
+  version: 0.12.2
 - package: github.com/tendermint/tendermint
-  version: ~0.31.5
+  version: 0.31.5
 - package: github.com/stretchr/testify
-  version: ^1.2.1
+  version: 1.2.1
   subpackages:
   - require
   - assert
@@ -42,10 +42,10 @@ import:
   subpackages:
   - OpenAPIv2
 - package: github.com/golang/protobuf
-  version: ~1.1.0
+  version: 1.1.0
 - package: github.com/grpc-ecosystem/grpc-gateway
 - package: google.golang.org/grpc
-  version: ^1.13.0
+  version: 1.13.0
 - package: github.com/juju/errors
 - package: k8s.io/client-go
   version: kubernetes-1.12.2
@@ -64,11 +64,11 @@ import:
 - package: k8s.io/gengo
 - package: github.com/hashicorp/golang-lru
 - package: github.com/caarlos0/env
-  version: ^3.3.0
+  version: 3.3.0
 - package: github.com/blang/semver
-  version: ^3.5.1
+  version: 3.5.1
 - package: github.com/satori/go.uuid
-  version: ~1.2.0
+  version: 1.2.0
 - package: golang.org/x/sys
   version: 1c9583448a9c3aa0f9a6a5241bf73c0bd8aafded
   subpackages:
@@ -77,7 +77,7 @@ import:
   version: 3764759f34a542a3aef74d6b02e35be7ab893bba
   repo: https://github.com/tendermint/crypto
 - package: github.com/gosuri/uitable
-  version: ~0.0.2
+  version: 0.0.2
 - package: github.com/gosuri/uilive
   version: 0.0.2
 - package: github.com/fatih/color
@@ -90,3 +90,7 @@ import:
   version: ^0.0.7
 - package: github.com/ovrclk/dsky
   version: ~0.0.1
+- package: github.com/lithammer/shortuuid
+  version: 3.0.3
+  subpackages:
+  - '...'

glide.yaml

@@ -7,11 +7,10 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/lithammer/shortuuid"
 	akashv1 "github.com/ovrclk/akash/pkg/apis/akash.network/v1"
 	"github.com/ovrclk/akash/types"
-	uuid "github.com/satori/go.uuid"
 	"github.com/tendermint/tendermint/libs/log"
-	"gopkg.in/yaml.v2"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	extv1 "k8s.io/api/extensions/v1beta1"
@@ -175,7 +174,10 @@ type serviceBuilder struct {
 
 func newServiceBuilder(log log.Logger, lid types.LeaseID, group *types.ManifestGroup, service *types.ManifestService) *serviceBuilder {
 	return &serviceBuilder{
-		deploymentBuilder: deploymentBuilder{builder: builder{log: log.With("module", "kube-builder"), lid: lid, group: group}, service: service},
+		deploymentBuilder: deploymentBuilder{
+			builder: builder{log: log.With("module", "kube-builder"), lid: lid, group: group},
+			service: service,
+		},
 	}
 }
 
@@ -222,12 +224,21 @@ type ingressBuilder struct {
 
 func newIngressBuilder(log log.Logger, host string, lid types.LeaseID, group *types.ManifestGroup, service *types.ManifestService, expose *types.ManifestServiceExpose) *ingressBuilder {
 	if config.DeploymentIngressStaticHosts {
-		uid := uuid.NewV4()
-		expose.Hosts = append(expose.Hosts, fmt.Sprintf("%v.%s.%v", service.Name, uid, host))
+		uid := strings.ToLower(shortuuid.New())
+		h := fmt.Sprintf("%s.%s", uid, config.DeploymentIngressDomain)
+		log.Debug("IngressBuilder: map host:", h)
+		expose.Hosts = append(expose.Hosts, h)
 	}
 	return &ingressBuilder{
-		deploymentBuilder: deploymentBuilder{builder: builder{log: log.With("module", "kube-builder"), lid: lid, group: group}, service: service},
-		expose:            expose,
+		deploymentBuilder: deploymentBuilder{
+			builder: builder{
+				log:   log.With("module", "kube-builder"),
+				lid:   lid,
+				group: group,
+			},
+			service: service,
+		},
+		expose: expose,
 	}
 }
 
@@ -245,7 +256,6 @@ func (b *ingressBuilder) create() (*extv1.Ingress, error) {
 
 func (b *ingressBuilder) update(obj *extv1.Ingress) (*extv1.Ingress, error) {
 	obj.Labels = b.labels()
-	//obj.Spec.Backend.ServicePort = intstr.FromInt(int(exposeExternalPort(b.expose)))
 	obj.Spec.Rules = b.rules()
 	return obj, nil
 }
@@ -255,7 +265,7 @@ func (b *ingressBuilder) rules() []extv1.IngressRule {
 	httpRule := &extv1.HTTPIngressRuleValue{
 		Paths: []extv1.HTTPIngressPath{extv1.HTTPIngressPath{
 			Backend: extv1.IngressBackend{
-				ServiceName: b.expose.Service,
+				ServiceName: b.name(),
 				ServicePort: intstr.FromInt(int(exposeExternalPort(b.expose))),
 			}},
 		},
@@ -264,11 +274,10 @@ func (b *ingressBuilder) rules() []extv1.IngressRule {
 	for _, host := range b.expose.Hosts {
 		rules = append(rules, extv1.IngressRule{
 			Host:             host,
-			IngressRuleValue: extv1.IngressRuleValue{httpRule},
+			IngressRuleValue: extv1.IngressRuleValue{HTTP: httpRule},
 		})
 	}
-	ym, _ := yaml.Marshal(rules)
-	b.log.Debug("provider/cluster/kube/builder: created rules: %v", string(ym))
+	b.log.Debug("provider/cluster/kube/builder: created rules:", rules)
 	return rules
 }
 

provider/cluster/kube/builder.go

@@ -6,14 +6,15 @@ import (
 )
 
 type config_ struct {
-
 	// gcp:    NodePort
 	// others: ClusterIP
 	DeploymentServiceType corev1.ServiceType `env:"AKASH_DEPLOYMENT_SERVICE_TYPE" envDefault:"NodePort"`
 
 	// gcp:    False
 	// others: true
-	DeploymentIngressStaticHosts bool `env:"AKASH_DEPLOYMENT_INGRESS_STATIC_HOSTS" envDefault:"false"`
+	DeploymentIngressStaticHosts bool `env:"AKASH_DEPLOYMENT_INGRESS_STATIC_HOSTS" envDefault:"true"`
+	// Ingress domain to map deployments to
+	DeploymentIngressDomain string `env:"AKASH_DEPLOYMENT_INGRESS_DOMAIN"`
 
 	DeploymentIngressExposeLBHosts bool `env:"AKASH_DEPLOYMENT_INGRESS_EXPOSE_LB_HOSTS" envDefault:"true"`
 }