Commit triggered by a change on the main branch of helm-charts-dev

EOEPCA · Jul 21, 2023 · 536b3db · 536b3db
1 parent ee8e070
commit 536b3db
Show file tree

Hide file tree

Showing 18 changed files with 44 additions and 42 deletions.
diff --git a/charts/license-manager/values.yaml b/charts/license-manager/values.yaml
@@ -47,6 +47,6 @@ ingress:
   hosts:
     - demoexample.gluu.org
   tls: 
-   - secretName: tls-certificate
+   - secretName: gluu-tls-certificate
      hosts:
-       - demoexample.gluu.org
+       - demoexample.gluu.org
diff --git a/charts/login-service/Chart.yaml b/charts/login-service/Chart.yaml
@@ -16,10 +16,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.2.1
+version: 1.2.8
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using. 
-appVersion: "v1.1.2"
-
+appVersion: "v1.1.4"
diff --git a/charts/login-service/README.md b/charts/login-service/README.md
@@ -85,7 +85,7 @@ The global section will apply the values overwriting the defined in the global s
 
 ## Config
 
-For the Config Job the main configuration will focus on certificate signatures and base LDAP customization. The image used is from gluuFederation `gluufederation/config-init:4.1.1_02`.
+For the Config Job the main configuration will focus on certificate signatures and base LDAP customization. The image used is from eoepca `eoepca/config-init:4.1.1_02`.
 This will be the first instance to complete, the rest of the deployments will be waiting for the config-job to finish ingesting data in the volume and then consume it.
                                                                                                                                                                      |
 | Parameter                        | Description                                                                                           | Default                          |
@@ -121,7 +121,7 @@ This Job has its own resource requests specified in the limits and requests same
 
 ## OpenDJ
 
-OpenDJ StatefulSet will set up the LDAP backend of the Login Service and wait for the Persistence Job to ingest the data into the database. The image used is from GluuFederation `gluufederation/wrends:4.1.1_01`. The expected behavior is to start listening in some ports and after the persistence is finish complete the installation by starting the LDAP service.
+OpenDJ StatefulSet will set up the LDAP backend of the Login Service and wait for the Persistence Job to ingest the data into the database. The image used is from eoepca `eoepca/wrends:4.1.1_01`. The expected behavior is to start listening in some ports and after the persistence is finish complete the installation by starting the LDAP service.
 The basic configuration can be done in the values of the parent chart, but for more specific customization the child chart has its own values.
 
 ### Parent
@@ -208,7 +208,7 @@ COIH Provider values needs to be configured after deployment for security issues
 
 ### Parent
 
-The OxAuth deployment will have all configuration derived from the LDAP service, by default the image used belongs to Gluu organization under the name and tag `gluufederation/oxauth:4.1.1_03`. The generic values for the parent will contain:
+The OxAuth deployment will have all configuration derived from the LDAP service, by default the image used belongs to Gluu organization under the name and tag `eoepca/oxauth:4.1.1_03`. The generic values for the parent will contain:
 
 | Parameter                        | Description                                                                                            | Default                          |
 | -------------------------------- | ------------------------------------------------------------------------------------------------------ | -------------------------------- |
@@ -247,7 +247,7 @@ The base configuration for jetty support needs some mount path for the volume to
 
 ### Parent
 
-The OxTrust deployment will have all configuration derived from the LDAP service same as OxAuth, by default the image used belongs to Gluu organization under the name and tag `gluufederation/oxtrust:4.1.1_02`. The generic values for the parent will contain:
+The OxTrust deployment will have all configuration derived from the LDAP service same as OxAuth, by default the image used belongs to Gluu organization under the name and tag `eoepca/oxtrust:4.1.1_02`. The generic values for the parent will contain:
 
 | Parameter                        | Description                                                                                            | Default                          |
 | -------------------------------- | ------------------------------------------------------------------------------------------------------ | -------------------------------- |
@@ -286,7 +286,7 @@ The base configuration for jetty support needs some mount path for the volume to
 
 ## Nginx
 
