Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: app loggers #396

Merged
merged 3 commits into from
Dec 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/microk8s.yml
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ jobs:

- name: Install microk8s
run: |
sudo snap install microk8s --classic --channel=1.19
sudo snap install microk8s --classic --channel=1.21
sudo snap alias microk8s.kubectl kubectl
sudo microk8s.status --wait-ready
sudo microk8s.enable dns registry ingress
Expand Down
32 changes: 16 additions & 16 deletions pygluu/kubernetes/templates/helm/gluu/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
# License terms and conditions for Gluu Cloud Native Edition:
# https://www.apache.org/licenses/LICENSE-2.0
apiVersion: v2
appVersion: "4.3.0"
appVersion: "4.3.1"
kubeVersion: ">=v1.21.0-0"
annotations:
artifacthub.io/changes: |
- Gluu 4.3.0 official chart release
- Gluu 4.3.1 official chart release
artifacthub.io/images: |
- name: casa
image: gluufederation/casa:4.3.0_dev
image: gluufederation/casa:4.3.1_dev
- name: fido2
image: gluufederation/fido2:4.3.0_dev
image: gluufederation/fido2:4.3.1_dev
- name: scim
image: gluufederation/scim:4.3.0_dev
image: gluufederation/scim:4.3.1_dev
- name: configuration-manager
image: gluufederation/config-init:4.3.0_dev
image: gluufederation/config-init:4.3.1_dev
- name: cr-rotate
image: gluufederation/cr-rotate:4.3.0_dev
image: gluufederation/cr-rotate:4.3.1_dev
- name: certmanager
image: gluufederation/certmanager:4.3.0_dev
image: gluufederation/certmanager:4.3.1_dev
- name: opendj
image: gluufederation/opendj:4.3.0_dev
image: gluufederation/opendj:4.3.1_dev
- name: jackrabbit
image: gluufederation/jackrabbit:4.3.0_dev
image: gluufederation/jackrabbit:4.3.1_dev
- name: oxauth
image: gluufederation/oxauth:4.3.0_dev
image: gluufederation/oxauth:4.3.1_dev
- name: oxd-server
image: gluufederation/oxd-server:4.3.0_dev
image: gluufederation/oxd-server:4.3.1_dev
- name: oxpassport
image: gluufederation/oxpassport:4.3.0_dev
image: gluufederation/oxpassport:4.3.1_dev
- name: oxshibboleth
image: gluufederation/oxshibboleth:4.3.0_dev
image: gluufederation/oxshibboleth:4.3.1_dev
- name: persistence
image: gluufederation/persistence:4.3.0_dev
image: gluufederation/persistence:4.3.1_dev
- name: oxtrust
image: gluufederation/oxtrust:4.3.0_dev
image: gluufederation/oxtrust:4.3.1_dev
artifacthub.io/license: Apache-2.0
icon: https://gluu.org/docs/gluu-server/favicon.ico
home: https://www.gluu.org
Expand Down
166 changes: 117 additions & 49 deletions pygluu/kubernetes/templates/helm/gluu/README.md

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ maintainers:
email: [email protected]
url: https://github.com/moabu
icon: https://casa.gluu.org/wp-content/themes/gluucasa/casafavicon.ico
appVersion: "4.3.0"
appVersion: "4.3.1"
6 changes: 3 additions & 3 deletions pygluu/kubernetes/templates/helm/gluu/charts/casa/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# casa

