Skip to content

Commit 0c4ec48

Browse files
More ingress controllers support (#292)
* istio, traefik and ambassador support * bump
1 parent 3698c68 commit 0c4ec48

File tree

5 files changed

+14
-7
lines changed

5 files changed

+14
-7
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION=v0.0.268
1+
VERSION=v0.0.269
22

33
OUT_DIR=dist
44
YEAR?=$(shell date +"%Y")

cmd/commands/runtime.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,9 @@ const (
151151

152152
IngressControllerNginxCommunity ingressControllerType = "k8s.io/ingress-nginx"
153153
IngressControllerNginxEnterprise ingressControllerType = "nginx.org/ingress-controller"
154+
IngressControllerIstio ingressControllerType = "istio.io/ingress-controller"
155+
IngressControllerTraefik ingressControllerType = "traefik.io/ingress-controller"
156+
IngressControllerAmbassador ingressControllerType = "getambassador.io/ingress-controller"
154157
)
155158

156159
var summaryArr []summaryLog
@@ -469,7 +472,7 @@ func ensureIngressClass(ctx context.Context, opts *RuntimeInstallOptions) error
469472
return fmt.Errorf("failed to get ingress class list from your cluster: %w", err)
470473
}
471474

472-
supportedControllers := []ingressControllerType{IngressControllerNginxCommunity, IngressControllerNginxEnterprise}
475+
supportedControllers := []ingressControllerType{IngressControllerNginxCommunity, IngressControllerNginxEnterprise, IngressControllerIstio, IngressControllerTraefik, IngressControllerAmbassador}
473476
var ingressClassNames []string
474477
ingressClassNameToController := make(map[string]ingressController)
475478
var isValidClass bool
@@ -527,6 +530,10 @@ func getIngressControllerName(controllerType ingressControllerType, className st
527530
return "ingress-nginx-controller"
528531
case IngressControllerNginxEnterprise:
529532
return fmt.Sprintf("%s-ingress-controller", className)
533+
case IngressControllerTraefik:
534+
return "traefik"
535+
case IngressControllerIstio:
536+
return "istio-ingressgateway"
530537
default:
531538
return ""
532539
}
@@ -1864,7 +1871,7 @@ func configureAppProxy(ctx context.Context, opts *RuntimeInstallOptions, rt *run
18641871
Host: opts.HostName,
18651872
Paths: []ingressutil.IngressPath{
18661873
{
1867-
Path: fmt.Sprintf("/%s", store.Get().AppProxyIngressPath),
1874+
Path: store.Get().AppProxyIngressPath,
18681875
PathType: netv1.PathTypePrefix,
18691876
ServiceName: store.Get().AppProxyServiceName,
18701877
ServicePort: store.Get().AppProxyServicePort,

docs/releases/release_notes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ cf version
2323

2424
```bash
2525
# download and extract the binary
26-
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.268/cf-linux-amd64.tar.gz | tar zx
26+
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.269/cf-linux-amd64.tar.gz | tar zx
2727

2828
# move the binary to your $PATH
2929
mv ./cf-linux-amd64 /usr/local/bin/cf
@@ -36,7 +36,7 @@ cf version
3636

3737
```bash
3838
# download and extract the binary
39-
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.268/cf-darwin-amd64.tar.gz | tar zx
39+
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.269/cf-darwin-amd64.tar.gz | tar zx
4040

4141
# move the binary to your $PATH
4242
mv ./cf-darwin-amd64 /usr/local/bin/cf

manifests/runtime.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
namespace: "{{ namespace }}"
66
spec:
77
defVersion: 1.0.1
8-
version: 0.0.268
8+
version: 0.0.269
99
bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
1010
components:
1111
- name: events

pkg/store/store.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ func init() {
172172
s.WorkflowsIngressName = "-workflows-ingress"
173173
s.WorkflowsIngressPath = "workflows"
174174
s.AppProxyIngressName = "-cap-app-proxy"
175-
s.AppProxyIngressPath = "app-proxy"
175+
s.AppProxyIngressPath = "/app-proxy/"
176176
s.AppProxyServicePort = 3017
177177
s.AppProxyServiceName = "cap-app-proxy"
178178
s.DocsLink = "https://codefresh.io/csdp-docs/"

0 commit comments

Comments
 (0)