-The Nginx controller can be used as Ingress for load balancing, currently will use the tls-certificates and specify the domain name for the Login Service. It uses an external image to manage tls with Gluu under the name and tag repository `kungus/gluu-tls-initializer:stable`
+The Nginx controller can be used as Ingress for load balancing, currently will use the gluu-tls-certificates and specify the domain name for the Login Service. It uses an external image to manage tls with Gluu under the name and tag repository `kungus/gluu-tls-initializer:stable`
 
   ```yaml
   nginx:
@@ -298,7 +298,7 @@ The Nginx controller can be used as Ingress for load balancing, currently will u
       hosts:
         - myplatform.eoepca.org
       tls: 
-      - secretName: tls-certificate
+      - secretName: gluu-tls-certificate
         hosts:
           - myplatform.eoepca.org
     resources: {}
@@ -317,6 +317,4 @@ The Nginx controller can be used as Ingress for load balancing, currently will u
 
 ## Liveness and Readiness
 
-The Login Service instance has liveness and readiness checks specified in each sub-chart, it may need to be specified in some specifics services that takes some time to be ready such as OxAuth, OxTrust and OpenDJ.
-
-
+The Login Service instance has liveness and readiness checks specified in each sub-chart, it may need to be specified in some specifics services that takes some time to be ready such as OxAuth, OxTrust and OpenDJ.
diff --git a/charts/login-service/charts/config/Chart.yaml b/charts/login-service/charts/config/Chart.yaml
@@ -4,4 +4,4 @@ maintainers:
 - name: eoepca
 description: A Helm chart for Gluu server
 name: config
-version: 1.1.4
+version: 1.1.5
diff --git a/charts/login-service/charts/config/templates/configmaps.yaml b/charts/login-service/charts/config/templates/configmaps.yaml
@@ -52,7 +52,7 @@ apiVersion: v1
 data:
   tls_generator.py: "from pprint import pprint\nfrom kubernetes import config, client\nimport
     logging\n\n#use the serviceAccount k8s gives to pods\nconfig.load_incluster_config()
-    \nv1 = client.CoreV1Api()\n\n#global vars\nname = \"tls-certificate\"\nnamespace
+    \nv1 = client.CoreV1Api()\n\n#global vars\nname = \"gluu-tls-certificate\"\nnamespace
     = \"{{ .Values.global.namespace }}\"\n\n# check if gluu secret exists\ndef get_certs():\n    if ( v1.read_namespaced_secret(
     'gluu', namespace ) ):\n        ssl_cert = v1.read_namespaced_secret( 'gluu',
     namespace ).data['ssl_cert']\n        ssl_key = v1.read_namespaced_secret( \"gluu\",
@@ -68,10 +68,9 @@ data:
     = client.V1Secret(api_version, data , kind, metadata, \n                type='kubernetes.io/tls')\n
     \           api_response = v1.create_namespaced_secret(namespace, body )\n            pprint(api_response)\n
     \       else:\n            logging.exception(e)\n        return False\n    else:\n
-    \       print('tls-certificate already exists as /{}'. format(\n            secret\n
+    \       print('gluu-tls-certificate already exists as /{}'. format(\n            secret\n
     \       ))\n\n        \ndef main():\n    cert, key = get_certs()\n    create_tls(cert,
     key)\n\nif __name__ == \"__main__\":\n    main()"
 kind: ConfigMap
 metadata:
-  name: {{ include "config.fullname" . }}-tls-script
-
+  name: {{ include "config.fullname" . }}-tls-script
diff --git a/charts/login-service/charts/config/tls_generator.py b/charts/login-service/charts/config/tls_generator.py
@@ -7,7 +7,7 @@
 v1 = client.CoreV1Api()
 
 #global vars
-name = "tls-certificate"
+name = "gluu-tls-certificate"
 namespace = "{{ .Values.global.namespace }}"
 
 # check if gluu secret exists
@@ -48,7 +48,7 @@ def create_tls(cert, key):
             logging.exception(e)
         return False
     else:
-        print('tls-certificate already exists as /{}'. format(
+        print('gluu-tls-certificate already exists as /{}'. format(
             secret
         ))
 

diff --git a/charts/login-service/charts/nginx/values.yaml b/charts/login-service/charts/nginx/values.yaml
@@ -25,7 +25,7 @@ ingress:
   hosts:
     - demoexample.gluu.org
   tls: 
-   - secretName: tls-certificate
+   - secretName: gluu-tls-certificate
      hosts:
        - demoexample.gluu.org
 
@@ -53,5 +53,4 @@ nodeSelector: {}
 
 tolerations: []
 
-affinity: {}
-
+affinity: {}
diff --git a/charts/login-service/charts/opendj/Chart.yaml b/charts/login-service/charts/opendj/Chart.yaml
@@ -4,4 +4,4 @@ maintainers:
 - name: eoepca
 description: A Helm chart for Gluu server
 name: opendj
-version: 1.1.7
+version: 1.1.8
diff --git a/charts/login-service/charts/opendj/templates/persistence.yml b/charts/login-service/charts/opendj/templates/persistence.yml
@@ -44,6 +44,8 @@ spec:
           value: {{ .Values.global.namespace }}
         - name: {{ .Values.persistence.gluuSecretNamespace }}
           value: {{ .Values.global.namespace }}
+        - name: {{ .Values.persistence.umaResourceLifetime }}
+          value: {{ .Values.persistence.umaResourceLifetimev | quote }}
       {{- if .Values.pullSecret }}
       imagePullSecrets:
       - name: {{ .Values.pullSecret }}

diff --git a/charts/login-service/charts/opendj/values.yaml b/charts/login-service/charts/opendj/values.yaml
@@ -67,6 +67,8 @@ persistence:
   coihClientIDv: ""
   coihClientSecret: COIH_CLIENT_SECRET
   coihClientSecretv: ""
+  umaResourceLifetime: UMA_RESOURCE_LIFETIME
+  umaResourceLifetimev: 2147483647
 #container specific values declared here
 tcpSocket:
   port: 1636
@@ -166,4 +168,4 @@ opendj-ldif:
 opendj-logs:
   hostPath:
     path: "/data/opendj/logs"
-    type: DirectoryOrCreate
+    type: DirectoryOrCreate
diff --git a/charts/login-service/charts/oxauth/Chart.yaml b/charts/login-service/charts/oxauth/Chart.yaml
@@ -4,4 +4,4 @@ maintainers:
 - name: eoepca
 description: A Helm chart for Kubernetes
 name: oxauth
-version: 1.1.14
+version: 1.1.15
diff --git a/charts/login-service/charts/oxauth/templates/oxauth-deployment.yml b/charts/login-service/charts/oxauth/templates/oxauth-deployment.yml
@@ -17,7 +17,7 @@ spec:
       containers:
       - name: {{ template "login-service.fullname" . }}
         imagePullPolicy: {{ .Values.global.images.oxauth.pullPolicy }}
-        image: gluufederation/{{ .Values.global.images.oxauth.repository }}:{{ .Values.global.images.oxauth.tag }}
+        image: eoepca/{{ .Values.global.images.oxauth.repository }}:{{ .Values.global.images.oxauth.tag }}
         resources:
           {{- toYaml .Values.resources | nindent 10 }}
         lifecycle:

diff --git a/charts/login-service/charts/oxpassport/values.yaml b/charts/login-service/charts/oxpassport/values.yaml
@@ -12,7 +12,7 @@ replicaCount: 1
 
 # image:
 #   repository: eoepca/um-login-passport
-#   # repository: gluufederation/oxpassport
+#   # repository: eoepca/oxpassport
 #   pullPolicy: IfNotPresent
 #   tag: ""
 #   # tag: 4.0.1_03
@@ -42,4 +42,4 @@ nodeSelector: {}
 
 tolerations: []
 
-affinity: {}
+affinity: {}
diff --git a/charts/login-service/charts/oxtrust/Chart.yaml b/charts/login-service/charts/oxtrust/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v1
 appVersion: 1
 description: An oxtrust Helm chart for Kubernetes
 name: oxtrust
-version: 1.1.10
+version: 1.1.11
 maintainers:
-- name: eoepca
+- name: eoepca
diff --git a/charts/login-service/charts/oxtrust/templates/oxtrust-statefulset.yml b/charts/login-service/charts/oxtrust/templates/oxtrust-statefulset.yml
@@ -18,7 +18,7 @@ spec:
       containers:
       - name: {{ include "oxtrust.name" . }}
         imagePullPolicy: {{ .Values.global.images.oxtrust.pullPolicy }}
-        image: gluufederation/{{ .Values.global.images.oxtrust.repository }}:{{ .Values.global.images.oxtrust.tag }}
+        image: eoepca/{{ .Values.global.images.oxtrust.repository }}:{{ .Values.global.images.oxtrust.tag }}
         resources:
           {{- toYaml .Values.resources | nindent 10 }}
         lifecycle:
@@ -71,4 +71,4 @@ spec:
       {{- if .Values.pullSecret }}
       imagePullSecrets:
       - name: {{ .Values.pullSecret }}
-      {{- end }}
+      {{- end }}
diff --git a/charts/login-service/values.yaml b/charts/login-service/values.yaml
@@ -19,10 +19,10 @@ global:
   fsType: ext4
   images:
     config:
-      repository: gluufederation/config-init
+      repository: eoepca/config-init
       tag: 4.1.1_02
     opendj:
-      repository: gluufederation/wrends
+      repository: eoepca/wrends
       pullPolicy: Always
       tag: 4.1.1_01
     passport:
@@ -112,6 +112,9 @@ opendj:
     #client credentials for the coih provider
     coihClientIDv: ""
     coihClientSecretv: ""
+    #Lifetime of UMA resources, maximum value: 2147483647
+    umaResourceLifetime: UMA_RESOURCE_LIFETIME
+    umaResourceLifetimev: 2147483647
   readinessProbe:
     initialDelaySeconds: 150
     periodSeconds: 90
@@ -184,7 +187,7 @@ nginx:
     hosts:
       - demoexample.gluu.org
     tls: 
-    - secretName: tls-certificate
+    - secretName: gluu-tls-certificate
       hosts:
         - demoexample.gluu.org
   resources: {}
@@ -208,4 +211,4 @@ nginx:
   tolerations: []
   affinity: {}
   tags:
-    redis: false
+    redis: false
diff --git a/charts/pdp-engine/values.yaml b/charts/pdp-engine/values.yaml
@@ -39,7 +39,7 @@ requests:
   dbMemory: 70Mi
 
 image:
-  repository: eoepca/um-pdp-engine
+  repository: ghcr.io/eoepca/um-pdp-engine
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
@@ -54,4 +54,4 @@ volumeClaim:
   name: um-pdp-engine-pvc
   create: true
 
-context: generic
+context: generic
diff --git a/charts/pep-engine/templates/ingress.yaml b/charts/pep-engine/templates/ingress.yaml
@@ -8,7 +8,7 @@ apiVersion: extensions/v1beta1
 {{- end }}
 kind: Ingress
 metadata:
-  name: {{ .Values.global.context }}-pep
+  name: pep-engine
   annotations:
     {{- if .Values.global.certManager.clusterIssuer }}
     cert-manager.io/cluster-issuer: {{ .Values.global.certManager.clusterIssuer }}
@@ -41,7 +41,7 @@ spec:
   tls:
     - hosts:
         - {{ printf "%s.%s" .Values.global.context .Values.global.domain | quote }}
-      secretName: {{ printf "%s-pep-tls" .Values.global.context | quote }}
+      secretName: pep-tls-certificate
   {{- end }}
 ---
 {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}