From db2e8913a608c35f40b40d8db41bcdff4478bc52 Mon Sep 17 00:00:00 2001 From: ziv-codefresh Date: Thu, 19 Jan 2023 09:56:01 +0200 Subject: [PATCH 1/4] wip --- codefresh-tunnel-server/templates/server-config.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/codefresh-tunnel-server/templates/server-config.yaml b/codefresh-tunnel-server/templates/server-config.yaml index a0991d1..504035b 100644 --- a/codefresh-tunnel-server/templates/server-config.yaml +++ b/codefresh-tunnel-server/templates/server-config.yaml @@ -12,7 +12,3 @@ data: dashboard_user = admin dashboard_pwd = admin log_level = trace - [plugin.codefresh] - addr = 127.0.0.1:7200 - path = /newProxy - ops = NewProxy \ No newline at end of file From 73f56defdcbe602a50d9058e77bb0ef1f0e4a273 Mon Sep 17 00:00:00 2001 From: ziv-codefresh Date: Thu, 19 Jan 2023 12:13:45 +0200 Subject: [PATCH 2/4] wip --- codefresh-tunnel-server/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codefresh-tunnel-server/values.yaml b/codefresh-tunnel-server/values.yaml index 2b5beb9..2ff6245 100644 --- a/codefresh-tunnel-server/values.yaml +++ b/codefresh-tunnel-server/values.yaml @@ -77,7 +77,7 @@ podAnnotations: {} # For scaling of the tunnel server set scaling to true. This requires the router component to be created scaling: - enabled: true + enabled: false # Redis parameters. redisURL: # Set either plain URL or a reference to an existing secret From b365ecc2335b78331a7e31479f5e66b5a37ce53b Mon Sep 17 00:00:00 2001 From: ziv-codefresh Date: Thu, 19 Jan 2023 12:24:19 +0200 Subject: [PATCH 3/4] wip --- codefresh-tunnel-server/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codefresh-tunnel-server/values.yaml b/codefresh-tunnel-server/values.yaml index 2ff6245..ee3868e 100644 --- a/codefresh-tunnel-server/values.yaml +++ b/codefresh-tunnel-server/values.yaml @@ -43,7 +43,7 @@ service: annotations: # This ingress will be used to register new tunnels ingress: - enabled: false + enabled: true host: # Host for tunnel registration ingressClassName: "nginx" annotations: {} From 22e3d1c588da0952669c6455c9c3c91f51ad599b Mon Sep 17 00:00:00 2001 From: ziv-codefresh Date: Thu, 19 Jan 2023 16:20:52 +0200 Subject: [PATCH 4/4] wip --- .../templates/tunnel-server-deployment.yaml | 20 ------------------- codefresh-tunnel-server/values.yaml | 2 +- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/codefresh-tunnel-server/templates/tunnel-server-deployment.yaml b/codefresh-tunnel-server/templates/tunnel-server-deployment.yaml index 88b8ae6..d1fc15d 100644 --- a/codefresh-tunnel-server/templates/tunnel-server-deployment.yaml +++ b/codefresh-tunnel-server/templates/tunnel-server-deployment.yaml @@ -51,26 +51,6 @@ spec: volumeMounts: - mountPath: /etc/frp name: server-config - - name: codefresh-plugin - image: "{{ .Values.plugin.image.repository }}:{{ .Values.plugin.image.tag}}" - imagePullPolicy: {{ .Values.plugin.image.pullPolicy }} - command: ["frp-codefresh-plugin"] - args: - - --bind-addr=0.0.0.0:7200 - - --cf-base-url={{ .Values.codefreshBaseUrl }} - env: - {{- include "codefresh-tunnel-server.redis-url-env" . | nindent 10 }} - - name: MY_POD_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - - name: SERVER_MODE - value: debug - {{- with .Values.plugin.env -}} - {{ . | toYaml | nindent 10 }} - {{- end }} - resources: - {{- toYaml .Values.plugin.resources | nindent 12 }} volumes: - name: server-config projected: diff --git a/codefresh-tunnel-server/values.yaml b/codefresh-tunnel-server/values.yaml index ee3868e..f05fa1b 100644 --- a/codefresh-tunnel-server/values.yaml +++ b/codefresh-tunnel-server/values.yaml @@ -17,7 +17,7 @@ plugin: resources: {} tunnels: - subdomainHost: # Will be created in the form *.subdomain + subdomainHost: local-tunnel.pipeline-team.cf-cd.com service: type: ClusterIP annotations: