Skip to content

Commit f884671

Browse files
feat(): add auth role routing (#81)
Co-authored-by: mikhail-klimko <mklimko123@gmail.com>
1 parent dd90ea5 commit f884671

File tree

5 files changed

+25
-5
lines changed

5 files changed

+25
-5
lines changed

charts/internal-gateway/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
appVersion: v0.0.0
33
description: A Helm chart for Codefresh Internal Gateway
44
name: internal-gateway
5-
version: 0.6.0
5+
version: 0.7.0
66
home: https://github.com/codefresh-io/helm-charts
77
keywords:
88
- codefresh

charts/internal-gateway/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# internal-gateway
22

3-
![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![AppVersion: v0.0.0](https://img.shields.io/badge/AppVersion-v0.0.0-informational?style=flat-square)
3+
![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![AppVersion: v0.0.0](https://img.shields.io/badge/AppVersion-v0.0.0-informational?style=flat-square)
44

55
A Helm chart for Codefresh Internal Gateway
66

@@ -23,7 +23,7 @@ A Helm chart for Codefresh Internal Gateway
2323
| Key | Type | Default | Description |
2424
|-----|------|---------|-------------|
2525
| codefresh | object | See below | Codefresh platform settings List of services endpoints and port |
26-
| codefresh.serviceEndpoints | object | `{"argo-platform-api-events":{},"argo-platform-api-graphql":{},"argo-platform-ui":{},"cfapi-admin":{},"cfapi-downloadlogmanager":{},"cfapi-endpoints":{},"cfapi-environments":{},"cfapi-gitops-resource-receiver":{},"cfapi-kubernetes-endpoints":{},"cfapi-kubernetesresourcemonitor":{},"cfapi-teams":{},"cfapi-test-reporting":{},"cfapi-ws":{},"cfui":{}}` | Override defaults here! |
26+
| codefresh.serviceEndpoints | object | `{"argo-platform-api-events":{},"argo-platform-api-graphql":{},"argo-platform-ui":{},"cfapi-admin":{},"cfapi-auth":{},"cfapi-downloadlogmanager":{},"cfapi-endpoints":{},"cfapi-environments":{},"cfapi-gitops-resource-receiver":{},"cfapi-kubernetes-endpoints":{},"cfapi-kubernetesresourcemonitor":{},"cfapi-teams":{},"cfapi-test-reporting":{},"cfapi-ws":{},"cfui":{}}` | Override defaults here! |
2727
| container | object | See below | Main container parameters |
2828
| containerSecurityContext | object | See below | Container security context parameters |
2929
| controller | object | See below | Controller parameters |

charts/internal-gateway/templates/_default_values.tpl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
{{- define "internal-gateway.default-values" }}
22
codefresh:
33
serviceEndpoints:
4+
cfapi-auth:
5+
svc: '{{ .Release.Name }}-{{ index .Values.codefresh "cfapi-auth-svc" }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}'
6+
port: {{ index .Values.codefresh "cfapi-auth-port" }}
47
cfapi-endpoints:
58
svc: '{{ .Release.Name }}-{{ index .Values.codefresh "cfapi-endpoints-svc" }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}'
69
port: {{ index .Values.codefresh "cfapi-endpoints-port" }}

charts/internal-gateway/templates/_location_map.tpl

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ locationDirectives:
2626

2727
{{- define "internal-gateway.platform-endpoints-defaults" }}
2828
serviceEndpoints:
29+
cfapi-auth:
30+
svc: cfapi-auth
31+
port: 80
2932
cfapi-endpoints:
3033
svc: cfapi-endpoints
3134
port: 80
@@ -114,8 +117,8 @@ nginx:
114117
/api/auth/authenticate:
115118
enabled: true
116119
proxy:
117-
host: {{ index $endpoints.serviceEndpoints "cfapi-endpoints" "svc" }}
118-
port: {{ index $endpoints.serviceEndpoints "cfapi-endpoints" "port" }}
120+
host: {{ index $endpoints.serviceEndpoints "cfapi-auth" "svc" }}
121+
port: {{ index $endpoints.serviceEndpoints "cfapi-auth" "port" }}
119122
proxyPassSnippet: |
120123
proxy_pass_request_body off;
121124
locationSnippet: |
@@ -130,6 +133,16 @@ nginx:
130133
locationDirectives:
131134
{{- $presets.locationDirectives | toYaml | nindent 10 }}
132135

136+
/api/auth/:
137+
enabled: true
138+
proxy:
139+
host: {{ index $endpoints.serviceEndpoints "cfapi-auth" "svc" }}
140+
port: {{ index $endpoints.serviceEndpoints "cfapi-auth" "port" }}
141+
locationSnippet:
142+
{{- $presets.locationSnippet | toYaml | nindent 10 }}
143+
locationDirectives:
144+
{{- $presets.locationDirectives | toYaml | nindent 10 }}
145+
133146
/api/:
134147
enabled: true
135148
proxy:

charts/internal-gateway/values.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ libraryMode: true
66
# List of services endpoints and port
77
# @default -- See below
88
codefresh:
9+
cfapi-auth-svc: cfapi-auth
10+
cfapi-auth-port: 80
11+
912
cfapi-endpoints-svc: cfapi-endpoints
1013
cfapi-endpoints-port: 80
1114

@@ -62,6 +65,7 @@ codefresh:
6265

6366
# -- Override defaults here!
6467
serviceEndpoints:
68+
cfapi-auth: {}
6569
cfapi-endpoints: {}
6670
cfapi-environments: {}
6771
cfapi-downloadlogmanager: {}

0 commit comments

Comments
 (0)