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

EOEPCA · Jul 6, 2021 · 2eea9bd · 2eea9bd
1 parent d03e377
commit 2eea9bd
Show file tree

Hide file tree

Showing 49 changed files with 509 additions and 149 deletions.
diff --git a/charts/cheese/Chart.yaml b/charts/cheese/Chart.yaml
@@ -15,9 +15,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: 0.2.8
+version: 0.2.9
 
 # 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: 0.2.8
+appVersion: 0.2.9
diff --git a/charts/cheese/templates/cheese-ingress.yaml b/charts/cheese/templates/cheese-ingress.yaml
@@ -4,6 +4,9 @@ metadata:
   name: cheddar
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt
+    {{- if .Values.elbIp }}
+    kubernetes.io/elb.ip: {{ .Values.elbIp }}
+    {{- end }}
 spec:
   tls:
     - hosts:
@@ -24,6 +27,9 @@ metadata:
   name: stilton
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt
+    {{- if .Values.elbIp }}
+    kubernetes.io/elb.ip: {{ .Values.elbIp }}
+    {{- end }}
 spec:
   tls:
     - hosts:
@@ -44,6 +50,9 @@ metadata:
   name: wensleydale
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt
+    {{- if .Values.elbIp }}
+    kubernetes.io/elb.ip: {{ .Values.elbIp }}
+    {{- end }}
 spec:
   tls:
     - hosts:

diff --git a/charts/cheese/templates/cheese.yml b/charts/cheese/templates/cheese.yml
@@ -71,6 +71,9 @@ spec:
     targetPort: 80
   selector:
     app: cheddar
+  {{- if .Values.elbIp }}
+  type: NodePort
+  {{- end }}
 ---
 apiVersion: v1
 kind: Service
@@ -85,6 +88,9 @@ spec:
     targetPort: 80
   selector:
     app: stilton
+  {{- if .Values.elbIp }}
+  type: NodePort
+  {{- end }}
 ---
 apiVersion: v1
 kind: Service
@@ -99,3 +105,6 @@ spec:
     targetPort: 80
   selector:
     app: wensleydale
+  {{- if .Values.elbIp }}
+  type: NodePort
+  {{- end }}
diff --git a/charts/jupyter/Chart.yaml b/charts/jupyter/Chart.yaml
@@ -15,7 +15,7 @@ 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: 0.1.9
+version: 0.1.11
 
 # 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

diff --git a/charts/jupyter/templates/ingress.yaml b/charts/jupyter/templates/ingress.yaml
@@ -4,6 +4,9 @@ metadata:
   name: jupyter
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt
+    {{- if .Values.elbIp }}
+    kubernetes.io/elb.ip: {{ .Values.elbIp }}
+    {{- end }}
 spec:
   tls:
     - hosts:

diff --git a/charts/login-service/Chart.yaml b/charts/login-service/Chart.yaml
@@ -16,9 +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: 0.9.0
+version: 0.9.9
 
 # 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.0-RC
+appVersion: v1.0.1-RC
diff --git a/charts/login-service/charts/config/templates/configmaps.yaml b/charts/login-service/charts/config/templates/configmaps.yaml
@@ -34,7 +34,8 @@ data:
       "org_name": {{ .Values.orgName | quote }},
       "gluu_config_adapter": {{.Values.gluuConfAdapter | quote }},
       "ldap_type": {{.Values.ldapType | quote }},
-      "redis_pw": {{.Values.redisPass | quote }}
+      "redis_pw": {{.Values.redisPass | quote }},
+      "pdp_ep": {{.Values.pdpEp | quote }}
     }
 
 ---

diff --git a/charts/login-service/charts/config/templates/load-init-config.yml b/charts/login-service/charts/config/templates/load-init-config.yml
@@ -22,6 +22,12 @@ spec:
       containers:
       - name: {{ template "login-service.name" . }}-load
         image: gluufederation/config-init:4.1.1_02
+        resources:
+          requests:
+            memory: {{ .Values.requests.memory }}
+            cpu: {{ .Values.requests.cpu }}
+          # limits:
+          #   memory: {{ .Values.limits.memory }}
         volumeMounts:
           - mountPath: /opt/config-init/db/
             subPath: config-init/db

diff --git a/charts/login-service/charts/config/values.yaml b/charts/login-service/charts/config/values.yaml
@@ -14,8 +14,8 @@ ldapPass: admin_Abcd1234#
 email: [email protected]
 orgName: Deimos Space S.L.U.
 gluuConfAdapter: kubernetes
-ldapType: opendj
 redisPass: aaaa
+pdpEp: /pdp
 
 nameOverride: ""
 fullNameOverride: ""
@@ -24,6 +24,12 @@ fullNameOverride: ""
 volumeClaim:
   name: um-login-service-config-pvc
 
+limits:
+  memory: 600Mi
+requests:
+  cpu: 100m
+  memory: 500Mi
+
 persistence:
   size: 1Gi
   accessModes: ReadWriteOnce

