App proxy ingress (#194)

ATGardner · web-flow · commit d29391623163 · 2022-01-11T15:50:56.000+02:00
* get all app-proxy env vars from cm
* added CORS
* set relevant cm values for app-proxy
* move crb of app-proxy to a new resource
* update to use app-proxy:v0.0.16
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-VERSION=v0.0.181
+VERSION=v0.0.182
 
 OUT_DIR=dist
 YEAR?=$(shell date +"%Y")
diff --git a/cmd/commands/runtime.go b/cmd/commands/runtime.go
@@ -358,11 +358,11 @@ func RunRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {
 
 	log.G(ctx).WithField("version", rt.Spec.Version).Infof("Installing runtime '%s'", opts.RuntimeName)
 	err = apcmd.RunRepoBootstrap(ctx, &apcmd.RepoBootstrapOptions{
-		AppSpecifier: 	 rt.Spec.FullSpecifier(),
+		AppSpecifier:    rt.Spec.FullSpecifier(),
 		Namespace:       opts.RuntimeName,
 		KubeFactory:     opts.KubeFactory,
 		CloneOptions:    opts.InsCloneOpts,
-		Insecure:     	 opts.Insecure,
+		Insecure:        opts.Insecure,
 		KubeContextName: opts.kubeContext,
 		ArgoCDLabels: map[string]string{
 			store.Get().LabelKeyCFType: store.Get().CFComponentType,
@@ -1085,12 +1085,10 @@ func configureAppProxy(ctx context.Context, opts *RuntimeInstallOptions, rt *run
 	}
 
 	literalResources := []string{
-		fmt.Sprintf("cfHost=%s", cfConfig.GetCurrentContext().URL),
 		"argoWorkflowsInsecure=true",
-	}
-
-	if cfConfig.GetCurrentContext().IsProduction() {
-		literalResources = append(literalResources, "env=production")
+		fmt.Sprintf("cfHost=%s", cfConfig.GetCurrentContext().URL),
+		fmt.Sprintf("cors=%s", cfConfig.GetCurrentContext().URL),
+		"env=production",
 	}
 
 	// configure codefresh host
@@ -1110,7 +1108,7 @@ func configureAppProxy(ctx context.Context, opts *RuntimeInstallOptions, rt *run
 			Namespace: rt.Namespace,
 			Paths: []ingressutil.IngressPath{
 				{
-					Path:        fmt.Sprintf("/%s/", store.Get().AppProxyIngressPath),
+					Path:        fmt.Sprintf("/%s", store.Get().AppProxyIngressPath),
 					PathType:    netv1.PathTypeImplementationSpecific,
 					ServiceName: store.Get().AppProxyServiceName,
 					ServicePort: store.Get().AppProxyServicePort,
diff --git a/docs/releases/release_notes.md b/docs/releases/release_notes.md
@@ -1,10 +1,10 @@
 ### Installed Applications:
 
-- Argo CD [v2.1.5](https://github.com/codefresh-io/argo-cd/releases/tag/v2.1.3)
-  - Argo CD ApplicationSet Controller [v0.2.0](https://github.com/argoproj-labs/applicationset/releases/tag/v0.2.0)
-- Argo Events [v1.5.5](https://github.com/argoproj/argo-events/releases/tag/v1.4.0)
-- Argo Rollouts [v1.1.0](https://github.com/argoproj/argo-rollouts/releases/tag/v1.1.0)
-- Argo Workflows [v3.2.4](https://github.com/argoproj/argo-workflows/releases/tag/v3.1.8)
+-   Argo CD [v2.1.5](https://github.com/codefresh-io/argo-cd/releases/tag/v2.1.3)
+    -   Argo CD ApplicationSet Controller [v0.2.0](https://github.com/argoproj-labs/applicationset/releases/tag/v0.2.0)
+-   Argo Events [v1.5.5](https://github.com/argoproj/argo-events/releases/tag/v1.4.0)
+-   Argo Rollouts [v1.1.0](https://github.com/argoproj/argo-rollouts/releases/tag/v1.1.0)
+-   Argo Workflows [v3.2.4](https://github.com/argoproj/argo-workflows/releases/tag/v3.1.8)
 
 ### Using brew:
 
@@ -23,7 +23,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.181/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.182/cf-linux-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-linux-amd64 /usr/local/bin/cf
@@ -36,7 +36,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.181/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.182/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf
diff --git a/manifests/app-proxy/app-proxy.cm.yaml b/manifests/app-proxy/app-proxy.cm.yaml
@@ -2,5 +2,3 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: cap-app-proxy-cm
-data:
-  apiPrefix: "/app-proxy"
diff --git a/manifests/app-proxy/app-proxy.crb.yaml b/manifests/app-proxy/app-proxy.crb.yaml
@@ -0,0 +1,12 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: cap-app-proxy-binding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: argo-server-cluster-role
+subjects:
+- kind: ServiceAccount
+  name: cap-app-proxy
+  namespace: default
diff --git a/manifests/app-proxy/app-proxy.deploy.yaml b/manifests/app-proxy/app-proxy.deploy.yaml
@@ -17,41 +17,87 @@ spec:
       serviceAccountName: cap-app-proxy
       containers:
         - env:
-            - name: API_PATH_PREFIX
+            - name: ARGO_WORKFLOWS_INSECURE
+              valueFrom:
+                configMapKeyRef:
+                  name: cap-app-proxy-cm
+                  key: argoWorkflowsInsecure
+                  optional: true
+            - name: ARGO_WORKFLOWS_URL
               valueFrom:
                 configMapKeyRef:
                   name: cap-app-proxy-cm
-                  key: apiPrefix
+                  key: argoWorkflowsUrl
                   optional: true
             - name: CF_HOST
               valueFrom:
                 configMapKeyRef:
                   name: cap-app-proxy-cm
                   key: cfHost
                   optional: true
+            - name: CORS
+              valueFrom:
+                configMapKeyRef:
+                  name: cap-app-proxy-cm
+                  key: cors
+                  optional: true
             - name: ENV
               valueFrom:
                 configMapKeyRef:
                   name: cap-app-proxy-cm
                   key: env
                   optional: true
-            - name: ARGO_WORKFLOWS_INSECURE
+            - name: GRAPHQL_DEBUG
               valueFrom:
                 configMapKeyRef:
                   name: cap-app-proxy-cm
-                  key: argoWorkflowsInsecure
+                  key: graphqlDebug
                   optional: true
-            - name: RUNTIME_TOKEN
+            - name: GRAPHQL_PLAYGROUND
               valueFrom:
-                secretKeyRef:
-                  name: codefresh-token
-                  key: token
+                configMapKeyRef:
+                  name: cap-app-proxy-cm
+                  key: graphqlPlayground
+                  optional: true
             - name: NAMESPACE
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: PORT
-              value: "80"
+              valueFrom:
+                configMapKeyRef:
+                  name: cap-app-proxy-cm
+                  key: port
+                  optional: true
+            - name: REPOS_DIR
+              valueFrom:
+                configMapKeyRef:
+                  name: cap-app-proxy-cm
+                  key: reposDir
+                  optional: true
+            - name: RUNTIME_NAME
+              valueFrom:
+                configMapKeyRef:
+                  name: cap-app-proxy-cm
+                  key: runtimeName
+                  optional: true
+            - name: RUNTIME_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: codefresh-token
+                  key: token
+            - name: STORE_BACKEND
+              valueFrom:
+                configMapKeyRef:
+                  name: cap-app-proxy-cm
+                  key: storeBackend
+                  optional: true
+            - name: STRIP_PREFIX
+              valueFrom:
+                configMapKeyRef:
+                  name: cap-app-proxy-cm
+                  key: stripPrefix
+                  optional: true
           image: quay.io/codefresh/cap-app-proxy
           imagePullPolicy: Always
           name: cap-app-proxy
diff --git a/manifests/app-proxy/kustomization.yaml b/manifests/app-proxy/kustomization.yaml
@@ -3,11 +3,12 @@ kind: Kustomization
 images:
   - name: quay.io/codefresh/cap-app-proxy
     newName: quay.io/codefresh/cap-app-proxy
-    newTag: v0.0.14
+    newTag: v0.0.16
 resources:
   - app-proxy.deploy.yaml
   - app-proxy.svc.yaml
   - app-proxy.sa.yaml
   - app-proxy.rb.yaml
+  - app-proxy.crb.yaml
   - app-proxy.role.yaml
   - app-proxy.cm.yaml
diff --git a/manifests/argo-workflows/kustomization.yaml b/manifests/argo-workflows/kustomization.yaml
@@ -13,17 +13,6 @@ patches:
       - op: replace
         path: /subjects/0/namespace
         value: default
-  # add to the app-proxy service account the required permissions
-  # to manipulate workflows
-  - target:
-      group: rbac.authorization.k8s.io
-      version: v1
-      kind: ClusterRoleBinding
-      name: argo-server-binding
-    patch: |-
-      - op: add
-        path: /subjects/1
-        value: { "kind": "ServiceAccount", "name": "cap-app-proxy", "namespace": "default" }
 
   - target:
       group: apps
diff --git a/manifests/runtime.yaml b/manifests/runtime.yaml
@@ -1,26 +1,26 @@
 apiVersion: codefresh.io/v1alpha1
 kind: Runtime
 metadata:
-  name: "{{ name }}"
-  namespace: "{{ namespace }}"
+    name: '{{ name }}'
+    namespace: '{{ namespace }}'
 spec:
-  defVersion: 1.0.0
-  version: 0.0.181
-  bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
-  components:
-    - name: events
-      type: kustomize
-      url: github.com/codefresh-io/cli-v2/manifests/argo-events
-      wait: true
-    - name: rollouts
-      type: kustomize
-      url: github.com/codefresh-io/cli-v2/manifests/argo-rollouts
-    - name: workflows
-      type: kustomize
-      url: github.com/codefresh-io/cli-v2/manifests/argo-workflows
-    - name: argocd-agent
-      type: kustomize
-      url: github.com/codefresh-io/cli-v2/manifests/argo-agent
-    - name: app-proxy
-      type: kustomize
-      url: github.com/codefresh-io/cli-v2/manifests/app-proxy
+    defVersion: 1.0.0
+    version: 0.0.182
+    bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
+    components:
+        - name: events
+          type: kustomize
+          url: github.com/codefresh-io/cli-v2/manifests/argo-events
+          wait: true
+        - name: rollouts
+          type: kustomize
+          url: github.com/codefresh-io/cli-v2/manifests/argo-rollouts
+        - name: workflows
+          type: kustomize
+          url: github.com/codefresh-io/cli-v2/manifests/argo-workflows
+        - name: argocd-agent
+          type: kustomize
+          url: github.com/codefresh-io/cli-v2/manifests/argo-agent
+        - name: app-proxy
+          type: kustomize
+          url: github.com/codefresh-io/cli-v2/manifests/app-proxy
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -49,7 +49,6 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/codefresh-io/cli-v2/pkg/log"
-	"github.com/codefresh-io/cli-v2/pkg/store"
 	"github.com/codefresh-io/cli-v2/pkg/util"
 	"github.com/codefresh-io/go-sdk/pkg/codefresh"
 )
@@ -95,10 +94,6 @@ type AuthContext struct {
 	DefaultRuntime string `mapstructure:"defaultRuntime" json:"defaultRuntime"`
 }
 
-func (ac *AuthContext) IsProduction() bool {
-	return ac.URL == store.Get().DefaultAPI
-}
-
 func AddFlags(f *pflag.FlagSet) *Config {
 	conf := &Config{path: defaultPath}
 
@@ -243,7 +238,7 @@ func (c *Config) clientForContext(ctx *AuthContext) codefresh.Codefresh {
 	}
 
 	return newCodefresh(&codefresh.ClientOptions{
-		Host:   ctx.URL,
+		Host: ctx.URL,
 		Auth: codefresh.AuthOptions{
 			Token: ctx.Token,
 		},

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-VERSION=v0.0.181`
	`1`	`+VERSION=v0.0.182`
`2`	`2`
`3`	`3`	`OUT_DIR=dist`
`4`	`4`	`YEAR?=$(shell date +"%Y")`