fix: update Kubernetes version (#389)

* fix: update kubeVersion requirement With the introduction of `.spec.ttlSecondsAfterFinished` in Job resources. Hooks for jobs are no longer required . * chore: update helm version
GluuFederation · Nov 29, 2021 · ca1e64c · ca1e64c
1 parent 0266672
commit ca1e64c
Show file tree

Hide file tree

Showing 52 changed files with 116 additions and 154 deletions.
diff --git a/pygluu/kubernetes/templates/helm/gluu/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/Chart.yaml
@@ -2,7 +2,7 @@
 # https://www.apache.org/licenses/LICENSE-2.0
 apiVersion: v2
 appVersion: "4.3.0"
-kubeVersion: ">=v1.18.0-0"
+kubeVersion: ">=v1.21.0-0"
 annotations:
   artifacthub.io/changes: |
     - Gluu 4.3.0 official chart release
@@ -46,73 +46,73 @@ maintainers:
   email: [email protected]
 description: Gluu Access and Identity Mangement
 name: gluu
-version: 1.6.14
+version: 1.6.15
 
 dependencies:
     - name: config
       condition: global.config.enabled
-      version: 1.6.14
+      version: 1.6.15
 
     - name: opendj
       condition: global.opendj.enabled
-      version: 1.6.14
+      version: 1.6.15
 
     - name: jackrabbit
       condition: global.jackrabbit.enabled
-      version: 1.6.14
+      version: 1.6.15
 
     - name: oxauth
       condition: global.oxauth.enabled
-      version: 1.6.14
+      version: 1.6.15
 
     - name: fido2
       condition: global.fido2.enabled
-      version: 1.6.14
+      version: 1.6.15
 
     - name: scim
       condition: global.scim.enabled
-      version: 1.6.14
+      version: 1.6.15
 
     - name: oxtrust
       condition: global.oxtrust.enabled
-      version: 1.6.14
+      version: 1.6.15
 
     - name: nginx-ingress
       condition: global.nginx-ingress.enabled
-      version: 1.6.14
+      version: 1.6.15
 
     - name: oxshibboleth
       condition: global.oxshibboleth.enabled
-      version: 1.6.14
+      version: 1.6.15
 
     - name: oxpassport
-      version: 1.6.14
+      version: 1.6.15
       condition: config.configmap.gluuPassportEnabled
 
     - name: casa
-      version: 1.6.14
+      version: 1.6.15
       condition: config.configmap.gluuCasaEnabled
 
     - name: oxauth-key-rotation
       condition: global.oxauth-key-rotation.enabled
-      version: 1.6.14
+      version: 1.6.15
 
     - name: cr-rotate
-      version: 1.6.14
+      version: 1.6.15
       condition: global.cr-rotate.enabled
 
     - name: oxd-server
       condition: global.oxd-server.enabled
-      version: 1.6.14
+      version: 1.6.15
 
     - name: persistence
       condition: global.persistence.enabled
-      version: 1.6.14
+      version: 1.6.15
 
     - name: gluu-istio-ingress
       condition: global.istio.ingress
-      version: 1.6.14
+      version: 1.6.15
 
     - name: gluu-alb-ingress
       condition: global.alb.ingress
-      version: 1.6.14
+      version: 1.6.15
diff --git a/pygluu/kubernetes/templates/helm/gluu/README.md b/pygluu/kubernetes/templates/helm/gluu/README.md
@@ -1,6 +1,6 @@
 # gluu
 
-![Version: 1.6.14](https://img.shields.io/badge/Version-1.6.14-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.14-informational?style=flat-square) ![AppVersion: 4.3.0](https://img.shields.io/badge/AppVersion-4.3.0-informational?style=flat-square)
 
 Gluu Access and Identity Mangement
 

diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/casa/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/casa/Chart.yaml
@@ -2,8 +2,8 @@
 # https://www.apache.org/licenses/LICENSE-2.0
 apiVersion: v2
 name: casa
-version: 1.6.14
-kubeVersion: ">=v1.18.0-0"
+version: 1.6.15
+kubeVersion: ">=v1.21.0-0"
 description: 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.
 type: application
 keywords:

diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/casa/README.md b/pygluu/kubernetes/templates/helm/gluu/charts/casa/README.md
@@ -1,6 +1,6 @@
 # casa
 
-![Version: 1.6.14](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.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)
 
 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.
 

diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/config/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/config/Chart.yaml
@@ -2,8 +2,8 @@
 # https://www.apache.org/licenses/LICENSE-2.0
 apiVersion: v2
 name: config
-version: 1.6.14
-kubeVersion: ">=v1.18.0-0"
+version: 1.6.15
+kubeVersion: ">=v1.21.0-0"
 description: Configuration parameters for setup and initial configuration secret and config layers used by Gluu services.
 type: application
 keywords:

diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/config/README.md b/pygluu/kubernetes/templates/helm/gluu/charts/config/README.md
@@ -1,6 +1,6 @@
 # config
 
-![Version: 1.6.14](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.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)
 
 Configuration parameters for setup and initial configuration secret and config layers used by Gluu services.
 

diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/clusterrolebinding.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/clusterrolebinding.yaml
@@ -4,10 +4,10 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: {{ .Release.Namespace }}-cluster-admin-binding
+{{- if .Values.additionalAnnotations }}
   annotations:
-    "helm.sh/hook": pre-install,pre-upgrade
-    "helm.sh/hook-weight": "0"
-    "helm.sh/hook-delete-policy": before-hook-creation
+{{ toYaml .Values.additionalAnnotations | indent 4 }}
+{{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -27,6 +27,10 @@ metadata:
   labels:
     app: {{ template "gluu.name" . }}-load
   name: {{ .Release.Namespace }}-rolebinding
+{{- if .Values.additionalAnnotations }}
+  annotations:
+{{ toYaml .Values.additionalAnnotations | indent 4 }}
+{{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/configmaps.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/configmaps.yaml
@@ -10,11 +10,8 @@ metadata:
 {{- if .Values.additionalLabels }}
 {{ toYaml .Values.additionalLabels | indent 4 }}
 {{- end }}
-  annotations:
-    "helm.sh/hook": pre-install,pre-upgrade
-    "helm.sh/hook-weight": "1"
-    "helm.sh/hook-delete-policy": before-hook-creation
 {{- if .Values.additionalAnnotations }}
+  annotations:
 {{ toYaml .Values.additionalAnnotations | indent 4 }}
 {{- end }}
 data:
@@ -226,10 +223,10 @@ kind: ConfigMap
 metadata:
   name: {{ include "config.fullname" . }}-tls-script
   namespace: {{ .Release.Namespace }}
+{{- if .Values.additionalAnnotations }}
   annotations:
-    "helm.sh/hook": pre-install,pre-upgrade
-    "helm.sh/hook-weight": "1"
-    "helm.sh/hook-delete-policy": before-hook-creation
+{{ toYaml .Values.additionalAnnotations | indent 4 }}
+{{- end }}
 
 ---
 
@@ -318,3 +315,7 @@ kind: ConfigMap
 metadata:
   name: {{ .Release.Name }}-updatelbip
   namespace: {{ .Release.Namespace }}
+{{- if .Values.additionalAnnotations }}
+  annotations:
+{{ toYaml .Values.additionalAnnotations | indent 4 }}
+{{- end }}
diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/load-init-config.yml b/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/load-init-config.yml
@@ -10,14 +10,12 @@ metadata:
 {{- if .Values.additionalLabels }}
 {{ toYaml .Values.additionalLabels | indent 4 }}
 {{- end }}
-  annotations:
-    "helm.sh/hook": pre-install
-    "helm.sh/hook-weight": "3"
-    "helm.sh/hook-delete-policy": before-hook-creation
 {{- if .Values.additionalAnnotations }}
+  annotations:
 {{ toYaml .Values.additionalAnnotations | indent 4 }}
 {{- end }}
 spec:
+  ttlSecondsAfterFinished: 120
   template:
     metadata:
       name: {{ include "config.name" . }}-job

diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/rolebinding.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/rolebinding.yaml
@@ -5,10 +5,10 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ .Release.Namespace }}-rolebinding
   namespace: {{ .Release.Namespace }}
+{{- if .Values.additionalAnnotations }}
   annotations:
-    "helm.sh/hook": pre-install,pre-upgrade
-    "helm.sh/hook-weight": "0"
-    "helm.sh/hook-delete-policy": before-hook-creation
+{{ toYaml .Values.additionalAnnotations | indent 4 }}
+{{- end }}
 subjects:
 - kind: User
   name: system:serviceaccount:{{ .Release.Namespace }}:default # Name is case sensitive

diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/roles.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/roles.yaml
@@ -5,10 +5,10 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ .Release.Namespace }}-gluu-role
   namespace: {{ .Release.Namespace }}
+{{- if .Values.additionalAnnotations }}
   annotations:
-    "helm.sh/hook": pre-install,pre-upgrade
-    "helm.sh/hook-weight": "0"
-    "helm.sh/hook-delete-policy": before-hook-creation
+{{ toYaml .Values.additionalAnnotations | indent 4 }}
+{{- end }}
 rules:
 - apiGroups: [""] # "" refers to the core API group
   resources: ["configmaps", "secrets"]

diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/secrets.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/secrets.yaml
@@ -10,11 +10,8 @@ metadata:
 {{- if .Values.additionalLabels }}
 {{ toYaml .Values.additionalLabels | indent 4 }}
 {{- end }}
-  annotations:
-    "helm.sh/hook": pre-install,pre-upgrade
-    "helm.sh/hook-weight": "1"
-    "helm.sh/hook-delete-policy": before-hook-creation
 {{- if .Values.additionalAnnotations }}
+  annotations:
 {{ toYaml .Values.additionalAnnotations | indent 4 }}
 {{- end }}
 type: Opaque
@@ -44,11 +41,8 @@ metadata:
 {{- if .Values.additionalLabels }}
 {{ toYaml .Values.additionalLabels | indent 4 }}
 {{- end }}
-  annotations:
-    "helm.sh/hook": pre-install,pre-upgrade
-    "helm.sh/hook-weight": "1"
-    "helm.sh/hook-delete-policy": before-hook-creation
 {{- if .Values.additionalAnnotations }}
+  annotations:
 {{ toYaml .Values.additionalAnnotations | indent 4 }}
 {{- end }}
 type: Opaque
@@ -67,11 +61,8 @@ metadata:
 {{- if .Values.additionalLabels }}
 {{ toYaml .Values.additionalLabels | indent 4 }}
 {{- end }}
-  annotations:
-    "helm.sh/hook": pre-install,pre-upgrade
-    "helm.sh/hook-weight": "1"
-    "helm.sh/hook-delete-policy": before-hook-creation
 {{- if .Values.additionalAnnotations }}
+  annotations:
 {{ toYaml .Values.additionalAnnotations | indent 4 }}
 {{- end }}
 type: Opaque
@@ -89,11 +80,8 @@ metadata:
 {{- if .Values.additionalLabels }}
 {{ toYaml .Values.additionalLabels | indent 4 }}
 {{- end }}
-  annotations:
-    "helm.sh/hook": pre-install,pre-upgrade
-    "helm.sh/hook-weight": "1"
-    "helm.sh/hook-delete-policy": before-hook-creation
 {{- if .Values.additionalAnnotations }}
+  annotations:
 {{ toYaml .Values.additionalAnnotations | indent 4 }}
 {{- end }}
 type: Opaque
@@ -112,11 +100,8 @@ metadata:
 {{- if .Values.additionalLabels }}
 {{ toYaml .Values.additionalLabels | indent 4 }}
 {{- end }}
-  annotations:
-    "helm.sh/hook": pre-install,pre-upgrade
-    "helm.sh/hook-weight": "1"
-    "helm.sh/hook-delete-policy": before-hook-creation
 {{- if .Values.additionalAnnotations }}
+  annotations:
 {{ toYaml .Values.additionalAnnotations | indent 4 }}
 {{- end }}
 type: Opaque
@@ -134,11 +119,8 @@ metadata:
 {{- if .Values.additionalLabels }}
 {{ toYaml .Values.additionalLabels | indent 4 }}
 {{- end }}
-  annotations:
-    "helm.sh/hook": pre-install,pre-upgrade
-    "helm.sh/hook-weight": "1"
-    "helm.sh/hook-delete-policy": before-hook-creation
 {{- if .Values.additionalAnnotations }}
+  annotations:
 {{ toYaml .Values.additionalAnnotations | indent 4 }}
 {{- end }}
 type: Opaque
@@ -157,10 +139,10 @@ metadata:
 {{- if .Values.additionalLabels }}
 {{ toYaml .Values.additionalLabels | indent 4 }}
 {{- end }}
+{{- if .Values.additionalAnnotations }}
   annotations:
-    "helm.sh/hook": pre-install,pre-upgrade
-    "helm.sh/hook-weight": "1"
-    "helm.sh/hook-delete-policy": before-hook-creation
+{{ toYaml .Values.additionalAnnotations | indent 4 }}
+{{- end }}
 data:
     password: {{ .Values.ldapPass | b64enc }}
 {{- end}}
diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/service.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/service.yaml
@@ -11,10 +11,6 @@ metadata:
 {{- if .Values.additionalLabels }}
 {{ toYaml .Values.additionalLabels | indent 4 }}
 {{- end }}
-  annotations:
-    "helm.sh/hook": pre-install,pre-upgrade
-    "helm.sh/hook-weight": "3"
-    "helm.sh/hook-delete-policy": before-hook-creation
 {{- if .Values.additionalAnnotations }}
   annotations:
 {{ toYaml .Values.additionalAnnotations | indent 4 }}

diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/upgrade-ldap-101-ox.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/upgrade-ldap-101-ox.yaml
@@ -14,7 +14,7 @@ metadata:
 {{- end }}
   annotations:
     "helm.sh/hook": pre-upgrade
-    "helm.sh/hook-weight": "1"
+    "helm.sh/hook-weight": "0"
     "helm.sh/hook-delete-policy": before-hook-creation
 {{- if .Values.additionalAnnotations }}
 {{ toYaml .Values.additionalAnnotations | indent 4 }}

diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/upgradejob.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/upgradejob.yaml
@@ -1,4 +1,4 @@
-{{- if.Values.global.upgrade.enabled }}
+{{- if .Values.global.upgrade.enabled }}
 # License terms and conditions for Gluu Cloud Native Edition:
 # https://www.apache.org/licenses/LICENSE-2.0
 apiVersion: batch/v1
@@ -13,12 +13,13 @@ metadata:
 {{- end }}
   annotations:
     "helm.sh/hook": pre-upgrade
-    "helm.sh/hook-weight": "2"
+    "helm.sh/hook-weight": "1"
     "helm.sh/hook-delete-policy": before-hook-creation
 {{- if .Values.additionalAnnotations }}
 {{ toYaml .Values.additionalAnnotations | indent 4 }}
 {{- end }}
 spec:
+  ttlSecondsAfterFinished: 120
   template:
     metadata:
       name: {{ include "config.name" . }}-upgrader