![version: 1.6.15](https://img.shields.io/badge/Version-1.6.14-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.3.0](https://img.shields.io/badge/AppVersion-4.3.0-informational?style=flat-square)
![Version: 1.6.15](https://img.shields.io/badge/Version-1.6.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.3.1](https://img.shields.io/badge/AppVersion-4.3.1-informational?style=flat-square)

Gluu Casa ("Casa") is a self-service web portal for end-users to manage authentication and authorization preferences for their account in a Gluu Server.

Expand All @@ -20,7 +20,7 @@ Gluu Casa ("Casa") is a self-service web portal for end-users to manage authenti

## Requirements

Kubernetes: `>=v1.18.0-0`
Kubernetes: `>=v1.21.0-0`

## Values

Expand All @@ -40,7 +40,7 @@ Kubernetes: `>=v1.18.0-0`
| image.pullPolicy | string | `"IfNotPresent"` | Image pullPolicy to use for deploying. |
| image.pullSecrets | list | `[]` | Image Pull Secrets |
| image.repository | string | `"gluufederation/casa"` | Image to use for deploying. |
| image.tag | string | `"4.3.0_01"` | Image tag to use for deploying. |
| image.tag | string | `"4.3.1_01"` | Image tag to use for deploying. |
| livenessProbe | object | `{"httpGet":{"path":"/casa/health-check","port":"http-casa"},"initialDelaySeconds":25,"periodSeconds":25,"timeoutSeconds":5}` | Configure the liveness healthcheck for casa if needed. |
| livenessProbe.httpGet.path | string | `"/casa/health-check"` | http liveness probe endpoint |
| nameOverride | string | `""` | |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ image:
# -- Image to use for deploying.
repository: gluufederation/casa
# -- Image tag to use for deploying.
tag: 4.3.0_01
tag: 4.3.1_01
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Service replica number.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ maintainers:
email: [email protected]
url: https://github.com/moabu
icon: https://gluu.org/docs/gluu-server/favicon.ico
appVersion: "4.3.0"
appVersion: "4.3.1"
6 changes: 3 additions & 3 deletions pygluu/kubernetes/templates/helm/gluu/charts/config/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# config

![version: 1.6.15](https://img.shields.io/badge/Version-1.6.14-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.3.0](https://img.shields.io/badge/AppVersion-4.3.0-informational?style=flat-square)
![Version: 1.6.15](https://img.shields.io/badge/Version-1.6.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.3.1](https://img.shields.io/badge/AppVersion-4.3.1-informational?style=flat-square)

Configuration parameters for setup and initial configuration secret and config layers used by Gluu services.

Expand All @@ -20,7 +20,7 @@ Configuration parameters for setup and initial configuration secret and config l

## Requirements

Kubernetes: `>=v1.18.0-0`
Kubernetes: `>=v1.21.0-0`

## Values

Expand Down Expand Up @@ -102,7 +102,7 @@ Kubernetes: `>=v1.18.0-0`
| email | string | `"[email protected]"` | Email address of the administrator usually. Used for certificate creation. |
| image.pullSecrets | list | `[]` | Image Pull Secrets |
| image.repository | string | `"gluufederation/config-init"` | Image to use for deploying. |
| image.tag | string | `"4.3.0_01"` | Image tag to use for deploying. |
| image.tag | string | `"4.3.1_01"` | Image tag to use for deploying. |
| ldapPass | string | `"P@ssw0rd"` | LDAP admin password if OpennDJ is used for persistence. |
| migration | object | `{"enabled":false,"migrationDataFormat":"ldif","migrationDir":"/ce-migration"}` | CE to CN Migration section |
| migration.enabled | bool | `false` | Boolean flag to enable migration from CE |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,34 @@ data:
GLUU_JACKRABBIT_URL: {{ .Values.configmap.gluuJackrabbitUrl | quote }}
DOMAIN: {{ .Values.global.domain | quote }}
GLUU_OXAUTH_BACKEND: {{ .Values.configmap.gluuOxauthBackend | quote }}
GLUU_OXAUTH_APP_LOGGERS: {{ .Values.global.oxauth.appLoggers
| toJson
| replace "authLogTarget" "oxauth_log_target"
| replace "authLogLevel" "oxauth_log_level"
| replace "httpLogTarget" "http_log_target"
| replace "httpLogLevel" "http_log_level"
| replace "persistenceLogTarget" "persistence_log_target"
| replace "persistenceLogLevel" "persistence_log_level"
| replace "persistenceDurationLogTarget" "persistence_duration_log_target"
| replace "persistenceDurationLogLevel" "persistence_duration_log_level"
| replace "ldapStatsLogTarget" "ldap_stats_log_target"
| replace "ldapStatsLogLevel" "ldap_stats_log_level"
| replace "scriptLogTarget" "script_log_target"
| replace "scriptLogLevel" "script_log_level"
| replace "auditStatsLogTarget" "audit_log_target"
| replace "auditStatsLogLevel" "audit_log_level"
| replace "cleanerLogTarget" "cleaner_log_target"
| replace "cleanerLogLevel" "cleaner_log_level"
| squote
}}
GLUU_OXD_SERVER_URL: {{ .Values.configmap.gluuOxdServerUrl | quote }}
GLUU_OXD_BIND_IP_ADDRESSES: {{ .Values.configmap.gluuOxdBindIpAddresses | quote }}
GLUU_OXD_APP_LOGGERS: {{ index .Values "global" "oxd-server" "appLoggers"
| toJson
| replace "oxdServerLogTarget" "oxd_log_target"
| replace "oxdServerLogLevel" "oxd_log_level"
| squote
}}
{{- if and (eq .Values.global.isDomainRegistered "false") (or (eq .Values.global.storageClass.provisioner "kubernetes.io/aws-ebs") (eq .Values.global.storageClass.provisioner "openebs.io/local")) }}
LB_ADDR: {{ .Values.configmap.lbAddr }}
{{- end }}
Expand Down Expand Up @@ -82,6 +108,42 @@ data:
GLUU_CERT_ALT_NAME: {{ .Values.global.ldapServiceName }} #{{ template "gluu.fullname" . }}-service
GLUU_SYNC_CASA_MANIFESTS: {{ .Values.configmap.gluuSyncCasaManifests | quote }}
GLUU_OXTRUST_BACKEND: {{ .Values.configmap.gluuOxtrustBackend | quote }}
GLUU_OXTRUST_APP_LOGGERS: {{ .Values.global.oxtrust.appLoggers
| toJson
| replace "oxtrustLogTarget" "oxtrust_log_target"
| replace "oxtrustLogLevel" "oxtrust_log_level"
| replace "httpLogTarget" "http_log_target"
| replace "httpLogLevel" "http_log_level"
| replace "persistenceLogTarget" "persistence_log_target"
| replace "persistenceLogLevel" "persistence_log_level"
| replace "persistenceDurationLogTarget" "persistence_duration_log_target"
| replace "persistenceDurationLogLevel" "persistence_duration_log_level"
| replace "ldapStatsLogTarget" "ldap_stats_log_target"
| replace "ldapStatsLogLevel" "ldap_stats_log_level"
| replace "scriptLogTarget" "script_log_target"
| replace "scriptLogLevel" "script_log_level"
| replace "auditStatsLogTarget" "audit_log_target"
| replace "auditStatsLogLevel" "audit_log_level"
| replace "cleanerLogTarget" "cleaner_log_target"
| replace "cleanerLogLevel" "cleaner_log_level"
| replace "velocityLogLevel" "velocity_log_level"
| replace "velocityLogTarget" "velocity_log_target"
| replace "cacheRefreshLogLevel" "cache_refresh_log_level"
| replace "cacheRefreshLogTarget" "cache_refresh_log_target"
| replace "cacheRefreshPythonLogLevel" "cache_refresh_python_log_level"
| replace "cacheRefreshPythonLogTarget" "cache_refresh_python_log_target"
| replace "apachehcLogLevel" "apachehc_log_level"
| replace "apachehcLogTarget" "apachehc_log_target"
| squote
}}
GLUU_FIDO2_APP_LOGGERS: {{ .Values.global.fido2.appLoggers
| toJson
| replace "fido2LogTarget" "fido2_log_target"
| replace "fido2LogLevel" "fido2_log_level"
| replace "persistenceLogTarget" "persistence_log_target"
| replace "persistenceLogLevel" "persistence_log_level"
| squote
}}
GLUU_SYNC_SHIB_MANIFESTS: {{ .Values.configmap.gluuSyncShibManifests | quote }}
GLUU_OXTRUST_API_ENABLED: {{ .Values.configmap.gluuOxtrustApiEnabled | quote }}
GLUU_OXTRUST_API_TEST_MODE: {{ .Values.configmap.gluuOxtrustApiTestMode | quote }}
Expand All @@ -100,8 +162,28 @@ data:
GLUU_PASSPORT_ENABLED: {{ .Values.configmap.gluuPassportEnabled | quote }}
GLUU_SCIM_ENABLED: {{ .Values.global.scim.enabled | quote }}
GLUU_SCIM_PROTECTION_MODE: {{ .Values.configmap.gluuScimProtectionMode | quote }}
GLUU_SCIM_APP_LOGGERS: {{ .Values.global.scim.appLoggers
| toJson
| replace "scimLogTarget" "scim_log_target"
| replace "scimLogLevel" "scim_log_level"
| replace "persistenceLogTarget" "persistence_log_target"
| replace "persistenceLogLevel" "persistence_log_level"
| replace "persistenceDurationLogTarget" "persistence_duration_log_target"
| replace "persistenceDurationLogLevel" "persistence_duration_log_level"
| replace "scriptLogTarget" "script_log_target"
| replace "scriptLogLevel" "script_log_level"
| squote
}}
{{- if .Values.global.oxshibboleth.enabled }}
GLUU_SAML_ENABLED: {{ .Values.configmap.gluuSamlEnabled | quote }}
GLUU_OXSHIBBOLETH_APP_LOGGERS: {{ .Values.global.oxshibboleth.appLoggers
| toJson
| replace "fido2LogTarget" "fido2_log_target"
| replace "fido2LogLevel" "fido2_log_level"
| replace "persistenceLogTarget" "persistence_log_target"
| replace "persistenceLogLevel" "persistence_log_level"
| squote
}}
{{- end }}
GLUU_OXD_APPLICATION_CERT_CN: {{ .Values.configmap.gluuOxdApplicationCertCn | quote }}
GLUU_OXD_ADMIN_CERT_CN: {{ .Values.configmap.gluuOxdAdminCertCn | quote }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ image:
# -- Image to use for deploying.
repository: gluufederation/config-init
# -- Image tag to use for deploying.
tag: 4.3.0_01
tag: 4.3.1_01
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Configure any additional volumes that need to be attached to the pod
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ maintainers:
email: [email protected]
url: https://github.com/moabu
icon: https://gluu.org/docs/gluu-server/favicon.ico
appVersion: "4.3.0"
appVersion: "4.3.1"
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# cr-rotate

![version: 1.6.15](https://img.shields.io/badge/Version-1.6.14-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.3.0](https://img.shields.io/badge/AppVersion-4.3.0-informational?style=flat-square)
![Version: 1.6.15](https://img.shields.io/badge/Version-1.6.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.3.1](https://img.shields.io/badge/AppVersion-4.3.1-informational?style=flat-square)

CacheRefreshRotation is a special container to monitor cache refresh on oxTrust containers. This may become depreciated in 5.0.

Expand All @@ -20,7 +20,7 @@ CacheRefreshRotation is a special container to monitor cache refresh on oxTrust

## Requirements

Kubernetes: `>=v1.18.0-0`
Kubernetes: `>=v1.21.0-0`

## Values

Expand All @@ -34,7 +34,7 @@ Kubernetes: `>=v1.18.0-0`
| image.pullPolicy | string | `"IfNotPresent"` | Image pullPolicy to use for deploying. |
| image.pullSecrets | list | `[]` | Image Pull Secrets |
| image.repository | string | `"gluufederation/cr-rotate"` | Image to use for deploying. |
| image.tag | string | `"4.3.0_01"` | Image tag to use for deploying. |
| image.tag | string | `"4.3.1_01"` | Image tag to use for deploying. |
| nameOverride | string | `""` | |
| resources | object | `{"limits":{"cpu":"200m","memory":"200Mi"},"requests":{"cpu":"200m","memory":"200Mi"}}` | Resource specs. |
| resources.limits.cpu | string | `"200m"` | CPU limit. |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ image:
# -- Image to use for deploying.
repository: gluufederation/cr-rotate
# -- Image tag to use for deploying.
tag: 4.3.0_01
tag: 4.3.1_01
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Resource specs.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ maintainers:
email: [email protected]
url: https://github.com/moabu
icon: https://gluu.org/docs/gluu-server/favicon.ico
appVersion: "4.3.0"
appVersion: "4.3.1"
6 changes: 3 additions & 3 deletions pygluu/kubernetes/templates/helm/gluu/charts/fido2/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# fido2

![version: 1.6.15](https://img.shields.io/badge/Version-1.6.14-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.3.0](https://img.shields.io/badge/AppVersion-4.3.0-informational?style=flat-square)
![Version: 1.6.15](https://img.shields.io/badge/Version-1.6.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.3.1](https://img.shields.io/badge/AppVersion-4.3.1-informational?style=flat-square)

FIDO 2.0 (FIDO2) is an open authentication standard that enables leveraging common devices to authenticate to online services in both mobile and desktop environments.

Expand All @@ -20,7 +20,7 @@ FIDO 2.0 (FIDO2) is an open authentication standard that enables leveraging comm

## Requirements

Kubernetes: `>=v1.18.0-0`
Kubernetes: `>=v1.21.0-0`

## Values

Expand All @@ -36,7 +36,7 @@ Kubernetes: `>=v1.18.0-0`
| image.pullPolicy | string | `"IfNotPresent"` | Image pullPolicy to use for deploying. |
| image.pullSecrets | list | `[]` | Image Pull Secrets |
| image.repository | string | `"gluufederation/fido2"` | Image to use for deploying. |
| image.tag | string | `"4.3.0_01"` | Image tag to use for deploying. |
| image.tag | string | `"4.3.1_01"` | Image tag to use for deploying. |
| livenessProbe | object | `{"httpGet":{"path":"/fido2/restv1/fido2/configuration","port":"http-fido2"},"initialDelaySeconds":25,"periodSeconds":25,"timeoutSeconds":5}` | Configure the liveness healthcheck for the fido2 if needed. |
| livenessProbe.httpGet | object | `{"path":"/fido2/restv1/fido2/configuration","port":"http-fido2"}` | http liveness probe endpoint |
| readinessProbe | object | `{"httpGet":{"path":"/fido2/restv1/fido2/configuration","port":"http-fido2"},"initialDelaySeconds":30,"periodSeconds":30,"timeoutSeconds":5}` | Configure the readiness healthcheck for the fido2 if needed. |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ image:
# -- Image to use for deploying.
repository: gluufederation/fido2
# -- Image tag to use for deploying.
tag: 4.3.0_01
tag: 4.3.1_01
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Service replica number.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ maintainers:
email: [email protected]
url: https://github.com/moabu
icon: https://gluu.org/docs/gluu-server/favicon.ico
appVersion: "4.3.0"
appVersion: "4.3.1"
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# gluu-alb-ingress

![version: 1.6.15](https://img.shields.io/badge/Version-1.6.14-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.3.0](https://img.shields.io/badge/AppVersion-4.3.0-informational?style=flat-square)
![Version: 1.6.15](https://img.shields.io/badge/Version-1.6.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.3.1](https://img.shields.io/badge/AppVersion-4.3.1-informational?style=flat-square)

Nginx ingress definitions chart

Expand All @@ -20,7 +20,7 @@ Nginx ingress definitions chart

## Requirements

Kubernetes: `>=v1.18.0-0`
Kubernetes: `>=v1.21.0-0`

## Values

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ maintainers:
email: [email protected]
url: https://github.com/moabu
icon: https://gluu.org/docs/gluu-server/favicon.ico
appVersion: "4.3.0"
appVersion: "4.3.1"
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# gluu-istio-ingress

![version: 1.6.15](https://img.shields.io/badge/Version-1.6.14-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.3.0](https://img.shields.io/badge/AppVersion-4.3.0-informational?style=flat-square)
![Version: 1.6.15](https://img.shields.io/badge/Version-1.6.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.3.1](https://img.shields.io/badge/AppVersion-4.3.1-informational?style=flat-square)

Istio Gateway

Expand All @@ -19,7 +19,7 @@ Istio Gateway

## Requirements

Kubernetes: `>=v1.18.0-0`
Kubernetes: `>=v1.21.0-0`

----------------------------------------------
Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ maintainers:
email: [email protected]
url: https://github.com/moabu
icon: https://gluu.org/docs/gluu-server/favicon.ico
appVersion: "4.3.0"
appVersion: "4.3.1"
Loading