install app-proxy ingress (#190)

* install app-proxy ingress

Author: roi-codefresh

venona/VERSION

@@ -1 +1 @@
-1.4.28
+1.4.29

venonactl/VERSION

@@ -1 +1 @@
-1.4.28
+1.4.29

venonactl/cmd/install-app-proxy.go

@@ -17,6 +17,8 @@ limitations under the License.
 */
 
 import (
+	"fmt"
+
 	"github.com/codefresh-io/venona/venonactl/pkg/plugins"
 	"github.com/codefresh-io/venona/venonactl/pkg/store"
 	"github.com/spf13/cobra"
@@ -32,6 +34,8 @@ var installAppProxyCmdOptions struct {
 	templateFileValues []string
 	templateValueFiles []string
 	resources          map[string]interface{}
+	host               string
+	ingressClass       string
 }
 
 var installAppProxyCmd = &cobra.Command{
@@ -47,15 +51,21 @@ var installAppProxyCmd = &cobra.Command{
 			dieOnError(err)
 		}
 
+		mergeValueStr(templateValuesMap, "CodefreshHost", &cfAPIHost)
 		mergeValueStr(templateValuesMap, "Namespace", &installAppProxyCmdOptions.kube.namespace)
 		mergeValueStr(templateValuesMap, "Context", &installAppProxyCmdOptions.kube.context)
+		mergeValueStr(templateValuesMap, "AppProxy.Host", &installAppProxyCmdOptions.host)
+		mergeValueStr(templateValuesMap, "AppProxy.IngressClass", &installAppProxyCmdOptions.ingressClass)
 
 		mergeValueMSI(templateValuesMap, "AppProxy.resources", &installAppProxyCmdOptions.resources)
 
 		s := store.GetStore()
 		lgr := createLogger("Install-agent", verbose, logFormatter)
 		buildBasicStore(lgr)
 		builder := plugins.NewBuilder(lgr)
+		if installAppProxyCmdOptions.host == "" {
+			dieOnError(fmt.Errorf("host options is required in order to install app-proxy"))
+		}
 		if cfAPIHost == "" {
 			cfAPIHost = "https://g.codefresh.io"
 		}
@@ -78,24 +88,23 @@ var installAppProxyCmd = &cobra.Command{
 
 		values := s.BuildValues()
 		values = mergeMaps(values, templateValuesMap)
-		spn := createSpinner("Installing app proxy (might take a few minutes)", "")
-		spn.Start()
-		defer spn.Stop()
 		for _, p := range builder.Get() {
 			values, err = p.Install(builderInstallOpt, values)
 			if err != nil {
 				dieOnError(err)
 			}
 		}
-		lgr.Info("App proxy installation completed Successfully")
 
+		lgr.Info("App proxy installation completed Successfully")
 	},
 }
 
 func init() {
 	viper.BindEnv("kube-namespace", "KUBE_NAMESPACE")
 	viper.BindEnv("kube-context", "KUBE_CONTEXT")
 	installCommand.AddCommand(installAppProxyCmd)
+	installAppProxyCmd.Flags().StringVar(&installAppProxyCmdOptions.host, "host", "", "Host name that will be used by the ingress to route traffic to the App-Proxy service")
+	installAppProxyCmd.Flags().StringVar(&installAppProxyCmdOptions.ingressClass, "ingress-class", "", "The ingress class name that will be used by the App-Proxy ingress. If left empty, the default one will be used")
 	installAppProxyCmd.Flags().StringVar(&installAppProxyCmdOptions.kube.namespace, "kube-namespace", viper.GetString("kube-namespace"), "Name of the namespace on which venona should be installed [$KUBE_NAMESPACE]")
 	installAppProxyCmd.Flags().StringVar(&installAppProxyCmdOptions.kube.context, "kube-context-name", viper.GetString("kube-context"), "Name of the kubernetes context on which venona should be installed (default is current-context) [$KUBE_CONTEXT]")
 	installAppProxyCmd.Flags().StringArrayVarP(&installAppProxyCmdOptions.templateValueFiles, "values", "f", []string{}, "specify values in a YAML file")

venonactl/example/values-example.yaml

@@ -137,10 +137,21 @@ Namespace: r1
   #     memory: 500Mi
 
 # AppProxy:
-#   resources:
-#     limits:
-#       cpu: 500m
-#       memory: 1200Mi
-#     requests:
-#       cpu: 200m
-#       memory: 500Mi
+  # resources:
+  #   limits:
+  #     cpu: 500m
+  #     memory: 1200Mi
+  #   requests:
+  #     cpu: 200m
+  #     memory: 500Mi
+
+  
+  # Host: example.com
+  # IngressClass: nginx
+  # TLSSecret: cert-secret-name
+  # PathPrefix: /app-proxy/?(.*)  # default is '/'
+  
+  ### Additional annotations that will be set on the ingress definition
+  # Annotations:
+    # nginx.ingress.kubernetes.io/rewrite-target: /$1
+    # nginx.ingress.kubernetes.io/whitelist-source-range: 123.123.123.123/130

venonactl/go.sum

@@ -4,6 +4,7 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
 cloud.google.com/go v0.38.0 h1:ROfEUZz+Gh5pa62DJWXSaonyu3StP6EA6lPEXPI6mCo=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
 github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
+github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
 github.com/Azure/go-autorest v13.3.2+incompatible h1:VxzPyuhtnlBOzc4IWCZHqpyH2d+QMLQEuy3wREyY4oc=
 github.com/Azure/go-autorest v13.3.2+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
@@ -300,6 +301,7 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
@@ -424,6 +426,7 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeV
 github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
+github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=

venonactl/pkg/obj/kubeobj/kubeobj.go

@@ -45,6 +45,8 @@ var functionsMap map[string]string = map[string]string{
 	"v1beta1.Deployment": "ExtensionsV1beta1().Deployments(namespace)",
 	"v1beta1.DaemonSet":  "ExtensionsV1beta1().DaemonSets(namespace)",
 
+	"netV1beta1.Ingress": "NetworkingV1beta1().Ingresses(namespace)",
+
 	"appsv1.Deployment": "AppsV1().Deployments(namespace)",
 	"appsv1.DaemonSet":  "AppsV1().DaemonSets(namespace)",
 
@@ -77,7 +79,8 @@ import (
 
     metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
     "k8s.io/api/core/v1"
-    v1beta1 "k8s.io/api/extensions/v1beta1"
+	v1beta1 "k8s.io/api/extensions/v1beta1"
+	netV1beta1 "k8s.io/api/networking/v1beta1"
     appsv1 "k8s.io/api/apps/v1"
 
     rbacv1beta1 "k8s.io/api/rbac/v1beta1"

venonactl/pkg/obj/kubeobj_generator.go

@@ -4,11 +4,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
-	"time"
 
 	"github.com/codefresh-io/venona/venonactl/pkg/logger"
 	templates "github.com/codefresh-io/venona/venonactl/pkg/templates/kubernetes"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"github.com/stretchr/objx"
 )
 
 type appProxyPlugin struct {
@@ -45,40 +44,19 @@ func (u *appProxyPlugin) Install(opt *InstallOptions, v Values) (Values, error)
 		u.logger.Error(fmt.Sprintf("AppProxy installation failed: %v", err))
 		return nil, err
 	}
-	// locating the serivce and get it's internal api
 
-	var ingressIP string
-	ticker := time.NewTicker(5 * time.Second)
-Loop:
-	for {
-		select {
-		case <-ticker.C:
-			u.logger.Debug("Checking for app-proxy-service")
-			service, err := cs.CoreV1().Services(opt.ClusterNamespace).Get("app-proxy-service", v1.GetOptions{})
-			if err == nil {
-				ips := service.Status.LoadBalancer.Ingress
-				if len(ips) > 0 {
-					if ips[0].IP != "" {
-						ingressIP = ips[0].IP
-					} else {
-						ingressIP = ips[0].Hostname
-					}
-					break Loop
-				}
-			}
-		case <-time.After(600 * time.Second):
-			u.logger.Error("Failed to get app-proxy-service internal ip")
-			return v, fmt.Errorf("Failed to get app-proxy-service internal ip")
-		}
-	}
-	u.logger.Info(fmt.Sprintf("app proxy has ingress ip: %v\n", ingressIP))
+	host := objx.New(v["AppProxy"]).Get("Host").Str()
+	pathPrefix := objx.New(v["AppProxy"]).Get("PathPrefix").Str()
+	appProxyURL := fmt.Sprintf("https://%v%v", host, pathPrefix)
+	u.logger.Info(fmt.Sprintf("\napp proxy is running at: %v", appProxyURL))
+
 	// update IPC
 	file := os.NewFile(3, "pipe")
 	if file == nil {
 		return v, nil
 	}
 	data := map[string]interface{}{
-		"ingressIP": ingressIP,
+		"ingressIP": appProxyURL,
 	}
 	var jsonData []byte
 	jsonData, err = json.Marshal(data)

venonactl/pkg/plugins/app-proxy.go

@@ -113,7 +113,12 @@ type (
 		Resources map[string]interface{}
 	}
 	AppProxy struct {
-		Resources map[string]interface{}
+		Resources    map[string]interface{}
+		Host         string
+		Annotations  map[string]string
+		IngressClass string
+		TLSSecret    string
+		PathPrefix   string
 	}
 )
 
@@ -192,7 +197,12 @@ func (s *Values) BuildValues() map[string]interface{} {
 				"Name": "codefresh/cf-app-proxy",
 				"Tag":  "latest",
 			},
-			"Resources": s.AppProxy.Resources,
+			"Host":         s.AppProxy.Host,
+			"IngressClass": s.AppProxy.IngressClass,
+			"Annotations":  s.AppProxy.Annotations,
+			"Resources":    s.AppProxy.Resources,
+			"TLSSecret":    s.AppProxy.TLSSecret,
+			"PathPrefix":   s.AppProxy.PathPrefix,
 		},
 	}
 }

venonactl/pkg/store/store.go

@@ -0,0 +1,25 @@
+apiVersion: networking.k8s.io/v1beta1
+kind: Ingress
+metadata:
+  annotations:
+    {{ if ne .AppProxy.IngressClass "" }}kubernetes.io/ingress.class: {{ .AppProxy.IngressClass }}{{ end }}
+    {{ range $key, $value := .AppProxy.Annotations }}
+    {{ $key }}: {{ $value }}
+    {{ end }}
+  name: app-proxy
+  namespace: {{ .Namespace }}
+spec:
+  rules:
+    - host: {{ .AppProxy.Host }}
+      http:
+        paths:
+          - path: {{ if ne .AppProxy.PathPrefix "" }}{{ .AppProxy.PathPrefix }}{{ else }}'/'{{end}}
+            backend:
+              serviceName: app-proxy
+              servicePort: 80
+  {{ if ne .AppProxy.TLSSecret "" }}
+  tls:
+    - hosts:
+        - {{ .AppProxy.Host }}
+      secretName: {{ .AppProxy.TLSSecret }}
+  {{ end }}