From ca1e64c4993b57b32f15917c14efb882c5c957a2 Mon Sep 17 00:00:00 2001 From: Mohammad Abudayyeh <47318409+moabu@users.noreply.github.com> Date: Mon, 29 Nov 2021 06:56:34 -0500 Subject: [PATCH] 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 --- .../kubernetes/templates/helm/gluu/Chart.yaml | 38 +++++++++---------- .../kubernetes/templates/helm/gluu/README.md | 2 +- .../helm/gluu/charts/casa/Chart.yaml | 4 +- .../templates/helm/gluu/charts/casa/README.md | 2 +- .../helm/gluu/charts/config/Chart.yaml | 4 +- .../helm/gluu/charts/config/README.md | 2 +- .../config/templates/clusterrolebinding.yaml | 10 +++-- .../charts/config/templates/configmaps.yaml | 15 ++++---- .../config/templates/load-init-config.yml | 6 +-- .../charts/config/templates/rolebinding.yaml | 6 +-- .../gluu/charts/config/templates/roles.yaml | 6 +-- .../gluu/charts/config/templates/secrets.yaml | 36 +++++------------- .../gluu/charts/config/templates/service.yaml | 4 -- .../config/templates/upgrade-ldap-101-ox.yaml | 2 +- .../charts/config/templates/upgradejob.yaml | 5 ++- .../config/templates/user-custom-envs.yaml | 15 ++------ .../helm/gluu/charts/cr-rotate/Chart.yaml | 4 +- .../helm/gluu/charts/cr-rotate/README.md | 2 +- .../helm/gluu/charts/fido2/Chart.yaml | 4 +- .../helm/gluu/charts/fido2/README.md | 2 +- .../gluu/charts/gluu-alb-ingress/Chart.yaml | 4 +- .../gluu/charts/gluu-alb-ingress/README.md | 2 +- .../gluu/charts/gluu-istio-ingress/Chart.yaml | 4 +- .../gluu/charts/gluu-istio-ingress/README.md | 2 +- .../helm/gluu/charts/jackrabbit/Chart.yaml | 4 +- .../helm/gluu/charts/jackrabbit/README.md | 2 +- .../jackrabbit/templates/storageclass.yaml | 4 +- .../helm/gluu/charts/nginx-ingress/Chart.yaml | 4 +- .../helm/gluu/charts/nginx-ingress/README.md | 2 +- .../helm/gluu/charts/opendj/Chart.yaml | 4 +- .../helm/gluu/charts/opendj/README.md | 2 +- .../charts/opendj/templates/storageclass.yaml | 2 +- .../charts/oxauth-key-rotation/Chart.yaml | 4 +- .../gluu/charts/oxauth-key-rotation/README.md | 2 +- .../helm/gluu/charts/oxauth/Chart.yaml | 4 +- .../helm/gluu/charts/oxauth/README.md | 2 +- .../helm/gluu/charts/oxd-server/Chart.yaml | 4 +- .../helm/gluu/charts/oxd-server/README.md | 2 +- .../helm/gluu/charts/oxpassport/Chart.yaml | 4 +- .../helm/gluu/charts/oxpassport/README.md | 2 +- .../helm/gluu/charts/oxshibboleth/Chart.yaml | 4 +- .../helm/gluu/charts/oxshibboleth/README.md | 2 +- .../helm/gluu/charts/oxtrust/Chart.yaml | 4 +- .../helm/gluu/charts/oxtrust/README.md | 2 +- .../helm/gluu/charts/persistence/Chart.yaml | 4 +- .../helm/gluu/charts/persistence/README.md | 2 +- .../charts/persistence/templates/jobs.yml | 6 +-- .../charts/persistence/templates/service.yaml | 4 -- .../templates/user-custom-secret-envs.yaml | 5 +-- .../helm/gluu/charts/scim/Chart.yaml | 4 +- .../templates/helm/gluu/charts/scim/README.md | 2 +- pygluu/kubernetes/version.py | 2 +- 52 files changed, 116 insertions(+), 154 deletions(-) diff --git a/pygluu/kubernetes/templates/helm/gluu/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/Chart.yaml index 3f61ffbb1..923acf93d 100644 --- 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: support@gluu.org 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 \ No newline at end of file + version: 1.6.15 \ No newline at end of file diff --git a/pygluu/kubernetes/templates/helm/gluu/README.md b/pygluu/kubernetes/templates/helm/gluu/README.md index 0d228fa5d..a7f9113e9 100644 --- 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 index e201599c6..ad453dc0e 100644 --- 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 index 0da16a8a1..6d7c0143d 100644 --- 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 index 9642f2b06..6ac263f47 100644 --- 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 index 78d4cf6e4..19e5f3a68 100644 --- 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 index 2a65c1eeb..b457c39e8 100644 --- 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 index dd2cb9ce6..051deabdb 100644 --- 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 }} \ No newline at end of file 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 index 3dadb0f6f..0eb689e64 100644 --- 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 index 298b4f12e..0a2371120 100644 --- 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 index f8f57315d..c9ce2a29d 100644 --- 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 index 4d6169a25..5732aefa1 100644 --- 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}} \ No newline at end of file diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/service.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/service.yaml index 8d4998bc4..bddf623a8 100644 --- 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 index ab45916ee..f1a121103 100644 --- 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 index a5d1ff832..da3f894f5 100644 --- 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 diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/user-custom-envs.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/user-custom-envs.yaml index 8e50c212e..b9aec64f4 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/user-custom-envs.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/user-custom-envs.yaml @@ -9,11 +9,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 @@ -32,11 +29,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: @@ -54,11 +48,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 diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/cr-rotate/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/cr-rotate/Chart.yaml index 865e16cb1..1b38435bf 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/cr-rotate/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/cr-rotate/Chart.yaml @@ -2,8 +2,8 @@ # https://www.apache.org/licenses/LICENSE-2.0 apiVersion: v2 name: cr-rotate -version: 1.6.14 -kubeVersion: ">=v1.18.0-0" +version: 1.6.15 +kubeVersion: ">=v1.21.0-0" description: CacheRefreshRotation is a special container to monitor cache refresh on oxTrust containers. This may become depreciated in 5.0. type: application keywords: diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/cr-rotate/README.md b/pygluu/kubernetes/templates/helm/gluu/charts/cr-rotate/README.md index 99a436263..80c6d22f2 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/cr-rotate/README.md +++ b/pygluu/kubernetes/templates/helm/gluu/charts/cr-rotate/README.md @@ -1,6 +1,6 @@ # cr-rotate -![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) CacheRefreshRotation is a special container to monitor cache refresh on oxTrust containers. This may become depreciated in 5.0. diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/fido2/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/fido2/Chart.yaml index 404e1669c..a4bb8a47b 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/fido2/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/fido2/Chart.yaml @@ -2,8 +2,8 @@ # https://www.apache.org/licenses/LICENSE-2.0 apiVersion: v2 name: fido2 -version: 1.6.14 -kubeVersion: ">=v1.18.0-0" +version: 1.6.15 +kubeVersion: ">=v1.21.0-0" description: 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. type: application keywords: diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/fido2/README.md b/pygluu/kubernetes/templates/helm/gluu/charts/fido2/README.md index 9f5fe099e..4d7c9d9d0 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/fido2/README.md +++ b/pygluu/kubernetes/templates/helm/gluu/charts/fido2/README.md @@ -1,6 +1,6 @@ # fido2 -![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) 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. diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/gluu-alb-ingress/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/gluu-alb-ingress/Chart.yaml index 023fff825..6ceeec1ef 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/gluu-alb-ingress/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/gluu-alb-ingress/Chart.yaml @@ -2,8 +2,8 @@ # https://www.apache.org/licenses/LICENSE-2.0 apiVersion: v2 name: gluu-alb-ingress -version: 1.6.14 -kubeVersion: ">=v1.18.0-0" +version: 1.6.15 +kubeVersion: ">=v1.21.0-0" description: Nginx ingress definitions chart type: application keywords: diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/gluu-alb-ingress/README.md b/pygluu/kubernetes/templates/helm/gluu/charts/gluu-alb-ingress/README.md index 00849421c..aaba1a72d 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/gluu-alb-ingress/README.md +++ b/pygluu/kubernetes/templates/helm/gluu/charts/gluu-alb-ingress/README.md @@ -1,6 +1,6 @@ # gluu-alb-ingress -![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) Nginx ingress definitions chart diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/gluu-istio-ingress/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/gluu-istio-ingress/Chart.yaml index 0ba2d2c96..cc7a0129a 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/gluu-istio-ingress/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/gluu-istio-ingress/Chart.yaml @@ -2,8 +2,8 @@ # https://www.apache.org/licenses/LICENSE-2.0 apiVersion: v2 name: gluu-istio-ingress -version: 1.6.14 -kubeVersion: ">=v1.18.0-0" +version: 1.6.15 +kubeVersion: ">=v1.21.0-0" description: Istio Gateway type: application keywords: diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/gluu-istio-ingress/README.md b/pygluu/kubernetes/templates/helm/gluu/charts/gluu-istio-ingress/README.md index 00574427f..fb4df2365 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/gluu-istio-ingress/README.md +++ b/pygluu/kubernetes/templates/helm/gluu/charts/gluu-istio-ingress/README.md @@ -1,6 +1,6 @@ # gluu-istio-ingress -![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) Istio Gateway diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/jackrabbit/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/jackrabbit/Chart.yaml index 9ccd74bbf..9937aa12f 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/jackrabbit/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/jackrabbit/Chart.yaml @@ -2,8 +2,8 @@ # https://www.apache.org/licenses/LICENSE-2.0 apiVersion: v2 name: jackrabbit -version: 1.6.14 -kubeVersion: ">=v1.18.0-0" +version: 1.6.15 +kubeVersion: ">=v1.21.0-0" description: Jackrabbit Oak is a complementary implementation of the JCR specification. It is an effort to implement a scalable and performant hierarchical content repository for use as the foundation of modern world-class web sites and other demanding content applications. type: application keywords: diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/jackrabbit/README.md b/pygluu/kubernetes/templates/helm/gluu/charts/jackrabbit/README.md index 845fe0eed..8a333428f 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/jackrabbit/README.md +++ b/pygluu/kubernetes/templates/helm/gluu/charts/jackrabbit/README.md @@ -1,6 +1,6 @@ # jackrabbit -![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) Jackrabbit Oak is a complementary implementation of the JCR specification. It is an effort to implement a scalable and performant hierarchical content repository for use as the foundation of modern world-class web sites and other demanding content applications. diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/jackrabbit/templates/storageclass.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/jackrabbit/templates/storageclass.yaml index 00ba4618b..45d805c3e 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/jackrabbit/templates/storageclass.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/jackrabbit/templates/storageclass.yaml @@ -13,13 +13,11 @@ metadata: {{- end }} annotations: "helm.sh/hook": pre-install - "helm.sh/hook-weight": "1" + "helm.sh/hook-weight": "2" "helm.sh/hook-delete-policy": before-hook-creation {{- if .Values.additionalAnnotations }} {{ toYaml .Values.additionalAnnotations | indent 4 }} {{- end }} - annotations: - # Annotation below is to keep the storage class during upgrade. Otherwise, due to the flag at line 1 which is needed, this resource will be deleted. helm.sh/resource-policy: keep storageclass.beta.kubernetes.io/is-default-class: "false" {{- if eq .Values.global.storageClass.provisioner "openebs.io/local" }} diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/nginx-ingress/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/nginx-ingress/Chart.yaml index 4bab94d34..eef4aa351 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/nginx-ingress/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/nginx-ingress/Chart.yaml @@ -2,8 +2,8 @@ # https://www.apache.org/licenses/LICENSE-2.0 apiVersion: v2 name: nginx-ingress -version: 1.6.14 -kubeVersion: ">=v1.18.0-0" +version: 1.6.15 +kubeVersion: ">=v1.21.0-0" description: Nginx ingress definitions chart type: application keywords: diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/nginx-ingress/README.md b/pygluu/kubernetes/templates/helm/gluu/charts/nginx-ingress/README.md index bf1173636..c78a92422 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/nginx-ingress/README.md +++ b/pygluu/kubernetes/templates/helm/gluu/charts/nginx-ingress/README.md @@ -1,6 +1,6 @@ # nginx-ingress -![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) Nginx ingress definitions chart diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/opendj/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/opendj/Chart.yaml index e51e8b194..bf258a4c9 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/opendj/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/opendj/Chart.yaml @@ -2,8 +2,8 @@ # https://www.apache.org/licenses/LICENSE-2.0 apiVersion: v2 name: opendj -version: 1.6.14 -kubeVersion: ">=v1.18.0-0" +version: 1.6.15 +kubeVersion: ">=v1.21.0-0" description: OpenDJ is a directory server which implements a wide range of Lightweight Directory Access Protocol and related standards, including full compliance with LDAPv3 but also support for Directory Service Markup Language (DSMLv2).Written in Java, OpenDJ offers multi-master replication, access control, and many extensions. type: application keywords: diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/opendj/README.md b/pygluu/kubernetes/templates/helm/gluu/charts/opendj/README.md index 492b004a6..5a4189127 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/opendj/README.md +++ b/pygluu/kubernetes/templates/helm/gluu/charts/opendj/README.md @@ -1,6 +1,6 @@ # opendj -![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) OpenDJ is a directory server which implements a wide range of Lightweight Directory Access Protocol and related standards, including full compliance with LDAPv3 but also support for Directory Service Markup Language (DSMLv2).Written in Java, OpenDJ offers multi-master replication, access control, and many extensions. diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/opendj/templates/storageclass.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/opendj/templates/storageclass.yaml index fc26d04d2..db194f65f 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/opendj/templates/storageclass.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/opendj/templates/storageclass.yaml @@ -14,7 +14,7 @@ metadata: {{- end }} annotations: "helm.sh/hook": pre-install - "helm.sh/hook-weight": "1" + "helm.sh/hook-weight": "3" "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/oxauth-key-rotation/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/oxauth-key-rotation/Chart.yaml index e5330fa20..fc490f234 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/oxauth-key-rotation/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/oxauth-key-rotation/Chart.yaml @@ -2,8 +2,8 @@ # https://www.apache.org/licenses/LICENSE-2.0 apiVersion: v2 name: oxauth-key-rotation -version: 1.6.14 -kubeVersion: ">=v1.18.0-0" +version: 1.6.15 +kubeVersion: ">=v1.21.0-0" description: Responsible for regenerating auth-keys per x hours type: application keywords: diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxauth-key-rotation/README.md b/pygluu/kubernetes/templates/helm/gluu/charts/oxauth-key-rotation/README.md index a264b692d..9af972ad3 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/oxauth-key-rotation/README.md +++ b/pygluu/kubernetes/templates/helm/gluu/charts/oxauth-key-rotation/README.md @@ -1,6 +1,6 @@ # oxauth-key-rotation -![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) Responsible for regenerating auth-keys per x hours diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxauth/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/oxauth/Chart.yaml index 6ca4b572b..ce288825c 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/oxauth/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/oxauth/Chart.yaml @@ -2,8 +2,8 @@ # https://www.apache.org/licenses/LICENSE-2.0 apiVersion: v2 name: oxauth -version: 1.6.14 -kubeVersion: ">=v1.18.0-0" +version: 1.6.15 +kubeVersion: ">=v1.21.0-0" description: OAuth Authorization Server, the OpenID Connect Provider, the UMA Authorization Server--this is the main Internet facing component of Gluu. It's the service that returns tokens, JWT's and identity assertions. This service must be Internet facing. type: application keywords: diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxauth/README.md b/pygluu/kubernetes/templates/helm/gluu/charts/oxauth/README.md index a6a0cf995..15c4d78e1 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/oxauth/README.md +++ b/pygluu/kubernetes/templates/helm/gluu/charts/oxauth/README.md @@ -1,6 +1,6 @@ # oxauth -![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) OAuth Authorization Server, the OpenID Connect Provider, the UMA Authorization Server--this is the main Internet facing component of Gluu. It's the service that returns tokens, JWT's and identity assertions. This service must be Internet facing. diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxd-server/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/oxd-server/Chart.yaml index f41ddba2a..e549be188 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/oxd-server/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/oxd-server/Chart.yaml @@ -2,8 +2,8 @@ # https://www.apache.org/licenses/LICENSE-2.0 apiVersion: v2 name: oxd-server -version: 1.6.14 -kubeVersion: ">=v1.18.0-0" +version: 1.6.15 +kubeVersion: ">=v1.21.0-0" description: Middleware API to help application developers call an OAuth, OpenID or UMA server. You may wonder why this is necessary. It makes it easier for client developers to use OpenID signing and encryption features, without becoming crypto experts. This API provides some high level endpoints to do some of the heavy lifting. type: application keywords: diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxd-server/README.md b/pygluu/kubernetes/templates/helm/gluu/charts/oxd-server/README.md index 7adfa4e8a..6557117f9 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/oxd-server/README.md +++ b/pygluu/kubernetes/templates/helm/gluu/charts/oxd-server/README.md @@ -1,6 +1,6 @@ # oxd-server -![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) Middleware API to help application developers call an OAuth, OpenID or UMA server. You may wonder why this is necessary. It makes it easier for client developers to use OpenID signing and encryption features, without becoming crypto experts. This API provides some high level endpoints to do some of the heavy lifting. diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxpassport/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/oxpassport/Chart.yaml index c50a4b968..fd9a6eaf6 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/oxpassport/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/oxpassport/Chart.yaml @@ -2,8 +2,8 @@ # https://www.apache.org/licenses/LICENSE-2.0 apiVersion: v2 name: oxpassport -version: 1.6.14 -kubeVersion: ">=v1.18.0-0" +version: 1.6.15 +kubeVersion: ">=v1.21.0-0" description: Gluu interface to Passport.js to support social login and inbound identity. type: application keywords: diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxpassport/README.md b/pygluu/kubernetes/templates/helm/gluu/charts/oxpassport/README.md index 8e0b93baa..43ec61352 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/oxpassport/README.md +++ b/pygluu/kubernetes/templates/helm/gluu/charts/oxpassport/README.md @@ -1,6 +1,6 @@ # oxpassport -![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 interface to Passport.js to support social login and inbound identity. diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxshibboleth/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/oxshibboleth/Chart.yaml index 74b8a4038..5e0ab8548 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/oxshibboleth/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/oxshibboleth/Chart.yaml @@ -2,8 +2,8 @@ # https://www.apache.org/licenses/LICENSE-2.0 apiVersion: v2 name: oxshibboleth -version: 1.6.14 -kubeVersion: ">=v1.18.0-0" +version: 1.6.15 +kubeVersion: ">=v1.21.0-0" description: Shibboleth project for the Gluu Server's SAML IDP functionality. type: application keywords: diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxshibboleth/README.md b/pygluu/kubernetes/templates/helm/gluu/charts/oxshibboleth/README.md index d2acb907a..5215c4f23 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/oxshibboleth/README.md +++ b/pygluu/kubernetes/templates/helm/gluu/charts/oxshibboleth/README.md @@ -1,6 +1,6 @@ # oxshibboleth -![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) Shibboleth project for the Gluu Server's SAML IDP functionality. diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxtrust/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/oxtrust/Chart.yaml index d90eb2027..4d706525f 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/oxtrust/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/oxtrust/Chart.yaml @@ -2,8 +2,8 @@ # https://www.apache.org/licenses/LICENSE-2.0 apiVersion: v2 name: oxtrust -version: 1.6.14 -kubeVersion: ">=v1.18.0-0" +version: 1.6.15 +kubeVersion: ">=v1.21.0-0" description: Gluu Admin UI. This shouldn't be internet facing. type: application keywords: diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxtrust/README.md b/pygluu/kubernetes/templates/helm/gluu/charts/oxtrust/README.md index 95c465512..d5b46f4b3 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/oxtrust/README.md +++ b/pygluu/kubernetes/templates/helm/gluu/charts/oxtrust/README.md @@ -1,6 +1,6 @@ # oxtrust -![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 Admin UI. This shouldn't be internet facing. diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/persistence/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/persistence/Chart.yaml index fdb3ce7cb..a29a2d0f8 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/persistence/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/persistence/Chart.yaml @@ -2,8 +2,8 @@ # https://www.apache.org/licenses/LICENSE-2.0 apiVersion: v2 name: persistence -version: 1.6.14 -kubeVersion: ">=v1.18.0-0" +version: 1.6.15 +kubeVersion: ">=v1.21.0-0" description: Job to generate data and initial config for Gluu Server persistence layer. type: application keywords: diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/persistence/README.md b/pygluu/kubernetes/templates/helm/gluu/charts/persistence/README.md index ac35617a2..dd5f2948c 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/persistence/README.md +++ b/pygluu/kubernetes/templates/helm/gluu/charts/persistence/README.md @@ -1,6 +1,6 @@ # persistence -![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) Job to generate data and initial config for Gluu Server persistence layer. diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/persistence/templates/jobs.yml b/pygluu/kubernetes/templates/helm/gluu/charts/persistence/templates/jobs.yml index bd5768cde..e59fc9eb2 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/persistence/templates/jobs.yml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/persistence/templates/jobs.yml @@ -10,14 +10,12 @@ metadata: {{- if .Values.additionalLabels }} {{ toYaml .Values.additionalLabels | indent 4 }} {{- end }} - annotations: - "helm.sh/hook": post-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 "persistence.name" . }} diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/persistence/templates/service.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/persistence/templates/service.yaml index 74e78e946..dfcb6518e 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/persistence/templates/service.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/persistence/templates/service.yaml @@ -11,10 +11,6 @@ metadata: {{- if .Values.additionalLabels }} {{ toYaml .Values.additionalLabels | indent 4 }} {{- end }} - annotations: - "helm.sh/hook": post-install - "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/persistence/templates/user-custom-secret-envs.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/persistence/templates/user-custom-secret-envs.yaml index 3bcdda955..b8b3b87e8 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/persistence/templates/user-custom-secret-envs.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/persistence/templates/user-custom-secret-envs.yaml @@ -10,11 +10,8 @@ metadata: {{- if .Values.additionalLabels }} {{ toYaml .Values.additionalLabels | indent 4 }} {{- end }} - annotations: - "helm.sh/hook": post-install - "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 diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/scim/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/scim/Chart.yaml index 0cac78421..a1c8511b6 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/scim/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/scim/Chart.yaml @@ -2,8 +2,8 @@ # https://www.apache.org/licenses/LICENSE-2.0 apiVersion: v2 name: scim -version: 1.6.14 -kubeVersion: ">=v1.18.0-0" +version: 1.6.15 +kubeVersion: ">=v1.21.0-0" description: System for Cross-domain Identity Management (SCIM) version 2.0 type: application keywords: diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/scim/README.md b/pygluu/kubernetes/templates/helm/gluu/charts/scim/README.md index c3ea5a6ae..1ada693c4 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/scim/README.md +++ b/pygluu/kubernetes/templates/helm/gluu/charts/scim/README.md @@ -1,6 +1,6 @@ # scim -![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) System for Cross-domain Identity Management (SCIM) version 2.0 diff --git a/pygluu/kubernetes/version.py b/pygluu/kubernetes/version.py index 1b5e6e039..6f5171037 100644 --- a/pygluu/kubernetes/version.py +++ b/pygluu/kubernetes/version.py @@ -4,4 +4,4 @@ """ -__version__ = "1.6.14" +__version__ = "1.6.15"