diff --git a/charts/login-service/charts/nginx/Chart.yaml b/charts/login-service/charts/nginx/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v1
 appVersion: 1
 description: nginx chart
 name: nginx
-version: 1.1.5
+version: 1.1.2
 maintainers:
 - name: eoepca
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.1
+version: 1.1.2
diff --git a/charts/login-service/charts/opendj/scripts/77-customAttributes.ldif b/charts/login-service/charts/opendj/scripts/77-customAttributes.ldif
@@ -27,8 +27,14 @@ attributeTypes: ( 1.3.6.1.4.1.48710.1.3.1403 NAME 'TermsConditions'
   SUBSTR caseIgnoreSubstringsMatch 
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 
   X-ORIGIN 'Gluu custom attribute' )
+attributeTypes: ( 1.3.6.1.4.1.48710.1.3.1404 NAME 'StorageDetails'
+  DESC 'Custom Attribute' 
+  EQUALITY caseIgnoreMatch 
+  SUBSTR caseIgnoreSubstringsMatch 
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 
+  X-ORIGIN 'Gluu custom attribute' )
 objectClasses: ( 1.3.6.1.4.1.48710.1.4.101 NAME 'gluuCustomPerson'
   SUP ( top )
   AUXILIARY
-  MAY ( TermsConditions $ Licenses $ apiKeys $ isOperator $ telephoneNumber $ mobile $ carLicense $ facsimileTelephoneNumber $ departmentNumber $ employeeType $ cn $ st $ manager $ street $ postOfficeBox $ employeeNumber $ preferredDeliveryMethod $ roomNumber $ secretary $ homePostalAddress $ l $ postalCode $ description $ title )
+  MAY ( StorageDetails $ TermsConditions $ Licenses $ apiKeys $ isOperator $ telephoneNumber $ mobile $ carLicense $ facsimileTelephoneNumber $ departmentNumber $ employeeType $ cn $ st $ manager $ street $ postOfficeBox $ employeeNumber $ preferredDeliveryMethod $ roomNumber $ secretary $ homePostalAddress $ l $ postalCode $ description $ title )
   X-ORIGIN 'Gluu - Custom persom objectclass' )
diff --git a/charts/login-service/charts/opendj/templates/configmap.yaml b/charts/login-service/charts/opendj/templates/configmap.yaml
@@ -15,6 +15,7 @@ data:
   GLUU_CACHE_TYPE: {{ .Values.gluuRedisCacheType | quote }}
   GLUU_REDIS_URL: {{ .Values.gluuRedisUrl | quote }}
   GLUU_REDIS_TYPE: {{ .Values.gluuRedisType | quote }}
+  PDP_EP: {{ .Values.persistence.pdpEp | quote}}
   {{- else }}
   GLUU_CACHE_TYPE: {{ .Values.gluuCacheType | quote }}
   {{- end }}

diff --git a/charts/login-service/charts/opendj/templates/persistence.yml b/charts/login-service/charts/opendj/templates/persistence.yml
@@ -32,4 +32,7 @@ spec:
           value: {{ .Values.persistence.clientIDv }}
         - name: {{ .Values.persistence.clientSecret }}
           value: {{ .Values.persistence.clientSecretv }}
-
+        - name: {{ .Values.persistence.coihClientID }}
+          value: '{{ .Values.persistence.coihClientIDv }}'
+        - name: {{ .Values.persistence.coihClientSecret }}
+          value: {{ .Values.persistence.coihClientSecretv }}
diff --git a/charts/login-service/charts/opendj/templates/statefulset.yaml b/charts/login-service/charts/opendj/templates/statefulset.yaml
@@ -24,6 +24,12 @@ spec:
       - name: {{ template "login-service.fullname" . }}-init-container
         imagePullPolicy: {{ .Values.imagePullPolicy }}
         image: {{ .Values.image }}
+        resources:
+          requests:
+            memory: {{ .Values.requests.memory }}
+            cpu: {{ .Values.requests.cpu }}
+        #   limits:
+        #     memory: {{ .Values.limits.memory }}
         lifecycle:
           postStart:
             exec:
@@ -55,14 +61,14 @@ spec:
           - mountPath: /flag
             subPath: opendj/flag
             name: vol-userman
-        readinessProbe:
-          tcpSocket: 
-            port: {{ .Values.tcpSocket.port }}
-          initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-          periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-        livenessProbe:
-          tcpSocket:
-            port: {{ .Values.tcpSocket.port }}
-          initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
-          periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
+        # readinessProbe:
+        #   tcpSocket: 
+        #     port: {{ .Values.tcpSocket.port }}
+        #   initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+        #   periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+        # livenessProbe:
+        #   tcpSocket:
+        #     port: {{ .Values.tcpSocket.port }}
+        #   initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
+        #   periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
 
