...
 
Commits (2)
......@@ -3,7 +3,7 @@ current_version = 0.8.0rc1
tag = True
commit = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(-?)(?P<release>.*)
serialize =
serialize =
{major}.{minor}.{patch}-{release}
{major}.{minor}.{patch}
message = new release: {new_version}
......@@ -13,6 +13,8 @@ tag_name = version/{new_version}
[bumpversion:file:operator/helm-charts/p2/values.yaml]
[bumpversion:file:deploy/example-instance.yml]
[bumpversion:file:deploy/install.sh]
[bumpversion:file:p2/__init__.py]
......
......@@ -4,7 +4,7 @@ kind: P2
metadata:
name: example-p2
spec:
version: 0.7.6
version: 0.8.0rc1
secret_key: "r-9k#x4tkk2e8%=(9hf#^v4&=5z2)^gzn^)l*_=z+&0a97kwd8"
redis:
......
......@@ -3,17 +3,17 @@ kind: ConfigMap
metadata:
name: {{ include "p2.fullname" . }}-config
data:
P2_DEBUG: 'false'
P2_ERROR_REPORT_ENABLED: {{ .Values.config.error_reporting | quote }}
P2_S3__BASE_DOMAIN: {{ (index .Values.ingress.hosts 0) | quote }}
debug: 'false'
error_report_enabled: {{ .Values.config.error_reporting | quote }}
s3.base_domain: {{ (index .Values.ingress.hosts 0) | quote }}
# Set this to true if you only want to use external authentication
P2_EXTERNAL_AUTH_ONLY: {{ .Values.config.external_auth_only | quote }}
external_auth_only: {{ .Values.config.external_auth_only | quote }}
# Callback URL: <base url>/_/oidc/callback/
{{- if .Values.config.oidc.enabled -}}
P2_OIDC__ENABLED: 'true'
P2_OIDC__CLIENT_ID: '{{ .Values.config.oidc.client_id }}'
P2_OIDC__CLIENT_SECRET: '{{ .Values.config.oidc.client_secret }}'
P2_OIDC__AUTH_URL: '{{ .Values.config.oidc.auth_url }}'
P2_OIDC__TOKEN_URL: '{{ .Values.config.oidc.token_url }}'
P2_OIDC__USER_URL: '{{ .Values.config.oidc.user_url }}'
oidc.enabled: 'true'
oidc.client_id: '{{ .Values.config.oidc.client_id }}'
oidc.client_secret: '{{ .Values.config.oidc.client_secret }}'
oidc.auth_url: '{{ .Values.config.oidc.auth_url }}'
oidc.token_url: '{{ .Values.config.oidc.token_url }}'
oidc.user_url: '{{ .Values.config.oidc.user_url }}'
{{ end }}
......@@ -48,6 +48,7 @@ spec:
envFrom:
- configMapRef:
name: {{ include "p2.fullname" . }}-config
prefix: P2_
env:
- name: P2_REDIS__HOST
value: "{{ .Release.Name }}-redis-master"
......
......@@ -40,6 +40,7 @@ spec:
envFrom:
- configMapRef:
name: {{ include "p2.fullname" . }}-config
prefix: P2_
env:
- name: P2_REDIS__HOST
value: "{{ .Release.Name }}-redis-master"
......@@ -78,8 +79,9 @@ spec:
envFrom:
- configMapRef:
name: {{ include "p2.fullname" . }}-config
prefix: P2_
env:
- name: P2_COMPONENT
- name: P2_POD_COMPONENT
value: web
- name: P2_REDIS__HOST
value: "{{ .Release.Name }}-redis-master"
......
......@@ -41,6 +41,7 @@ spec:
envFrom:
- configMapRef:
name: {{ include "p2.fullname" . }}-config
prefix: P2_
env:
- name: P2_REDIS__HOST
value: "{{ .Release.Name }}-redis-master"
......
......@@ -21,7 +21,7 @@ class S3RoutingMiddleware:
def process_exception(self, request: HttpRequest, exception):
"""Catch AWS-specific exceptions and show them as XML response"""
if CONFIG.y('debug'):
if CONFIG.y_bool('debug'):
LOGGER.exception(exception)
LOGGER.debug("Request Body ", body=request.body)
if isinstance(exception, AWSError):
......@@ -94,7 +94,7 @@ class S3RoutingMiddleware:
# Set SECURE_PROXY_SSL_HEADER so SecurityMiddleware doesn't return a 302
request.META['HTTP_X_FORWARDED_PROTO'] = 'https'
response = self.get_response(request)
if CONFIG.y('debug') and response.status_code > 300:
if CONFIG.y_bool('debug') and response.status_code > 300:
if response['Content-Type'] == 'text/xml':
LOGGER.debug("Request Body", body=request.body)
LOGGER.debug("Response Body", body=response.content)
......