Skip to content

Commit 59ecd9f

Browse files
committed
Merge branch 'feature/CH-224' of github.com:MetaCell/cloud-harness into develop
2 parents cab5ceb + 1932760 commit 59ecd9f

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

deployment-configuration/helm/templates/auto-gatekeepers.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ data:
2727
forbidden-page: /templates/access-denied.html.tmpl
2828
enable-default-deny: {{ $noWildcards }}
2929
listen: 0.0.0.0:8080
30+
enable-encrypted-token: false
31+
encryption-key: {{ .app.harness.secrets.gatekeeper | default (randAlphaNum 20) | quote }}
3032
enable-refresh-tokens: true
3133
server-write-timeout: {{ .app.harness.proxy.timeout.send | default .root.Values.proxy.timeout.send | default 180 }}s
3234
upstream-timeout: {{ .app.harness.proxy.timeout.read | default .root.Values.proxy.timeout.read | default 180 }}s
@@ -38,7 +40,6 @@ data:
3840
tls-cert:
3941
tls-private-key:
4042
redirection-url: {{ ternary "https" "http" $tls }}://{{ .subdomain }}.{{ .root.Values.domain }}
41-
encryption-key: AgXa7xRcoClDEU0ZDSH4X0XhL5Qy2Z2j
4243
upstream-url: http://{{ .app.harness.service.name }}.{{ .app.namespace | default .root.Release.Namespace }}:{{ .app.harness.service.port | default 80}}
4344
{{ if .app.harness.secured }}
4445
{{ with .app.harness.uri_role_mapping }}
@@ -135,7 +136,7 @@ spec:
135136
{{ include "deploy_utils.etcHosts" .root | indent 6 }}
136137
containers:
137138
- name: {{ .app.harness.service.name | quote }}
138-
image: {{ .app.harness.proxy.gatekeeper.image | default .root.Values.proxy.gatekeeper.image | default "quay.io/gogatekeeper/gatekeeper:2.14.3" }}
139+
image: {{ .app.harness.proxy.gatekeeper.image | default .root.Values.proxy.gatekeeper.image | default "quay.io/gogatekeeper/gatekeeper:4.6.0" }}
139140
imagePullPolicy: IfNotPresent
140141
{{ if .root.Values.local }}
141142
securityContext:

deployment-configuration/value-template.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ harness:
5555
# -- Service port.
5656
port: 80
5757
# -- Auto generated secrets key-value pairs. If no value is provided, a random hash is generated
58-
secrets: {}
58+
secrets:
59+
gatekeeper:
5960
# -- Specify which services this application uses in the frontend to create proxy ingresses. e.g. - name: mnp-checkout
6061
use_services: []
6162
# -- enabled sentry for automated error report

0 commit comments

Comments
 (0)