diff --git a/charts/login-service/charts/opendj/values.yaml b/charts/login-service/charts/opendj/values.yaml
@@ -38,7 +38,7 @@ persistence:
   statefulSetReplicas: 1
   imagePullPolicy: Always
   restartPolicy: Never
-  image: eoepca/um-login-persistence:v1.0-RC
+  image: eoepca/um-login-persistence:v1.0.1-RC
   configAdapter: GLUU_CONFIG_ADAPTER
   adapter: "kubernetes"
   secretAdapter: GLUU_SECRET_ADAPTER
@@ -56,16 +56,27 @@ persistence:
   clientIDv: "59f1fed27153f631bc08"
   clientSecret: LP_CLIENT_SECRET
   clientSecretv: "640baffac0948454c48de2505726f53d11adc8a6"
+  pdpEp: /pdp
+#COIH Provider values needs to be configured after deployment for security issues
+  coihClientID: COIH_CLIENT_ID
+  coihClientIDv: ""
+  coihClientSecret: COIH_CLIENT_SECRET
+  coihClientSecretv: ""
 #container specific values declared here
 tcpSocket:
   port: 1636
 readinessProbe:
-  initialDelaySeconds: 90
+  initialDelaySeconds: 150
   periodSeconds: 90
 livenessProbe:
-  initialDelaySeconds: 90
+  initialDelaySeconds: 150
   periodSeconds: 90
 
+limits:
+  memory: 600Mi
+requests:
+  cpu: 700m
+  memory: 500Mi
 #servicePorts values used in StatefulSet container
 ports:
   ldaps:

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.1
+version: 1.1.2
diff --git a/charts/login-service/charts/oxauth/templates/oxauth-deployment.yml b/charts/login-service/charts/oxauth/templates/oxauth-deployment.yml
@@ -21,6 +21,7 @@ spec:
         resources:
           requests:
             memory: {{ .Values.requests.memory }}
+            cpu: {{ .Values.requests.cpu }}
           # limits:
           #   memory: {{ .Values.limits.memory }} 
         ports:

diff --git a/charts/login-service/charts/oxauth/values.yaml b/charts/login-service/charts/oxauth/values.yaml
@@ -15,9 +15,10 @@ gluuMaxRamFraction: 1
 
 #Resources for the deployment
 requests:
-  memory: 128Mi
+  cpu: 200m
+  memory: 900Mi
 limits:
-  memory: 128Mi
+  memory: 1.2Gi
 persistence:
   size: 100M
   pvcSize: 3Gi
@@ -28,7 +29,7 @@ persistence:
   statefulSetReplicas: 1
   imagePullPolicy: Always
   restartPolicy: Never
-  image: eoepca/um-login-persistence:v1.0-RC
+  image: eoepca/um-login-persistence:v1.0.1-RC
   configAdapter: GLUU_CONFIG_ADAPTER
   adapter: "kubernetes"
   secretAdapter: GLUU_SECRET_ADAPTER
@@ -42,10 +43,6 @@ persistence:
   oxtrustConfv: "'false'"
   cacheType: GLUU_CACHE_TYPE
   cacheTypev: "NATIVE_PERSISTENCE"
-  clientID: LP_CLIENT_ID
-  clientIDv: "59f1fed27153f631bc08"
-  clientSecret: LP_CLIENT_SECRET
-  clientSecretv: "640baffac0948454c48de2505726f53d11adc8a6"
 #hostAliases
 nginxIp: 10.0.2.15
 
@@ -55,13 +52,13 @@ ports:
 
 # livenessProbe
 livenessProbe:
-  initialDelaySeconds: 600
-  periodSeconds: 90
+  initialDelaySeconds: 100
+  periodSeconds: 60
 
 # readinessProbe
 readinessProbe:
-  initialDelaySeconds: 600
-  periodSeconds: 90
+  initialDelaySeconds: 100
+  periodSeconds: 60
 
 # VolumeClaim values
 volumeClaim:

diff --git a/charts/login-service/charts/oxpassport/Chart.yaml b/charts/login-service/charts/oxpassport/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v1
 appVersion: 1
 description: A Helm chart for the Login Service
 name: oxpassport
-version: 1.1.0
+version: 1.1.2
 maintainers:
 - name: eoepca
diff --git a/charts/login-service/charts/oxpassport/templates/deployment.yaml b/charts/login-service/charts/oxpassport/templates/deployment.yaml
@@ -25,7 +25,7 @@ spec:
         - {{ .Values.global.domain }}
       containers:
         - name:  {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: oxpassport
@@ -34,18 +34,9 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ template "oxpassport.fullname" . }}-cm
-
           resources:
-{{ toYaml .Values.resources | indent 12 }}
-    {{- with .Values.nodeSelector }}
-      nodeSelector:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.affinity }}
-      affinity:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
-    {{- end }}
+            requests:
+              memory: {{ .Values.requests.memory }}
+              cpu: {{ .Values.requests.cpu }}
+            # limits:
+            #   memory: {{ .Values.limits.memory }}