diff --git a/automation/auto_update_image_pr.py b/automation/auto_update_image_pr.py index 3db25f859..7357c8952 100644 --- a/automation/auto_update_image_pr.py +++ b/automation/auto_update_image_pr.py @@ -15,23 +15,33 @@ def determine_final_official_and_dev_version(tag_list): @param tag_list: @return: """ + # Check for the highest major.minor.patch i.e 4.2.0 vs 4.2.1 + versions_list = [] + for tag in tag_list: + versions_list.append(int(tag[4:5])) + # Remove duplicates + versions_list = list(set(versions_list)) + # Sort + versions_list.sort() + highest_major_minor_patch_number = str(versions_list[-1]) versions_list = [] for tag in tag_list: # Exclude any tag with the following - if "dev" not in tag: + if "dev" not in tag and int(tag[4:5] == highest_major_minor_patch_number): versions_list.append(int(tag[6:8])) # Remove duplicates versions_list = list(set(versions_list)) # Sort versions_list.sort() # Return highest patch - highest_major_minor_patch = str(versions_list[-1]) - if len(highest_major_minor_patch) == 1: - highest_major_minor_patch = "0" + highest_major_minor_patch + highest_major_minor_patch_image_patch = str(versions_list[-1]) + if len(highest_major_minor_patch_image_patch) == 1: + highest_major_minor_patch_image_patch = "0" + highest_major_minor_patch_image_patch highest_major_minor_patch_image = "" for tag in tag_list: - if "dev" not in tag and highest_major_minor_patch in tag: + if "dev" not in tag and highest_major_minor_patch_image_patch in tag \ + and int(tag[4:5] == highest_major_minor_patch_number): highest_major_minor_patch_image = tag return highest_major_minor_patch_image, highest_major_minor_patch_image[0:5] + "_dev" @@ -150,7 +160,7 @@ def update_dicts_and_yamls(name, rep, tags_list, helm_name=None): update_dicts_and_yamls("CACHE_REFRESH_ROTATE", repo, tag_list) elif repo == "certmanager": update_dicts_and_yamls("CERT_MANAGER", repo, tag_list, "oxauth-key-rotation") - elif repo == "wrends": + elif repo == "opendj": update_dicts_and_yamls("LDAP", repo, tag_list, "opendj") elif repo == "jackrabbit": update_dicts_and_yamls("JACKRABBIT", repo, tag_list) @@ -182,7 +192,7 @@ def main(): all_repos_tags = dict() org = os.environ.get("ORG_NAME", "gluufederation") gluu_docker_repositories_names_used_in_cn = ["casa", "fido2", "scim", "config-init", - "cr-rotate", "certmanager", "wrends", "jackrabbit", "oxauth", + "cr-rotate", "certmanager", "opendj", "jackrabbit", "oxauth", "oxd-server", "oxpassport", "oxshibboleth", "oxtrust", "persistence", "radius", "gluu-gateway", "gluu-gateway-ui", "upgrade"] diff --git a/pygluu/kubernetes/__init__.py b/pygluu/kubernetes/__init__.py index bdf1a236b..339d5c24f 100644 --- a/pygluu/kubernetes/__init__.py +++ b/pygluu/kubernetes/__init__.py @@ -3,5 +3,5 @@ https://www.apache.org/licenses/LICENSE-2.0 """ -__version__ = "1.2.6" -__previous_version__ = "1.2.5" +__version__ = "1.2.7" +__previous_version__ = "1.2.6" diff --git a/pygluu/kubernetes/gui/forms/images.py b/pygluu/kubernetes/gui/forms/images.py index 4e8f9a5c7..ac46ad608 100644 --- a/pygluu/kubernetes/gui/forms/images.py +++ b/pygluu/kubernetes/gui/forms/images.py @@ -83,11 +83,11 @@ class ImageNameTagForm(FlaskForm): default=settings.get("CERT_MANAGER_IMAGE_TAG"), validators=[RequiredIfFieldEqualTo("edit_image_names_tags", "Y")]) ldap_image_name = StringField( - "WrenDS image name", + "OpenDJ image name", default=settings.get("LDAP_IMAGE_NAME"), validators=[RequiredIfFieldEqualTo("edit_image_names_tags", "Y")]) ldap_image_tag = StringField( - "WrenDS image tag", + "OpenDJ image tag", default=settings.get("LDAP_IMAGE_TAG"), validators=[RequiredIfFieldEqualTo("edit_image_names_tags", "Y")]) jackrabbit_image_name = StringField( diff --git a/pygluu/kubernetes/gui/forms/persistencebackend.py b/pygluu/kubernetes/gui/forms/persistencebackend.py index 9e991eb7c..83c8275c9 100644 --- a/pygluu/kubernetes/gui/forms/persistencebackend.py +++ b/pygluu/kubernetes/gui/forms/persistencebackend.py @@ -22,12 +22,12 @@ class PersistenceBackendForm(FlaskForm): """ persistence_backend = RadioField( "Persistence layer", - choices=[("ldap", "WrenDS"), + choices=[("ldap", "OpenDJ"), ("couchbase", "Couchbase"), - ("hybrid", "Hybrid(WrenDS + Couchbase)")], + ("hybrid", "Hybrid(OpenDJ + Couchbase)")], default="ldap", validators=[DataRequired()]) - hybrid_ldap_held_data = RadioField("Hybrid [WrendDS + Couchbase]", + hybrid_ldap_held_data = RadioField("Hybrid [OpenDJ + Couchbase]", choices=[("default", "Default"), ("user", "User"), ("site", "Site"), diff --git a/pygluu/kubernetes/templates/README.md b/pygluu/kubernetes/templates/README.md index d05da40aa..9bf9b5684 100644 --- a/pygluu/kubernetes/templates/README.md +++ b/pygluu/kubernetes/templates/README.md @@ -449,9 +449,12 @@ Please calculate the minimum required resources as per services deployed. The fo | `config.configmap.gluuOxdAdminCertCn` | oxd OAuth client admin certificate common name | `oxd-server` | | `config.configmap.gluuCouchbaseCrt` | Couchbase certificate authority | `LS0tLS1CRUdJTiBDRVJ.....` | | `config.configmap.gluuCouchbasePass` | Couchbase password | `P@ssw0rd` | + | `config.configmap.gluuCouchbaseSuperUserPass` | Couchbase superuser password | `P@ssw0rd` | | `config.configmap.gluuCouchbaseUrl` | Couchbase URL. Used only when `global.gluuPersistenceType` is `hybrid` or `couchbase` | `cbgluu.cbns.svc.cluster.local` | - | `config.configmap.gluuCouchbaseUser` | Couchbase user. Used only when `global.gluuPersistenceType` is `hybrid` or `couchbase` | `admin` | + | `config.configmap.gluuCouchbaseUser` | Couchbase user. Used only when `global.gluuPersistenceType` is `hybrid` or `couchbase` | `gluu` | + | `config.configmap.gluuCouchbaseSuperUser` | Couchbase superuser. Used only when `global.gluuPersistenceType` is `hybrid` or `couchbase` | `admin` | | `config.configmap.gluuCouchbasePassFile` | Location of `couchbase_password` file | `/etc/gluu/conf/couchbase_password` | + | `config.configmap.gluuCouchbaseSuperUserPassFile` | Location of `couchbase_superuser_password` file | `/etc/gluu/conf/couchbase_superuser_password` | | `config.configmap.gluuCouchbaseCertFile` | Location of `couchbase.crt` used by cb for tls termination | `/etc/gluu/conf/couchbase.crt` | | `config.configmap.gluuPersistenceLdapMapping` | if gluuPersistenceType is hybrid, what to store in ldap. | `default`, `user`, `site`, `cache`, `statistic` | | `config.configmap.gluuCacheType` | if gluuCacheType is hybrid, what to store in ldap. | `REDIS`, `NATIVE_PERSISTENCE`, `IN_MEMORY` | @@ -469,7 +472,7 @@ Please calculate the minimum required resources as per services deployed. The fo | `config.configmap.gluuOxtrustBackend` | oxTrust backend address | `oxtrust:8080` | | `config.configmap.gluuOxauthBackend` | oxAuth backend address | `oxauth:8080` | | `config.configmap.gluuOxdServerUrl` | oxd Oauth client address | `oxd-server:8443` | - | `config.configmap.gluuLdapUrl` | wrends/ldap server url. Port and service name of opendj server - should not be changed | `opendj:1636` | + | `config.configmap.gluuLdapUrl` | opendj server url. Port and service name of opendj server - should not be changed | `opendj:1636` | | `config.configmap.gluuJackrabbitSyncInterval` | Jackrabbit sync interval | `300` | | `config.configmap.gluuJackrabbitUrl` | Jackrabbit url. Port and service name of Jackrabbit | `jackrabbit:8080` | | `config.configmap.gluuJackrabbitAdminId` | Jackrabbit admin user | i.e `admin` | @@ -490,7 +493,7 @@ Please calculate the minimum required resources as per services deployed. The fo | `config.configmap.gluuRadiusEnabled` | Enable Radius | `false` | | `config.configmap.gluuSamlEnabled` | Enable SAML | `false` | | `config.image.repository` | Config image repository | `gluufederation/config-init` | - | `config.image.tag` | Config image tag | `4.2.1_01` | + | `config.image.tag` | Config image tag | `4.2.1_02` | === "nginx-ingress" @@ -510,7 +513,7 @@ Please calculate the minimum required resources as per services deployed. The fo | `jackrabbit.replicas` | Jackrabbit replicas | `1` | | `jackrabbit.storage.size` | Storage for Jackrabbit pod | `5Gi` | | `jackrabbit.image.repository` | Jackrabbit image repository | `gluufederation/jackrabbit` | - | `jackrabbit.image.tag` | Jackrabbit image tag repository | `4.2.1_01` | + | `jackrabbit.image.tag` | Jackrabbit image tag repository | `4.2.1_02` | | `jackrabbit.image.pullPolicy` | Jackrabbit image pull policy | `Always` | | `jackrabbit.resources.limits.cpu` | Jackrabbit memory limit | `1000Mi` | | `jackrabbit.resources.limits.memory` | Jackrabbit cpu limit | `1500m` | @@ -524,8 +527,8 @@ Please calculate the minimum required resources as per services deployed. The fo | `opendj.service.ldapServiceName` | Name of opendj service | `opendj` | | `opendj.replicas` | Opendj replicas | `1` | | `opendj.persistence.size` | Storage for OpenDJ pod | `5Gi` | - | `opendj.image.repository` | Opendj image repository | `gluufederation/wrends` | - | `opendj.image.tag` | Opendj image tag repository | `4.2.1_01` | + | `opendj.image.repository` | Opendj image repository | `gluufederation/opendj` | + | `opendj.image.tag` | Opendj image tag repository | `4.2.1_02` | | `opendj.image.pullPolicy` | Opendj image pull policy | `Always` | | `opendj.resources.limits.cpu` | Opendj memory limit | `2000Mi` | | `opendj.resources.limits.memory` | Opendj cpu limit | `1500m` | @@ -537,7 +540,7 @@ Please calculate the minimum required resources as per services deployed. The fo | Parameter | Description | Default | | -------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------- | | `persistence.image.repository` | Persistence image repository | `gluufederation/persistence` | - | `persistence.image.tag` | Persistence image tag repository | `4.2.1_01` | + | `persistence.image.tag` | Persistence image tag repository | `4.2.1_02` | | `persistence.image.pullPolicy` | Persistence image pull policy | `Always` | === "oxauth" @@ -547,7 +550,7 @@ Please calculate the minimum required resources as per services deployed. The fo | `oxauth.service.oxAuthServiceName` | Name of oxAuth service | `oxauth` | | `oxauth.replicas` | oxAuth replicas | `1` | | `oxauth.image.repository` | oxAuth image repository | `gluufederation/oxauth` | - | `oxauth.image.tag` | oxAuth image tag repository | `4.2.1_01` | + | `oxauth.image.tag` | oxAuth image tag repository | `4.2.1_02` | | `oxauth.image.pullPolicy` | oxAuth image pull policy | `Always` | | `oxauth.resources.limits.cpu` | oxAuth memory limit | `2500Mi` | | `oxauth.resources.limits.memory` | oxAuth cpu limit | `2500m` | @@ -561,7 +564,7 @@ Please calculate the minimum required resources as per services deployed. The fo | `oxtrust.service.oxTrustServiceName` | Name of oxTrust service | `oxtrust` | | `oxtrust.replicas` | oxTrust replicas | `1` | | `oxtrust.image.repository` | oxTrust image repository | `gluufederation/oxtrust` | - | `oxtrust.image.tag` | oxTrust image tag repository | `4.2.1_01` | + | `oxtrust.image.tag` | oxTrust image tag repository | `4.2.1_02` | | `oxtrust.image.pullPolicy` | oxTrust image pull policy | `Always` | | `oxtrust.resources.limits.cpu` | oxTrust memory limit | `500Mi` | | `oxtrust.resources.limits.memory` | oxTrust cpu limit | `500m` | @@ -575,7 +578,7 @@ Please calculate the minimum required resources as per services deployed. The fo | `fido2.service.fido2ServiceName` | Name of fido2 service | `fido2` | | `fido2.replicas` | Fido2 replicas | `1` | | `fido2.image.repository` | Fido2 image repository | `gluufederation/fido2` | - | `fido2.image.tag` | Fido2 image tag repository | `4.2.1_01` | + | `fido2.image.tag` | Fido2 image tag repository | `4.2.1_02` | | `fido2.image.pullPolicy` | Fido2 image pull policy | `Always` | | `fido2.resources.limits.cpu` | Fido2 memory limit | `500Mi` | | `fido2.resources.limits.memory` | Fido2 cpu limit | `500m` | @@ -589,7 +592,7 @@ Please calculate the minimum required resources as per services deployed. The fo | `scim.service.scimServiceName` | Name of SCIM service | `scim` | | `scim.replicas` | SCIM replicas | `1` | | `scim.image.repository` | SCIM image repository | `gluufederation/scim` | - | `scim.image.tag` | SCIM image tag repository | `4.2.1_01` | + | `scim.image.tag` | SCIM image tag repository | `4.2.1_02` | | `scim.image.pullPolicy` | SCIM image pull policy | `Always` | | `scim.resources.limits.cpu` | SCIM memory limit | `500Mi` | | `scim.resources.limits.memory` | SCIM cpu limit | `500m` | @@ -603,7 +606,7 @@ Please calculate the minimum required resources as per services deployed. The fo | `oxd-server.service.oxdServerServiceName` | Name of oxd Oauth client service | `oxd-server` | | `oxd-server.replicas` | oxd Oauth client replicas | `1` | | `oxd-server.image.repository` | oxd Oauth client image repository | `gluufederation/oxd-server` | - | `oxd-server.image.tag` | oxd Oauth client image tag repository | `4.2.1_01` | + | `oxd-server.image.tag` | oxd Oauth client image tag repository | `4.2.1_02` | | `oxd-server.image.pullPolicy` | oxd Oauth client image pull policy | `Always` | | `oxd-server.resources.limits.cpu` | oxd Oauth client memory limit | `400Mi` | | `oxd-server.resources.limits.memory` | oxd Oauth client cpu limit | `1000m` | @@ -617,7 +620,7 @@ Please calculate the minimum required resources as per services deployed. The fo | `casa.service.casaServiceName` | Name of casa service | `casa` | | `casa.replicas` | oxd Oauth client replicas | `1` | | `casa.image.repository` | Casa image repository | `gluufederation/casa` | - | `casa.image.tag` | Casa image tag repository | `4.2.1_01` | + | `casa.image.tag` | Casa image tag repository | `4.2.1_02` | | `casa.image.pullPolicy` | Casa image pull policy | `Always` | | `casa.resources.requests.limits.cpu` | Casa memory limit | `500Mi` | | `casa.resources.requests.limits.memory` | Casa cpu limit | `500m` | @@ -631,7 +634,7 @@ Please calculate the minimum required resources as per services deployed. The fo | `oxpassport.service.oxPassportServiceName` | Name of oxPassport service | `oxpassport` | | `oxpassport.replicas` | oxPassport replicas | `1` | | `oxpassport.image.repository` | oxPassport image repository | `gluufederation/oxpassport` | - | `oxpassport.image.tag` | oxPassport image tag repository | `4.2.1_01` | + | `oxpassport.image.tag` | oxPassport image tag repository | `4.2.1_02` | | `oxpassport.image.pullPolicy` | oxPassport image pull policy | `Always` | | `oxpassport.resources.requests.limits.cpu` | oxPassport memory limit | `700Mi` | | `oxpassport.resources.requests.limits.memory` | oxPassport cpu limit | `500m` | @@ -645,7 +648,7 @@ Please calculate the minimum required resources as per services deployed. The fo | `oxshibboleth.service.oxShibbolethServiceName` | Name of oxShibboleth service | `oxshibboleth` | | `oxshibboleth.replicas` | oxShibboleth replicas | `1` | | `oxshibboleth.image.repository` | oxShibboleth image repository | `gluufederation/oxshibboleth` | - | `oxshibboleth.image.tag` | oxShibboleth image tag repository | `4.2.1_01` | + | `oxshibboleth.image.tag` | oxShibboleth image tag repository | `4.2.1_02` | | `oxshibboleth.image.pullPolicy` | oxShibboleth image pull policy | `Always` | | `oxshibboleth.resources.requests.limits.cpu` | oxShibboleth memory limit | `500Mi` | | `oxshibboleth.resources.requests.limits.memory` | oxShibboleth cpu limit | `500m` | @@ -659,7 +662,7 @@ Please calculate the minimum required resources as per services deployed. The fo | `radius.service.radiusServiceName` | Name of Radius service | `radius` | | `radius.replicas` | Radius replicas | `1` | | `radius.image.repository` | Radius image repository | `gluufederation/radius` | - | `radius.image.tag` | Radius image tag repository | `4.2.1_01` | + | `radius.image.tag` | Radius image tag repository | `4.2.1_02` | | `radius.image.pullPolicy` | Radius image pull policy | `Always` | | `radius.resources.requests.limits.cpu` | Radius memory limit | `700Mi` | | `radius.resources.requests.limits.memory` | Radius cpu limit | `700m` | @@ -673,7 +676,7 @@ Please calculate the minimum required resources as per services deployed. The fo | `cr-rotate.service.crRotateServiceName` | Name of Cache Refresh Rotate service | `cr-rotate` | | `cr-rotate.replicas` | Cache Refresh replicas | `1` | | `cr-rotate.image.repository` | Cache Refresh image repository | `gluufederation/cr-rotate` | - | `cr-rotate.image.tag` | Cache Refresh image tag repository | `4.2.1_01` | + | `cr-rotate.image.tag` | Cache Refresh image tag repository | `4.2.1_02` | | `cr-rotate.image.pullPolicy` | Cache Refresh image pull policy | `Always` | | `cr-rotate.resources.requests.limits.cpu` | Cache Refresh memory limit | `200Mi` | | `cr-rotate.resources.requests.limits.memory` | Cache Refresh cpu limit | `200m` | @@ -686,7 +689,7 @@ Please calculate the minimum required resources as per services deployed. The fo | -------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------- | | `oxauth-key-rotation.keysLife` | oxAuth Key Rotation Keys life in hours | `48` | | `oxauth-key-rotation.image.repository` | oxAuth Key Rotation image repository | `gluufederation/certmanager` | - | `oxauth-key-rotation.image.tag` | oxAuth Key Rotation image tag repository | `4.2.1_01` | + | `oxauth-key-rotation.image.tag` | oxAuth Key Rotation image tag repository | `4.2.1_02` | | `oxauth-key-rotation.image.pullPolicy` | oxAuth Key Rotation image pull policy | `Always` | | `oxauth-key-rotation.resources.requests.limits.cpu` | oxAuth Key Rotation memory limit | `300Mi` | | `oxauth-key-rotation.resources.requests.limits.memory` | oxAuth Key Rotation cpu limit | `300m` | @@ -881,8 +884,10 @@ This is the main parameter file used with the [`pygluu-kubernetes.pyz`](https:// | `COUCHBASE_VOLUME_TYPE` | Persistence Volume type | `"io1"`,`"ps-ssd"`, `"Premium_LRS"` | | `COUCHBASE_CLUSTER_NAME` | Couchbase cluster name | `""` | | `COUCHBASE_URL` | Couchbase internal address to the cluster | `""` or i.e `"..svc.cluster.local"` | -| `COUCHBASE_USER` | Couchbase username | `""` or i.e `"admin"` | -| `COUCHBASE_PASSWORD` | Password of CB 6 chars min: 1 capital, 1 small, 1 digit and 1 special char | `"P@ssw0rd"` | +| `COUCHBASE_USER` | Couchbase username | `""` or i.e `"gluu"` | +| `COUCHBASE_PASSWORD` | Password of CB 6 chars min: 1 capital, 1 small, 1 digit and 1 special char | `"P@ssw0rd"` | +| `COUCHBASE_SUPERUSER` | Couchbase superuser username | `""` or i.e `"admin"` | +| `COUCHBASE_SUPERUSER_PASSWORD` | Password of CB 6 chars min: 1 capital, 1 small, 1 digit and 1 special char | `"P@ssw0rd"` | | `COUCHBASE_CRT` | Couchbase CA certification | `""` or i.e `` | | `COUCHBASE_CN` | Couchbase certificate common name | `""` | | `COUCHBASE_SUBJECT_ALT_NAME` | Couchbase SAN | `""` or i.e `"cb.gluu.org"` | @@ -968,46 +973,46 @@ This is the main parameter file used with the [`pygluu-kubernetes.pyz`](https:// | `ENABLED_SERVICES_LIST` | Used by `pygluu-kubernetes`. List of all enabled services | `"[]"` | | `EDIT_IMAGE_NAMES_TAGS` | Manually place the image source and tag | `"Y"` or `"N"` | | `JACKRABBIT_IMAGE_NAME` | Jackrabbit image repository name | i.e `"gluufederation/jackrabbit"` | -| `JACKRABBIT_IMAGE_TAG` | Jackrabbit image tag | i.e `"4.2.1_01"` | +| `JACKRABBIT_IMAGE_TAG` | Jackrabbit image tag | i.e `"4.2.1_02"` | | `CASA_IMAGE_NAME` | Casa image repository name | i.e `"gluufederation/casa"` | -| `CASA_IMAGE_TAG` | Casa image tag | i.e `"4.2.1_01"` | +| `CASA_IMAGE_TAG` | Casa image tag | i.e `"4.2.1_02"` | | `CONFIG_IMAGE_NAME` | Config image repository name | i.e `"gluufederation/config-init"` | -| `CONFIG_IMAGE_TAG` | Config image tag | i.e `"4.2.1_01"` | +| `CONFIG_IMAGE_TAG` | Config image tag | i.e `"4.2.1_02"` | | `CACHE_REFRESH_ROTATE_IMAGE_NAME` | Cache refresh image repository name | i.e `"gluufederation/cr-rotate"` | -| `CACHE_REFRESH_ROTATE_IMAGE_TAG` | Cache refresh image tag | i.e `"4.2.1_01"` | +| `CACHE_REFRESH_ROTATE_IMAGE_TAG` | Cache refresh image tag | i.e `"4.2.1_02"` | | `CERT_MANAGER_IMAGE_NAME` | Gluus Certificate management image repository name | i.e `"gluufederation/certmanager"` | -| `CERT_MANAGER_IMAGE_TAG` | Gluus Certificate management image tag | i.e `"4.2.1_01"` | -| `LDAP_IMAGE_NAME` | LDAP image repository name | i.e `"gluufederation/wrends"` | -| `LDAP_IMAGE_TAG` | LDAP image tag | i.e `"4.2.1_01"` | +| `CERT_MANAGER_IMAGE_TAG` | Gluus Certificate management image tag | i.e `"4.2.1_02"` | +| `LDAP_IMAGE_NAME` | LDAP image repository name | i.e `"gluufederation/opendj"` | +| `LDAP_IMAGE_TAG` | LDAP image tag | i.e `"4.2.1_02"` | | `OXAUTH_IMAGE_NAME` | oxAuth image repository name | i.e `"gluufederation/oxauth"` | -| `OXAUTH_IMAGE_TAG` | oxAuth image tag | i.e `"4.2.1_01"` | +| `OXAUTH_IMAGE_TAG` | oxAuth image tag | i.e `"4.2.1_02"` | | `OXD_IMAGE_NAME` | oxd image repository name | i.e `"gluufederation/oxd-server"` | -| `OXD_IMAGE_TAG` | oxd image tag | i.e `"4.2.1_01"` | +| `OXD_IMAGE_TAG` | oxd image tag | i.e `"4.2.1_02"` | | `OXPASSPORT_IMAGE_NAME` | oxPassport image repository name | i.e `"gluufederation/oxpassport"` | -| `OXPASSPORT_IMAGE_TAG` | oxPassport image tag | i.e `"4.2.1_01"` | +| `OXPASSPORT_IMAGE_TAG` | oxPassport image tag | i.e `"4.2.1_02"` | | `FIDO2_IMAGE_NAME` | FIDO2 image repository name | i.e `"gluufederation/oxpassport"` | -| `FIDO2_IMAGE_TAG` | FIDO2 image tag | i.e `"4.2.1_01"` | +| `FIDO2_IMAGE_TAG` | FIDO2 image tag | i.e `"4.2.1_02"` | | `SCIM_IMAGE_NAME` | SCIM image repository name | i.e `"gluufederation/oxpassport"` | -| `SCIM_IMAGE_TAG` | SCIM image tag | i.e `"4.2.1_01"` | +| `SCIM_IMAGE_TAG` | SCIM image tag | i.e `"4.2.1_02"` | | `OXSHIBBOLETH_IMAGE_NAME` | oxShibboleth image repository name | i.e `"gluufederation/oxshibboleth"` | -| `OXSHIBBOLETH_IMAGE_TAG` | oxShibboleth image tag | i.e `"4.2.1_01"` | +| `OXSHIBBOLETH_IMAGE_TAG` | oxShibboleth image tag | i.e `"4.2.1_02"` | | `OXTRUST_IMAGE_NAME` | oxTrust image repository name | i.e `"gluufederation/oxtrust"` | -| `OXTRUST_IMAGE_TAG` | oxTrust image tag | i.e `"4.2.1_01"` | +| `OXTRUST_IMAGE_TAG` | oxTrust image tag | i.e `"4.2.1_02"` | | `PERSISTENCE_IMAGE_NAME` | Persistence image repository name | i.e `"gluufederation/persistence"` | -| `PERSISTENCE_IMAGE_TAG` | Persistence image tag | i.e `"4.2.1_01"` | +| `PERSISTENCE_IMAGE_TAG` | Persistence image tag | i.e `"4.2.1_02"` | | `RADIUS_IMAGE_NAME` | Radius image repository name | i.e `"gluufederation/radius"` | -| `RADIUS_IMAGE_TAG` | Radius image tag | i.e `"4.2.1_01"` | +| `RADIUS_IMAGE_TAG` | Radius image tag | i.e `"4.2.1_02"` | | `GLUU_GATEWAY_IMAGE_NAME` | Gluu Gateway image repository name | i.e `"gluufederation/gluu-gateway"` | | `GLUU_GATEWAY_IMAGE_TAG` | Gluu Gateway image tag | i.e `"4.2.1"` | | `GLUU_GATEWAY_UI_IMAGE_NAME` | Gluu Gateway UI image repository name | i.e `"gluufederation/gluu-gateway-ui"` | | `GLUU_GATEWAY_UI_IMAGE_TAG` | Gluu Gateway UI image tag | i.e `"4.2.1"` | | `UPGRADE_IMAGE_NAME` | Gluu upgrade image repository name | i.e `"gluufederation/upgrade"` | -| `UPGRADE_IMAGE_TAG` | Gluu upgrade image tag | i.e `"4.2.1_01"` | +| `UPGRADE_IMAGE_TAG` | Gluu upgrade image tag | i.e `"4.2.1_02"` | | `CONFIRM_PARAMS` | Confirm using above options | `"Y"` or `"N"` | ### `APP_VOLUME_TYPE`-options -`APP_VOLUME_TYPE=""` but if `PERSISTENCE_BACKEND` is `WrenDS` options are : +`APP_VOLUME_TYPE=""` but if `PERSISTENCE_BACKEND` is `OpenDJ` options are : | Options | Deployemnt Architecture | Volume Type | | -------- | ------------------------ | --------------------------------------------- | diff --git a/pygluu/kubernetes/templates/casa/base/deployments.yaml b/pygluu/kubernetes/templates/casa/base/deployments.yaml index 90bea1fe6..acfb90925 100644 --- a/pygluu/kubernetes/templates/casa/base/deployments.yaml +++ b/pygluu/kubernetes/templates/casa/base/deployments.yaml @@ -35,7 +35,7 @@ spec: containers: - name: casa imagePullPolicy: Always - image: gluufederation/casa:4.2.1_01 + image: gluufederation/casa:4.2.1_02 command: - /bin/sh - -c diff --git a/pygluu/kubernetes/templates/casa/base/kustomization.yaml b/pygluu/kubernetes/templates/casa/base/kustomization.yaml index 23c6f5ca6..f400eb662 100644 --- a/pygluu/kubernetes/templates/casa/base/kustomization.yaml +++ b/pygluu/kubernetes/templates/casa/base/kustomization.yaml @@ -9,4 +9,4 @@ resources: - deployments.yaml images: - name: gluufederation/casa - newTag: 4.2.1_01 + newTag: 4.2.1_02 diff --git a/pygluu/kubernetes/templates/config/base/jobs.yaml b/pygluu/kubernetes/templates/config/base/jobs.yaml index 17188a593..579a84c98 100644 --- a/pygluu/kubernetes/templates/config/base/jobs.yaml +++ b/pygluu/kubernetes/templates/config/base/jobs.yaml @@ -14,7 +14,7 @@ spec: name: config-generate-params containers: - name: config-init-load - image: gluufederation/config-init:4.2.1_01 + image: gluufederation/config-init:4.2.1_02 volumeMounts: - mountPath: /opt/config-init/db/generate.json name: config-generate-params diff --git a/pygluu/kubernetes/templates/config/base/kustomization.yaml b/pygluu/kubernetes/templates/config/base/kustomization.yaml index cdde234b0..f04af96ee 100644 --- a/pygluu/kubernetes/templates/config/base/kustomization.yaml +++ b/pygluu/kubernetes/templates/config/base/kustomization.yaml @@ -11,7 +11,7 @@ generatorOptions: disableNameSuffixHash: true images: - name: gluufederation/config-init - newTag: 4.2.1_01 + newTag: 4.2.1_02 configMapGenerator: - name: gluu-config-cm literals: diff --git a/pygluu/kubernetes/templates/cr-rotate/base/daemonsets.yaml b/pygluu/kubernetes/templates/cr-rotate/base/daemonsets.yaml index 235c98360..2129c64af 100644 --- a/pygluu/kubernetes/templates/cr-rotate/base/daemonsets.yaml +++ b/pygluu/kubernetes/templates/cr-rotate/base/daemonsets.yaml @@ -18,7 +18,7 @@ spec: containers: - name: cr-rotate imagePullPolicy: Always - image: gluufederation/cr-rotate:4.2.1_01 + image: gluufederation/cr-rotate:4.2.1_02 envFrom: - configMapRef: name: gluu-config-cm diff --git a/pygluu/kubernetes/templates/cr-rotate/base/kustomization.yaml b/pygluu/kubernetes/templates/cr-rotate/base/kustomization.yaml index e6e18d7a7..476fcf702 100644 --- a/pygluu/kubernetes/templates/cr-rotate/base/kustomization.yaml +++ b/pygluu/kubernetes/templates/cr-rotate/base/kustomization.yaml @@ -10,4 +10,4 @@ resources: - services.yaml images: - name: gluufederation/cr-rotate - newTag: 4.2.1_01 + newTag: 4.2.1_02 diff --git a/pygluu/kubernetes/templates/fido2/base/deployments.yaml b/pygluu/kubernetes/templates/fido2/base/deployments.yaml index 9d0bcaaf3..6397b9834 100644 --- a/pygluu/kubernetes/templates/fido2/base/deployments.yaml +++ b/pygluu/kubernetes/templates/fido2/base/deployments.yaml @@ -21,7 +21,7 @@ spec: containers: - name: fido2 imagePullPolicy: Always - image: gluufederation/fido2:4.2.1_01 + image: gluufederation/fido2:4.2.1_02 command: - /bin/sh - -c diff --git a/pygluu/kubernetes/templates/fido2/base/kustomization.yaml b/pygluu/kubernetes/templates/fido2/base/kustomization.yaml index f6668c41c..1d7a41bab 100644 --- a/pygluu/kubernetes/templates/fido2/base/kustomization.yaml +++ b/pygluu/kubernetes/templates/fido2/base/kustomization.yaml @@ -9,4 +9,4 @@ resources: - deployments.yaml images: - name: gluufederation/fido2 - newTag: 4.2.1_01 + newTag: 4.2.1_02 diff --git a/pygluu/kubernetes/templates/gluu-gateway-ui/base/deployments.yaml b/pygluu/kubernetes/templates/gluu-gateway-ui/base/deployments.yaml index 6f7a2f542..df8a7c09a 100644 --- a/pygluu/kubernetes/templates/gluu-gateway-ui/base/deployments.yaml +++ b/pygluu/kubernetes/templates/gluu-gateway-ui/base/deployments.yaml @@ -32,7 +32,7 @@ spec: name: updatelbip containers: - name: gg-kong-ui - image: gluufederation/gluu-gateway-ui:4.2.1_01 + image: gluufederation/gluu-gateway-ui:4.2.1_02 command: - /bin/sh - -c diff --git a/pygluu/kubernetes/templates/gluu-gateway-ui/base/jobs.yaml b/pygluu/kubernetes/templates/gluu-gateway-ui/base/jobs.yaml index df0c4d996..4c4bd124a 100644 --- a/pygluu/kubernetes/templates/gluu-gateway-ui/base/jobs.yaml +++ b/pygluu/kubernetes/templates/gluu-gateway-ui/base/jobs.yaml @@ -17,7 +17,7 @@ spec: secretName: tls-certificate containers: - name: gg-ui-prepareation - image: gluufederation/gluu-gateway-ui:4.2.1_01 + image: gluufederation/gluu-gateway-ui:4.2.1_02 imagePullPolicy: Always env: - name: DB_PASSWORD diff --git a/pygluu/kubernetes/templates/gluu-gateway-ui/base/kustomization.yaml b/pygluu/kubernetes/templates/gluu-gateway-ui/base/kustomization.yaml index ec0e12d62..49f74adb0 100644 --- a/pygluu/kubernetes/templates/gluu-gateway-ui/base/kustomization.yaml +++ b/pygluu/kubernetes/templates/gluu-gateway-ui/base/kustomization.yaml @@ -11,7 +11,7 @@ resources: - ingress.yaml images: - name: gluufederation/gluu-gateway-ui - newTag: 4.2.1_01 + newTag: 4.2.1_02 configMapGenerator: - name: gg-ui-cm literals: diff --git a/pygluu/kubernetes/templates/gluu-gateway-ui/kong-all-in-one-db.yaml b/pygluu/kubernetes/templates/gluu-gateway-ui/kong-all-in-one-db.yaml index 691849bf7..c59740204 100644 --- a/pygluu/kubernetes/templates/gluu-gateway-ui/kong-all-in-one-db.yaml +++ b/pygluu/kubernetes/templates/gluu-gateway-ui/kong-all-in-one-db.yaml @@ -666,7 +666,7 @@ spec: value: /dev/stderr - name: KONG_PROXY_ERROR_LOG value: /dev/stderr - image: gluufederation/gluu-gateway:4.2.1_01 + image: gluufederation/gluu-gateway:4.2.1_02 lifecycle: preStop: exec: diff --git a/pygluu/kubernetes/templates/gluu-gateway-ui/kong-init-job.yaml b/pygluu/kubernetes/templates/gluu-gateway-ui/kong-init-job.yaml index 88b069685..d96f021bf 100644 --- a/pygluu/kubernetes/templates/gluu-gateway-ui/kong-init-job.yaml +++ b/pygluu/kubernetes/templates/gluu-gateway-ui/kong-init-job.yaml @@ -10,7 +10,7 @@ spec: restartPolicy: Never containers: - name: kong-migration - image: gluufederation/gluu-gateway:4.2.1_01 + image: gluufederation/gluu-gateway:4.2.1_02 env: - name: KONG_DATABASE value: "postgres" diff --git a/pygluu/kubernetes/templates/gluu_versions.json b/pygluu/kubernetes/templates/gluu_versions.json index 154f69033..56c2f3b28 100644 --- a/pygluu/kubernetes/templates/gluu_versions.json +++ b/pygluu/kubernetes/templates/gluu_versions.json @@ -1,78 +1,78 @@ { - "4.2.1_dev": { + "4.2.2_dev": { "CASA_IMAGE_NAME": "gluufederation/casa", - "CASA_IMAGE_TAG": "4.2.1_dev", + "CASA_IMAGE_TAG": "4.2.2_dev", "FIDO2_IMAGE_NAME": "gluufederation/fido2", - "FIDO2_IMAGE_TAG": "4.2.1_dev", + "FIDO2_IMAGE_TAG": "4.2.2_dev", "SCIM_IMAGE_NAME": "gluufederation/scim", - "SCIM_IMAGE_TAG": "4.2.1_dev", + "SCIM_IMAGE_TAG": "4.2.2_dev", "CONFIG_IMAGE_NAME": "gluufederation/config-init", - "CONFIG_IMAGE_TAG": "4.2.1_dev", + "CONFIG_IMAGE_TAG": "4.2.2_dev", "CACHE_REFRESH_ROTATE_IMAGE_NAME": "gluufederation/cr-rotate", - "CACHE_REFRESH_ROTATE_IMAGE_TAG": "4.2.1_dev", + "CACHE_REFRESH_ROTATE_IMAGE_TAG": "4.2.2_dev", "CERT_MANAGER_IMAGE_NAME": "gluufederation/certmanager", - "CERT_MANAGER_IMAGE_TAG": "4.2.1_dev", - "LDAP_IMAGE_NAME": "gluufederation/wrends", - "LDAP_IMAGE_TAG": "4.2.1_dev", + "CERT_MANAGER_IMAGE_TAG": "4.2.2_dev", + "LDAP_IMAGE_NAME": "gluufederation/opendj", + "LDAP_IMAGE_TAG": "4.2.2_dev", "JACKRABBIT_IMAGE_NAME": "gluufederation/jackrabbit", - "JACKRABBIT_IMAGE_TAG": "4.2.1_dev", + "JACKRABBIT_IMAGE_TAG": "4.2.2_dev", "OXAUTH_IMAGE_NAME": "gluufederation/oxauth", - "OXAUTH_IMAGE_TAG": "4.2.1_dev", + "OXAUTH_IMAGE_TAG": "4.2.2_dev", "OXD_IMAGE_NAME": "gluufederation/oxd-server", - "OXD_IMAGE_TAG": "4.2.1_dev", + "OXD_IMAGE_TAG": "4.2.2_dev", "OXPASSPORT_IMAGE_NAME": "gluufederation/oxpassport", - "OXPASSPORT_IMAGE_TAG": "4.2.1_dev", + "OXPASSPORT_IMAGE_TAG": "4.2.2_dev", "OXSHIBBOLETH_IMAGE_NAME": "gluufederation/oxshibboleth", - "OXSHIBBOLETH_IMAGE_TAG": "4.2.1_dev", + "OXSHIBBOLETH_IMAGE_TAG": "4.2.2_dev", "OXTRUST_IMAGE_NAME": "gluufederation/oxtrust", - "OXTRUST_IMAGE_TAG": "4.2.1_dev", + "OXTRUST_IMAGE_TAG": "4.2.2_dev", "PERSISTENCE_IMAGE_NAME": "gluufederation/persistence", - "PERSISTENCE_IMAGE_TAG": "4.2.1_dev", + "PERSISTENCE_IMAGE_TAG": "4.2.2_dev", "RADIUS_IMAGE_NAME": "gluufederation/radius", - "RADIUS_IMAGE_TAG": "4.2.1_dev", + "RADIUS_IMAGE_TAG": "4.2.2_dev", "GLUU_GATEWAY_IMAGE_NAME": "gluufederation/gluu-gateway", - "GLUU_GATEWAY_IMAGE_TAG": "4.2.1_dev", + "GLUU_GATEWAY_IMAGE_TAG": "4.2.2_dev", "GLUU_GATEWAY_UI_IMAGE_NAME": "gluufederation/gluu-gateway-ui", - "GLUU_GATEWAY_UI_IMAGE_TAG": "4.2.1_dev", + "GLUU_GATEWAY_UI_IMAGE_TAG": "4.2.2_dev", "UPGRADE_IMAGE_NAME": "gluufederation/upgrade", - "UPGRADE_IMAGE_TAG": "4.2.1_dev" + "UPGRADE_IMAGE_TAG": "4.2.2_dev" }, "4.2": { "CASA_IMAGE_NAME": "gluufederation/casa", - "CASA_IMAGE_TAG": "4.2.1_01", + "CASA_IMAGE_TAG": "4.2.1_02", "FIDO2_IMAGE_NAME": "gluufederation/fido2", - "FIDO2_IMAGE_TAG": "4.2.1_01", + "FIDO2_IMAGE_TAG": "4.2.1_02", "SCIM_IMAGE_NAME": "gluufederation/scim", - "SCIM_IMAGE_TAG": "4.2.1_01", + "SCIM_IMAGE_TAG": "4.2.1_02", "CONFIG_IMAGE_NAME": "gluufederation/config-init", - "CONFIG_IMAGE_TAG": "4.2.1_01", + "CONFIG_IMAGE_TAG": "4.2.1_02", "CACHE_REFRESH_ROTATE_IMAGE_NAME": "gluufederation/cr-rotate", - "CACHE_REFRESH_ROTATE_IMAGE_TAG": "4.2.1_01", + "CACHE_REFRESH_ROTATE_IMAGE_TAG": "4.2.1_02", "CERT_MANAGER_IMAGE_NAME": "gluufederation/certmanager", - "CERT_MANAGER_IMAGE_TAG": "4.2.1_01", - "LDAP_IMAGE_NAME": "gluufederation/wrends", - "LDAP_IMAGE_TAG": "4.2.1_01", + "CERT_MANAGER_IMAGE_TAG": "4.2.1_02", + "LDAP_IMAGE_NAME": "gluufederation/opendj", + "LDAP_IMAGE_TAG": "4.2.1_02", "JACKRABBIT_IMAGE_NAME": "gluufederation/jackrabbit", - "JACKRABBIT_IMAGE_TAG": "4.2.1_01", + "JACKRABBIT_IMAGE_TAG": "4.2.1_02", "OXAUTH_IMAGE_NAME": "gluufederation/oxauth", - "OXAUTH_IMAGE_TAG": "4.2.1_01", + "OXAUTH_IMAGE_TAG": "4.2.1_02", "OXD_IMAGE_NAME": "gluufederation/oxd-server", - "OXD_IMAGE_TAG": "4.2.1_01", + "OXD_IMAGE_TAG": "4.2.1_02", "OXPASSPORT_IMAGE_NAME": "gluufederation/oxpassport", - "OXPASSPORT_IMAGE_TAG": "4.2.1_01", + "OXPASSPORT_IMAGE_TAG": "4.2.1_02", "OXSHIBBOLETH_IMAGE_NAME": "gluufederation/oxshibboleth", - "OXSHIBBOLETH_IMAGE_TAG": "4.2.1_01", + "OXSHIBBOLETH_IMAGE_TAG": "4.2.1_02", "OXTRUST_IMAGE_NAME": "gluufederation/oxtrust", - "OXTRUST_IMAGE_TAG": "4.2.1_01", + "OXTRUST_IMAGE_TAG": "4.2.1_02", "PERSISTENCE_IMAGE_NAME": "gluufederation/persistence", - "PERSISTENCE_IMAGE_TAG": "4.2.1_01", + "PERSISTENCE_IMAGE_TAG": "4.2.1_02", "RADIUS_IMAGE_NAME": "gluufederation/radius", - "RADIUS_IMAGE_TAG": "4.2.1_01", + "RADIUS_IMAGE_TAG": "4.2.1_02", "GLUU_GATEWAY_IMAGE_NAME": "gluufederation/gluu-gateway", - "GLUU_GATEWAY_IMAGE_TAG": "4.2.1_01", + "GLUU_GATEWAY_IMAGE_TAG": "4.2.1_02", "GLUU_GATEWAY_UI_IMAGE_NAME": "gluufederation/gluu-gateway-ui", - "GLUU_GATEWAY_UI_IMAGE_TAG": "4.2.1_01", + "GLUU_GATEWAY_UI_IMAGE_TAG": "4.2.1_02", "UPGRADE_IMAGE_NAME": "gluufederation/upgrade", - "UPGRADE_IMAGE_TAG": "4.2.1_01" + "UPGRADE_IMAGE_TAG": "4.2.1_02" } } \ No newline at end of file diff --git a/pygluu/kubernetes/templates/helm/gluu-gateway-ui/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu-gateway-ui/Chart.yaml index ae3b2e1bb..f5bf7106d 100644 --- a/pygluu/kubernetes/templates/helm/gluu-gateway-ui/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu-gateway-ui/Chart.yaml @@ -1,11 +1,11 @@ # License terms and conditions for Gluu Cloud Native Edition: # https://www.apache.org/licenses/LICENSE-2.0 apiVersion: v1 -appVersion: "4.2.1_01" +appVersion: "4.2.1_02" home: https://gluu.org/docs/gg/ maintainers: - name: Gluu email: support@gluu.org description: Helm chart for gluu-gateway-ui service name: gluu-gateway-ui -version: 1.2.6 +version: 1.2.7 diff --git a/pygluu/kubernetes/templates/helm/gluu-gateway-ui/values.yaml b/pygluu/kubernetes/templates/helm/gluu-gateway-ui/values.yaml index 4aca8391a..fed354cea 100644 --- a/pygluu/kubernetes/templates/helm/gluu-gateway-ui/values.yaml +++ b/pygluu/kubernetes/templates/helm/gluu-gateway-ui/values.yaml @@ -3,7 +3,7 @@ replicaCount: 1 image: repository: gluufederation/gluu-gateway-ui - tag: 4.2.1_01 + tag: 4.2.1_02 pullPolicy: Always cloud: enabled: true diff --git a/pygluu/kubernetes/templates/helm/gluu-upgrade/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu-upgrade/Chart.yaml index 285f2e796..e1e821bc7 100644 --- a/pygluu/kubernetes/templates/helm/gluu-upgrade/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu-upgrade/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: gluu-upgrade description: A Helm chart for upgrading gluu server type: application -version: 1.2.6 -appVersion: 4.2.1_01 +version: 1.2.7 +appVersion: 4.2.1_02 maintainers: - name: Gluu email: support@gluu.org diff --git a/pygluu/kubernetes/templates/helm/gluu-upgrade/values.yaml b/pygluu/kubernetes/templates/helm/gluu-upgrade/values.yaml index 642b62621..72726af31 100644 --- a/pygluu/kubernetes/templates/helm/gluu-upgrade/values.yaml +++ b/pygluu/kubernetes/templates/helm/gluu-upgrade/values.yaml @@ -3,7 +3,7 @@ gluuReleaseName: cv # CHANGE image: repository: gluufederation/upgrade - tag: 4.2.1_01 + tag: 4.2.1_02 resources: {} # requests: diff --git a/pygluu/kubernetes/templates/helm/gluu/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/Chart.yaml index b98d5e3fb..f6943eaad 100644 --- a/pygluu/kubernetes/templates/helm/gluu/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/Chart.yaml @@ -1,79 +1,79 @@ # License terms and conditions for Gluu Cloud Native Edition: # https://www.apache.org/licenses/LICENSE-2.0 apiVersion: v2 -appVersion: "4.2.1_01" +appVersion: "4.2.1_02" home: https://www.gluu.org maintainers: - name: Gluu email: support@gluu.org description: A Helm chart for Gluu IDP name: gluu -version: 1.2.6 +version: 1.2.7 dependencies: - name: config condition: global.config.enabled - version: 1.2.6 + version: 1.2.7 - name: opendj condition: global.opendj.enabled - version: 1.2.6 + version: 1.2.7 - name: jackrabbit condition: global.jackrabbit.enabled - version: 1.2.6 + version: 1.2.7 - name: oxauth condition: global.oxauth.enabled - version: 1.2.6 + version: 1.2.7 - name: fido2 condition: global.fido2.enabled - version: 1.2.6 + version: 1.2.7 - name: scim condition: global.scim.enabled - version: 1.2.6 + version: 1.2.7 - name: oxtrust condition: global.oxtrust.enabled - version: 1.2.6 + version: 1.2.7 - name: nginx-ingress condition: global.nginx-ingress.enabled - version: 1.2.6 + version: 1.2.7 - name: oxshibboleth condition: global.oxshibboleth.enabled - version: 1.2.6 + version: 1.2.7 - name: oxpassport - version: 1.2.6 + version: 1.2.7 condition: config.configmap.gluuPassportEnabled - name: casa - version: 1.2.6 + version: 1.2.7 condition: config.configmap.gluuCasaEnabled - name: oxauth-key-rotation condition: global.oxauth-key-rotation.enabled - version: 1.2.6 + version: 1.2.7 - name: cr-rotate - version: 1.2.6 + version: 1.2.7 condition: global.cr-rotate.enabled - name: radius condition: config.configmap.gluuRadiusEnabled - version: 1.2.6 + version: 1.2.7 - name: oxd-server condition: global.oxd-server.enabled - version: 1.2.6 + version: 1.2.7 - name: persistence condition: global.persistence.enabled - version: 1.2.6 + version: 1.2.7 - name: gluu-istio-ingress condition: global.istio.ingress - version: 1.2.6 + version: 1.2.7 diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/casa/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/casa/Chart.yaml index d9db5a433..8197ee5e8 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/casa/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/casa/Chart.yaml @@ -1,10 +1,10 @@ # License terms and conditions for Gluu Cloud Native Edition: # https://www.apache.org/licenses/LICENSE-2.0 apiVersion: v1 -appVersion: "4.2.1_01" +appVersion: "4.2.1_02" description: A Helm chart for casa name: casa -version: 1.2.6 +version: 1.2.7 maintainers: - name: Gluu home: https://gluu.org/docs/casa/ diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/casa/values.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/casa/values.yaml index b7558423f..3e5cdd3be 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/casa/values.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/casa/values.yaml @@ -4,7 +4,7 @@ replicas: 1 image: repository: gluufederation/casa - tag: 4.2.1_01 + tag: 4.2.1_02 pullPolicy: Always imagePullSecrets: [] diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/config/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/config/Chart.yaml index 7bbc7b1fd..ccf19e2cf 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/config/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/config/Chart.yaml @@ -1,11 +1,11 @@ # License terms and conditions for Gluu Cloud Native Edition: # https://www.apache.org/licenses/LICENSE-2.0 apiVersion: v1 -appVersion: "4.2.1_01" +appVersion: "4.2.1_02" home: https://gluu.org/docs/gluu-server maintainers: - name: gluu email: support@gluu.org description: A Helm chart for Gluu server name: config -version: 1.2.6 +version: 1.2.7 diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/config/values.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/config/values.yaml index 16d4d2a27..2cd4ec6ad 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/config/values.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/config/values.yaml @@ -81,4 +81,4 @@ fullNameOverride: "" image: repository: gluufederation/config-init - tag: 4.2.1_01 + tag: 4.2.1_02 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 691d5e4d9..7235a0956 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/cr-rotate/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/cr-rotate/Chart.yaml @@ -1,10 +1,10 @@ # License terms and conditions for Gluu Cloud Native Edition: # https://www.apache.org/licenses/LICENSE-2.0 apiVersion: v1 -appVersion: "4.2.1_01" +appVersion: "4.2.1_02" description: A Helm chart for Kubernetes name: cr-rotate -version: 1.2.6 +version: 1.2.7 maintainers: - name: Gluu email: support@gluu.org diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/cr-rotate/values.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/cr-rotate/values.yaml index 57219c502..57a8f8a9d 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/cr-rotate/values.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/cr-rotate/values.yaml @@ -3,7 +3,7 @@ # Default values for cr-rotate. image: repository: gluufederation/cr-rotate - tag: 4.2.1_01 + tag: 4.2.1_02 pullPolicy: Always nameOverride: "" diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/fido2/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/fido2/Chart.yaml index c72cff135..3756dec41 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/fido2/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/fido2/Chart.yaml @@ -1,11 +1,11 @@ # License terms and conditions for Gluu Cloud Native Edition: # https://www.apache.org/licenses/LICENSE-2.0 apiVersion: v1 -appVersion: "4.2.1_01" +appVersion: "4.2.1_02" home: https://gluu.org/docs/gluu-server maintainers: - name: Gluu email: support@gluu.org description: Helm chart for fido2 service name: fido2 -version: 1.2.6 +version: 1.2.7 diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/fido2/values.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/fido2/values.yaml index 4638099a2..de8c011ff 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/fido2/values.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/fido2/values.yaml @@ -3,7 +3,7 @@ image: repository: gluufederation/fido2 - tag: 4.2.1_01 + tag: 4.2.1_02 pullPolicy: Always replicas: 1 #Resources for the deployment 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 ebf570e34..89bae381d 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,5 +2,5 @@ apiVersion: v2 name: gluu-istio-ingress description: Istio ingress integration files type: application -version: 1.2.6 -appVersion: 4.2.1_01 +version: 1.2.7 +appVersion: 4.2.1_02 diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/jackrabbit/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/jackrabbit/Chart.yaml index aec63cd31..8a8ba6f9e 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/jackrabbit/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/jackrabbit/Chart.yaml @@ -1,11 +1,11 @@ # License terms and conditions for Gluu Cloud Native Edition: # https://www.apache.org/licenses/LICENSE-2.0 apiVersion: v1 -appVersion: "4.2.1_01" +appVersion: "4.2.1_02" home: https://gluu.org/docs/gluu-server maintainers: - name: Gluu email: support@gluu.org description: A Helm chart for jackrabbit content repository name: jackrabbit -version: 1.2.6 \ No newline at end of file +version: 1.2.7 \ No newline at end of file diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/jackrabbit/values.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/jackrabbit/values.yaml index 545ac7005..4e376173d 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/jackrabbit/values.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/jackrabbit/values.yaml @@ -14,7 +14,7 @@ secrets: image: repository: gluufederation/jackrabbit - tag: 4.2.1_01 + tag: 4.2.1_02 pullPolicy: Always storage: diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/nginx/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/nginx/Chart.yaml index 550d5d2ce..7bd6037c8 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/nginx/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/nginx/Chart.yaml @@ -1,10 +1,10 @@ # License terms and conditions for Gluu Cloud Native Edition: # https://www.apache.org/licenses/LICENSE-2.0 apiVersion: v1 -appVersion: "4.2.1_01" +appVersion: "4.2.1_02" description: nginx-ingress chart name: nginx-ingress -version: 1.2.6 +version: 1.2.7 maintainers: - name: Gluu email: support@gluu.org diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/opendj/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/opendj/Chart.yaml index bc482fa93..1a366f18f 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/opendj/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/opendj/Chart.yaml @@ -1,11 +1,11 @@ # License terms and conditions for Gluu Cloud Native Edition: # https://www.apache.org/licenses/LICENSE-2.0 apiVersion: v1 -appVersion: "4.2.1_01" +appVersion: "4.2.1_02" home: https://gluu.org/docs/gluu-server maintainers: - name: Gluu email: support@gluu.org -description: A Helm chart for wrends/opendj server +description: A Helm chart for the opendj server name: opendj -version: 1.2.6 \ No newline at end of file +version: 1.2.7 \ No newline at end of file diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/opendj/values.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/opendj/values.yaml index b3c7b359e..b9b35fa41 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/opendj/values.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/opendj/values.yaml @@ -9,8 +9,8 @@ replicas: 1 service: ldapServiceName: opendj image: - repository: gluufederation/wrends - tag: 4.2.1_01 + repository: gluufederation/opendj + tag: 4.2.1_02 pullPolicy: Always persistence: 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 d303dbd1e..3cbfdfc05 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 @@ -1,10 +1,10 @@ # License terms and conditions for Gluu Cloud Native Edition: # https://www.apache.org/licenses/LICENSE-2.0 apiVersion: v1 -appVersion: "4.2.1_01" +appVersion: "4.2.1_02" description: A Helm chart for Kubernetes name: oxauth-key-rotation -version: 1.2.6 +version: 1.2.7 maintainers: - name: Gluu email: support@gluu.org diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxauth-key-rotation/values.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/oxauth-key-rotation/values.yaml index ecca3b5e4..ee0cd5a53 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/oxauth-key-rotation/values.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/oxauth-key-rotation/values.yaml @@ -3,7 +3,7 @@ # Default values for oxauth-key-rotation. image: repository: gluufederation/certmanager - tag: 4.2.1_01 + tag: 4.2.1_02 pullPolicy: Always keysLife: 48 nameOverride: "" diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxauth/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/oxauth/Chart.yaml index 4807f619e..20020220a 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/oxauth/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/oxauth/Chart.yaml @@ -1,11 +1,11 @@ # License terms and conditions for Gluu Cloud Native Edition: # https://www.apache.org/licenses/LICENSE-2.0 apiVersion: v1 -appVersion: "4.2.1_01" +appVersion: "4.2.1_02" home: https://gluu.org/docs/gluu-server maintainers: - name: Gluu email: support@gluu.org description: Helm chart for oxauth service name: oxauth -version: 1.2.6 +version: 1.2.7 diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxauth/values.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/oxauth/values.yaml index 8a51e17ff..63ec8c650 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/oxauth/values.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/oxauth/values.yaml @@ -2,7 +2,7 @@ # https://www.apache.org/licenses/LICENSE-2.0 image: repository: gluufederation/oxauth - tag: 4.2.1_01 + tag: 4.2.1_02 pullPolicy: Always replicas: 1 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 88fe66f8e..bb5f66baf 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/oxd-server/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/oxd-server/Chart.yaml @@ -1,10 +1,10 @@ # License terms and conditions for Gluu Cloud Native Edition: # https://www.apache.org/licenses/LICENSE-2.0 apiVersion: v1 -appVersion: "4.2.1_01" +appVersion: "4.2.1_02" description: oxd-server chart name: oxd-server -version: 1.2.6 +version: 1.2.7 maintainers: - name: Gluu email: support@gluu.org diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxd-server/values.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/oxd-server/values.yaml index d5558f961..ab70fc51e 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/oxd-server/values.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/oxd-server/values.yaml @@ -7,7 +7,7 @@ service: oxdServerServiceName: oxd-server image: repository: gluufederation/oxd-server - tag: 4.2.1_01 + tag: 4.2.1_02 pullPolicy: Always nameOverride: "" diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxpassport/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/oxpassport/Chart.yaml index e24024f05..ab15e96fe 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/oxpassport/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/oxpassport/Chart.yaml @@ -1,10 +1,10 @@ # License terms and conditions for Gluu Cloud Native Edition: # https://www.apache.org/licenses/LICENSE-2.0 apiVersion: v1 -appVersion: "4.2.1_01" +appVersion: "4.2.1_02" description: oxpassport Helm chart name: oxpassport -version: 1.2.6 +version: 1.2.7 maintainers: - name: Gluu email: support@gluu.org diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxpassport/values.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/oxpassport/values.yaml index dd4691da2..329833f5e 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/oxpassport/values.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/oxpassport/values.yaml @@ -5,7 +5,7 @@ replicas: 1 image: repository: gluufederation/oxpassport - tag: 4.2.1_01 + tag: 4.2.1_02 pullPolicy: Always nameOverride: "" diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxshibboleth/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/oxshibboleth/Chart.yaml index acc4c022f..4d6861272 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/oxshibboleth/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/oxshibboleth/Chart.yaml @@ -1,10 +1,10 @@ # License terms and conditions for Gluu Cloud Native Edition: # https://www.apache.org/licenses/LICENSE-2.0 apiVersion: v1 -appVersion: "4.2.1_01" +appVersion: "4.2.1_02" description: oxshibboleth Helm chart name: oxshibboleth -version: 1.2.6 +version: 1.2.7 maintainers: - name: Gluu email: support@gluu.org diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxshibboleth/values.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/oxshibboleth/values.yaml index 8d2b9052f..898b8ba68 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/oxshibboleth/values.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/oxshibboleth/values.yaml @@ -5,7 +5,7 @@ replicas: 1 image: repository: gluufederation/oxshibboleth - tag: 4.2.1_01 + tag: 4.2.1_02 pullPolicy: Always nameOverride: "" diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxtrust/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/oxtrust/Chart.yaml index 640f19264..50ae4ace3 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/oxtrust/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/oxtrust/Chart.yaml @@ -1,10 +1,10 @@ # License terms and conditions for Gluu Cloud Native Edition: # https://www.apache.org/licenses/LICENSE-2.0 apiVersion: v1 -appVersion: "4.2.1_01" +appVersion: "4.2.1_02" description: oxtrust Helm chart name: oxtrust -version: 1.2.6 +version: 1.2.7 maintainers: - name: Gluu home: https://gluu.org/docs/gluu-server diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxtrust/values.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/oxtrust/values.yaml index 44fcf9246..1380f3e28 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/oxtrust/values.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/oxtrust/values.yaml @@ -5,7 +5,7 @@ replicas: 1 image: repository: gluufederation/oxtrust - tag: 4.2.1_01 + tag: 4.2.1_02 pullPolicy: Always service: diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/persistence/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/persistence/Chart.yaml index dc72c5c47..b94d4c65f 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/persistence/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/persistence/Chart.yaml @@ -1,10 +1,10 @@ # License terms and conditions for Gluu Cloud Native Edition: # https://www.apache.org/licenses/LICENSE-2.0 apiVersion: v1 -appVersion: "4.2.1_01" +appVersion: "4.2.1_02" description: A Helm chart for persistence layer for Gluu server name: persistence -version: 1.2.6 +version: 1.2.7 maintainers: - name: Gluu email: support@gluu.org diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/persistence/values.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/persistence/values.yaml index d529c6c5d..6d2dfdd9e 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/persistence/values.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/persistence/values.yaml @@ -5,7 +5,7 @@ replicaCount: 1 image: repository: gluufederation/persistence - tag: 4.2.1_01 + tag: 4.2.1_02 pullPolicy: Always imagePullSecrets: [] diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/radius/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/radius/Chart.yaml index 99260a0f5..0734720a8 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/radius/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/radius/Chart.yaml @@ -1,10 +1,10 @@ # License terms and conditions for Gluu Cloud Native Edition: # https://www.apache.org/licenses/LICENSE-2.0 apiVersion: v1 -appVersion: "4.2.1_01" +appVersion: "4.2.1_02" description: Radius Helm chart name: radius -version: 1.2.6 +version: 1.2.7 maintainers: - name: Gluu email: support@gluu.org diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/radius/values.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/radius/values.yaml index 94ac2b059..c2d5d0477 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/radius/values.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/radius/values.yaml @@ -5,7 +5,7 @@ replicas: 1 image: repository: gluufederation/radius - tag: 4.2.1_01 + tag: 4.2.1_02 pullPolicy: Always nameOverride: "" diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/scim/Chart.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/scim/Chart.yaml index 603e3c79f..8e932803d 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/scim/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/scim/Chart.yaml @@ -8,4 +8,4 @@ maintainers: email: support@gluu.org description: Helm chart for SCIM name: scim -version: 1.2.6 +version: 1.2.7 diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/scim/values.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/scim/values.yaml index c394ac51c..55b9a91e3 100644 --- a/pygluu/kubernetes/templates/helm/gluu/charts/scim/values.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/charts/scim/values.yaml @@ -2,7 +2,7 @@ # https://www.apache.org/licenses/LICENSE-2.0 image: repository: gluufederation/scim - tag: 4.2.1_01 + tag: 4.2.1_02 pullPolicy: Always #Resources for the deployment diff --git a/pygluu/kubernetes/templates/helm/gluu/values.yaml b/pygluu/kubernetes/templates/helm/gluu/values.yaml index c89ab770d..b0960eb91 100644 --- a/pygluu/kubernetes/templates/helm/gluu/values.yaml +++ b/pygluu/kubernetes/templates/helm/gluu/values.yaml @@ -1,6 +1,3 @@ -# License terms and conditions for Gluu Cloud Native Edition: -# https://www.apache.org/licenses/LICENSE-2.0 -#global values to be used across charts global: istio: ingress: false @@ -10,8 +7,6 @@ global: ingress: false cloud: testEnviroment: false - # OpenDJ and Jackrabbit storage class - # microk8s.io/hostpath, k8s.io/minikube-hostpath, kubernetes.io/aws-ebs, dobs.csi.digitalocean.com, openebs.io/local provisioner: k8s.io/minikube-hostpath pool: default fsType: ext4 @@ -19,93 +14,59 @@ global: azureStorageAccountType: Standard_LRS azureStorageKind: Managed reclaimPolicy: Retain - # Networking configs - lbIp: "" # SHOULD BE CHANGED FOR CLOUD + lbIp: "" domain: demoexample.gluu.org - # specify if the domain above is registered or not. - isDomainRegistered: "false" # "true" or "false" - #persistence types and options - # options: ldap/couchbase/hybrid + isDomainRegistered: "false" gluuPersistenceType: couchbase gluuJackrabbitCluster: "true" - # Enable installation of services oxauth: enabled: true - fido2: enabled: false - scim: enabled: false - config: enabled: true - jackrabbit: enabled: true - persistence: enabled: true - oxtrust: enabled: true - opendj: enabled: true - oxshibboleth: enabled: false - oxd-server: - enabled: false - + enabled: false nginx-ingress: enabled: true - oxauth-key-rotation: enabled: false - cr-rotate: - enabled: false - -# Required environment variables for generating Gluu server initial config -# values for config-init sub-chart + enabled: false config: orgName: Gluu - # email address of the administrator usually. Used for certificate creation email: support@gluu.com - # adminPass is administrator password for oxTrust adminPass: P@ssw0rd - # ldapPass is the password for LDAP ldapPass: P@ssw0rd - #redisPass is the password for redis admin if used redisPass: P@assw0rd - # organisation location details countryCode: US state: TX city: Austin configmap: gluuOxdApplicationCertCn: oxd-server gluuOxdAdminCertCn: oxd-server - # used only if GLUU_PERSISTENCE_TYPE is couchbase or hybrid - # NOTE: For the CB instalation please check the documentation gluuCouchbaseCrt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURlakNDQW1LZ0F3SUJBZ0lKQUwyem5UWlREUHFNTUEwR0NTcUdTSWIzRFFFQkN3VUFNQzB4S3pBcEJnTlYKQkFNTUlpb3VZMkpuYkhWMUxtUmxabUYxYkhRdWMzWmpMbU5zZFhOMFpYSXViRzlqWVd3d0hoY05NakF3TWpBMQpNRGt4T1RVeFdoY05NekF3TWpBeU1Ea3hPVFV4V2pBdE1Tc3dLUVlEVlFRRERDSXFMbU5pWjJ4MWRTNWtaV1poCmRXeDBMbk4yWXk1amJIVnpkR1Z5TG14dlkyRnNNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUIKQ2dLQ0FRRUFycmQ5T3lvSnRsVzhnNW5nWlJtL2FKWjJ2eUtubGU3dVFIUEw4Q2RJa1RNdjB0eHZhR1B5UkNQQgo3RE00RTFkLzhMaU5takdZZk41QjZjWjlRUmNCaG1VNmFyUDRKZUZ3c0x0cTFGT3MxaDlmWGo3d3NzcTYrYmlkCjV6Umw3UEE0YmdvOXVkUVRzU1UrWDJUUVRDc0dxVVVPWExrZ3NCMjI0RDNsdkFCbmZOeHcvYnFQa2ZCQTFxVzYKVXpxellMdHN6WE5GY0dQMFhtU3c4WjJuaFhhUGlva2pPT2dyMkMrbVFZK0htQ2xGUWRpd2g2ZjBYR0V0STMrKwoyMStTejdXRkF6RlFBVUp2MHIvZnk4TDRXZzh1YysvalgwTGQrc2NoQTlNQjh3YmJORUp2ZjNMOGZ5QjZ0cTd2CjF4b0FnL0g0S1dJaHdqSEN0dFVnWU1oU0xWV3UrUUlEQVFBQm80R2NNSUdaTUIwR0ExVWREZ1FXQkJTWmQxWU0KVGNIRVZjSENNUmp6ejczZitEVmxxREJkQmdOVkhTTUVWakJVZ0JTWmQxWU1UY0hFVmNIQ01Sanp6NzNmK0RWbApxS0V4cEM4d0xURXJNQ2tHQTFVRUF3d2lLaTVqWW1kc2RYVXVaR1ZtWVhWc2RDNXpkbU11WTJ4MWMzUmxjaTVzCmIyTmhiSUlKQUwyem5UWlREUHFNTUF3R0ExVWRFd1FGTUFNQkFmOHdDd1lEVlIwUEJBUURBZ0VHTUEwR0NTcUcKU0liM0RRRUJDd1VBQTRJQkFRQk9meTVWSHlKZCtWUTBXaUQ1aSs2cmhidGNpSmtFN0YwWVVVZnJ6UFN2YWVFWQp2NElVWStWOC9UNnE4Mk9vVWU1eCtvS2dzbFBsL01nZEg2SW9CRnVtaUFqek14RTdUYUhHcXJ5dk13Qk5IKzB5CnhadG9mSnFXQzhGeUlwTVFHTEs0RVBGd3VHRlJnazZMRGR2ZEN5NVdxWW1MQWdBZVh5VWNaNnlHYkdMTjRPUDUKZTFiaEFiLzRXWXRxRHVydFJrWjNEejlZcis4VWNCVTRLT005OHBZN05aaXFmKzlCZVkvOEhZaVQ2Q0RRWWgyTgoyK0VWRFBHcFE4UkVsRThhN1ZLL29MemlOaXFyRjllNDV1OU1KdjM1ZktmNUJjK2FKdWduTGcwaUZUYmNaT1prCkpuYkUvUENIUDZFWmxLaEFiZUdnendtS1dDbTZTL3g0TklRK2JtMmoKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= gluuCouchbasePass: P@ssw0rd gluuCouchbaseSuperUserPass: P@ssw0rd gluuCouchbaseSuperUser: admin - # gluuCouchbaseUrl is the couchbase service name gluuCouchbaseUrl: cbgluu.default.svc.cluster.local gluuCouchbaseUser: gluu - # gluuCouchbasePassFile is the location of password file for gluu user. gluuCouchbasePassFile: /etc/gluu/conf/couchbase_password gluuCouchbaseSuperUserPassFile: /etc/gluu/conf/couchbase_superuser_password - - # gluuCouchbaseCertFile location of gluuCouchbaseCertFile: /etc/certs/couchbase.crt - # options: default/user/site/cache/statistic - # used only if GLUU_PERSISTENCE_TYPE is ldap or hybrid gluuPersistenceLdapMapping: default - # options REDIS/NATIVE_PERSISTENCE gluuCacheType: NATIVE_PERSISTENCE gluuSyncShibManifests: false gluuSyncCasaManifests: false @@ -113,7 +74,6 @@ config: configAdapterName: kubernetes containerMetadataName: kubernetes configSecretAdapter: kubernetes - # If REDIS is the Cache Type or if going to be used with oxd gluuRedisUrl: redis:6379 gluuRedisUseSsl: "false" gluuRedisType: STANDALONE @@ -124,7 +84,6 @@ config: gluuOxdServerUrl: oxd-server:8443 gluuOxdBindIpAddresses: "*" gluuLdapUrl: opendj:1636 - # Jackrabbit content repository gluuJackrabbitPostgresUser: jackrabbit gluuJackrabbitPostgresPasswordFile: /etc/gluu/conf/postgres_password gluuJackrabbitPostgresDatabaseName: jackrabbit @@ -135,40 +94,29 @@ config: gluuJackrabbitSyncInterval: 300 gluuJackrabbitUrl: http://jackrabbit:8080 gluuJackrabbitAdminIdFile: /etc/gluu/conf/jackrabbit_admin_id - # Options LOCAL / JCA (jackrabbit) gluuDocumentStoreType: JCA - lbAddr: "" # axx-109xx52.us-west-2.elb.amazonaws.com + lbAddr: "" ldapServiceName: opendj gluuOxtrustApiEnabled: false gluuOxtrustApiTestMode: false - # Auto install other services. If enabled the respective service chart will be installed gluuPassportEnabled: false gluuCasaEnabled: false gluuRadiusEnabled: false gluuSamlEnabled: false - image: repository: gluufederation/config-init - tag: 4.2.1_01 + tag: 4.2.1_02 resources: {} - # limits: - # cpu: 500m - # memory: 500Mi - # requests: - # cpu: 500m - # memory: 500Mi - nginx-ingress: - # ingress resources ingress: enabled: true path: / hosts: - - demoexample.gluu.org + - demoexample.gluu.org tls: - secretName: tls-certificate # DON'T change hosts: - - demoexample.gluu.org + - demoexample.gluu.org jackrabbit: service: @@ -180,9 +128,8 @@ jackrabbit: size: 5Gi image: repository: gluufederation/jackrabbit - tag: 4.2.1_01 + tag: 4.2.1_02 pullPolicy: Always - # default resource limits resources: limits: cpu: 1500m @@ -190,20 +137,16 @@ jackrabbit: requests: cpu: 1500m memory: 1000Mi - opendj: - # options true/false : must be enabled if cache type is REDIS service: ldapServiceName: opendj replicas: 1 persistence: size: 5Gi - image: - repository: gluufederation/wrends - tag: 4.2.1_01 + repository: gluufederation/opendj + tag: 4.2.1_02 pullPolicy: Always - # default resource limits resources: limits: cpu: 1500m @@ -211,31 +154,20 @@ opendj: requests: cpu: 1500m memory: 2000Mi - -# persistence layer persistence: image: repository: gluufederation/persistence - tag: 4.2.1_01 + tag: 4.2.1_02 pullPolicy: Always - # default resource limits resources: {} - # limits: - # cpu: 500m - # memory: 500Mi - # requests: - # cpu: 500m - # memory: 500Mi - oxauth: service: oxAuthServiceName: oxauth replicas: 1 image: repository: gluufederation/oxauth - tag: 4.2.1_01 + tag: 4.2.1_02 pullPolicy: Always - # default resource limits resources: limits: cpu: 2500m @@ -243,16 +175,14 @@ oxauth: requests: cpu: 2500m memory: 2500Mi - oxtrust: service: oxTrustServiceName: oxtrust replicas: 1 image: repository: gluufederation/oxtrust - tag: 4.2.1_01 + tag: 4.2.1_02 pullPolicy: Always - # default resource limits resources: limits: cpu: 1000m @@ -260,16 +190,14 @@ oxtrust: requests: cpu: 1000m memory: 1000Mi - fido2: service: fido2ServiceName: fido2 replicas: 1 image: repository: gluufederation/fido2 - tag: 4.2.1_01 + tag: 4.2.1_02 pullPolicy: Always - # default resource limits resources: limits: cpu: 500m @@ -277,15 +205,13 @@ fido2: requests: cpu: 500m memory: 500Mi - scim: service: scimServiceName: scim image: repository: gluufederation/scim - tag: 4.2.1_01 + tag: 4.2.1_02 pullPolicy: Always - # default resource limits resources: limits: cpu: 1000m @@ -293,17 +219,14 @@ scim: requests: cpu: 1000m memory: 1000Mi - oxd-server: service: - # This must match config.configMap.gluuOxdApplicationCertCn oxdServerServiceName: oxd-server replicas: 1 image: repository: gluufederation/oxd-server - tag: 4.2.1_01 + tag: 4.2.1_02 pullPolicy: Always - # default resource limits resources: limits: cpu: 1000m @@ -311,15 +234,13 @@ oxd-server: requests: cpu: 1000m memory: 400Mi - -# oxd-server has to be enabled to install Casa casa: service: casaServiceName: casa replicas: 1 image: repository: gluufederation/casa - tag: 4.2.1_01 + tag: 4.2.1_02 pullPolicy: Always resources: requests: @@ -328,65 +249,57 @@ casa: limits: memory: "500Mi" cpu: "500m" - -# oxpassport service installation is dependant on boolean value dependant set in persistence.configmap.gluuPassportEnabled oxpassport: service: oxPassportServiceName: oxpassport replicas: 1 image: repository: gluufederation/oxpassport - tag: 4.2.1_01 + tag: 4.2.1_02 pullPolicy: Always - # default resource limits - resources: + resources: limits: cpu: 700m memory: 900Mi requests: cpu: 700m memory: 900Mi - oxshibboleth: service: oxShibbolethServiceName: oxshibboleth replicas: 1 image: repository: gluufederation/oxshibboleth - tag: 4.2.1_01 + tag: 4.2.1_02 pullPolicy: Always - # default resource limits - resources: + resources: limits: cpu: 1000m memory: 1000Mi requests: cpu: 1000m memory: 1000Mi - radius: service: radiusServiceName: radius replicas: 1 image: repository: gluufederation/radius - tag: 4.2.1_01 + tag: 4.2.1_02 pullPolicy: Always - # default resource limits - resources: + resources: limits: cpu: 700m memory: 700Mi requests: cpu: 700m memory: 700Mi - cr-rotate: service: crRotateServiceName: cr-rotate image: repository: gluufederation/cr-rotate - tag: 4.2.1_01 + tag: 4.2.1_02 pullPolicy: Always resources: limits: @@ -395,19 +308,16 @@ cr-rotate: requests: cpu: 200m memory: 200Mi - oxauth-key-rotation: - # Keys life in hours keysLife: 48 image: repository: gluufederation/certmanager - tag: 4.2.1_01 + tag: 4.2.1_02 pullPolicy: Always - # default resource limits resources: limits: cpu: 300m memory: 300Mi requests: cpu: 300m - memory: 300Mi \ No newline at end of file + memory: 300Mi diff --git a/pygluu/kubernetes/templates/helm/ldap-backup/Chart.yaml b/pygluu/kubernetes/templates/helm/ldap-backup/Chart.yaml index 8f4082225..64789eec1 100644 --- a/pygluu/kubernetes/templates/helm/ldap-backup/Chart.yaml +++ b/pygluu/kubernetes/templates/helm/ldap-backup/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: ldap-backup description: A backup strategy for LDAP type: application -version: 1.2.6 -appVersion: 4.2.1_01 +version: 1.2.7 +appVersion: 4.2.1_02 maintainers: - name: Gluu email: support@gluu.org diff --git a/pygluu/kubernetes/templates/helm/ldap-backup/values.yaml b/pygluu/kubernetes/templates/helm/ldap-backup/values.yaml index e8fd3c4b2..f4c789ceb 100644 --- a/pygluu/kubernetes/templates/helm/ldap-backup/values.yaml +++ b/pygluu/kubernetes/templates/helm/ldap-backup/values.yaml @@ -31,8 +31,8 @@ fullnameOverride: "" restartPolicy: Never image: - repository: gluufederation/wrends - tag: 4.2.1_01 + repository: gluufederation/opendj + tag: 4.2.1_02 pullPolicy: Always serviceAccount: diff --git a/pygluu/kubernetes/templates/jackrabbit/base/kustomization.yaml b/pygluu/kubernetes/templates/jackrabbit/base/kustomization.yaml index 767547910..1904745d0 100644 --- a/pygluu/kubernetes/templates/jackrabbit/base/kustomization.yaml +++ b/pygluu/kubernetes/templates/jackrabbit/base/kustomization.yaml @@ -9,4 +9,4 @@ resources: - services.yaml images: - name: gluufederation/jackrabbit - newTag: 4.2.1_01 + newTag: 4.2.1_02 diff --git a/pygluu/kubernetes/templates/jackrabbit/base/statefulsets.yaml b/pygluu/kubernetes/templates/jackrabbit/base/statefulsets.yaml index fe97a0c85..872dc8bc5 100644 --- a/pygluu/kubernetes/templates/jackrabbit/base/statefulsets.yaml +++ b/pygluu/kubernetes/templates/jackrabbit/base/statefulsets.yaml @@ -32,7 +32,7 @@ spec: containers: - name: jackrabbit imagePullPolicy: Always - image: gluufederation/jackrabbit:4.2.1_01 + image: gluufederation/jackrabbit:4.2.1_02 envFrom: - configMapRef: name: gluu-config-cm diff --git a/pygluu/kubernetes/templates/ldap/backup/cronjobs.yaml b/pygluu/kubernetes/templates/ldap/backup/cronjobs.yaml index a5d97951f..528765777 100644 --- a/pygluu/kubernetes/templates/ldap/backup/cronjobs.yaml +++ b/pygluu/kubernetes/templates/ldap/backup/cronjobs.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: backup - image: gluufederation/wrends:4.2.1_01 + image: gluufederation/opendj:4.2.1_02 envFrom: - configMapRef: name: opendj-backup-cm diff --git a/pygluu/kubernetes/templates/ldap/backup/kustomization.yaml b/pygluu/kubernetes/templates/ldap/backup/kustomization.yaml index 1adf5686a..110b6991e 100644 --- a/pygluu/kubernetes/templates/ldap/backup/kustomization.yaml +++ b/pygluu/kubernetes/templates/ldap/backup/kustomization.yaml @@ -7,8 +7,8 @@ commonLabels: resources: - cronjobs.yaml images: - - name: gluufederation/wrends - newTag: 4.2.1_01 + - name: gluufederation/opendj + newTag: 4.2.1_02 configMapGenerator: - name: opendj-backup-cm literals: diff --git a/pygluu/kubernetes/templates/ldap/base/kustomization.yaml b/pygluu/kubernetes/templates/ldap/base/kustomization.yaml index 0edc4f7e7..a9d8d9c33 100644 --- a/pygluu/kubernetes/templates/ldap/base/kustomization.yaml +++ b/pygluu/kubernetes/templates/ldap/base/kustomization.yaml @@ -8,5 +8,5 @@ resources: - statefulsets.yaml - services.yaml images: - - name: gluufederation/wrends - newTag: 4.2.1_01 + - name: gluufederation/opendj + newTag: 4.2.1_02 diff --git a/pygluu/kubernetes/templates/ldap/base/statefulsets.yaml b/pygluu/kubernetes/templates/ldap/base/statefulsets.yaml index 9e27a8f9e..aa470a0d1 100644 --- a/pygluu/kubernetes/templates/ldap/base/statefulsets.yaml +++ b/pygluu/kubernetes/templates/ldap/base/statefulsets.yaml @@ -32,7 +32,7 @@ spec: containers: - name: opendj imagePullPolicy: Always - image: gluufederation/wrends:4.2.1_01 + image: gluufederation/opendj:4.2.1_02 lifecycle: preStop: exec: diff --git a/pygluu/kubernetes/templates/oxauth-key-rotation/base/cronjobs.yaml b/pygluu/kubernetes/templates/oxauth-key-rotation/base/cronjobs.yaml index 23828821d..66ab923cb 100644 --- a/pygluu/kubernetes/templates/oxauth-key-rotation/base/cronjobs.yaml +++ b/pygluu/kubernetes/templates/oxauth-key-rotation/base/cronjobs.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: oxauth-key-rotation - image: gluufederation/certmanager:4.2.1_01 + image: gluufederation/certmanager:4.2.1_02 resources: requests: memory: "300Mi" diff --git a/pygluu/kubernetes/templates/oxauth-key-rotation/base/kustomization.yaml b/pygluu/kubernetes/templates/oxauth-key-rotation/base/kustomization.yaml index ae41612cb..3fe012daa 100644 --- a/pygluu/kubernetes/templates/oxauth-key-rotation/base/kustomization.yaml +++ b/pygluu/kubernetes/templates/oxauth-key-rotation/base/kustomization.yaml @@ -8,4 +8,4 @@ resources: - cronjobs.yaml images: - name: gluufederation/certmanager - newTag: 4.2.1_01 + newTag: 4.2.1_02 diff --git a/pygluu/kubernetes/templates/oxauth/base/deployments.yaml b/pygluu/kubernetes/templates/oxauth/base/deployments.yaml index 552743106..ed0b16635 100644 --- a/pygluu/kubernetes/templates/oxauth/base/deployments.yaml +++ b/pygluu/kubernetes/templates/oxauth/base/deployments.yaml @@ -21,7 +21,7 @@ spec: containers: - name: oxauth imagePullPolicy: Always - image: gluufederation/oxauth:4.2.1_01 + image: gluufederation/oxauth:4.2.1_02 command: - /bin/sh - -c @@ -50,15 +50,17 @@ spec: - mountPath: /scripts name: update-lb-ip livenessProbe: - httpGet: - path: /oxauth/restv1/health-check - port: 8080 + exec: + command: + - python3 + - /app/scripts/healthcheck.py initialDelaySeconds: 30 periodSeconds: 30 readinessProbe: - httpGet: - path: /oxauth/restv1/health-check - port: 8080 + exec: + command: + - python3 + - /app/scripts/healthcheck.py initialDelaySeconds: 25 periodSeconds: 25 hostAliases: diff --git a/pygluu/kubernetes/templates/oxauth/base/kustomization.yaml b/pygluu/kubernetes/templates/oxauth/base/kustomization.yaml index 99dfc845d..ad1370133 100644 --- a/pygluu/kubernetes/templates/oxauth/base/kustomization.yaml +++ b/pygluu/kubernetes/templates/oxauth/base/kustomization.yaml @@ -9,4 +9,4 @@ resources: - deployments.yaml images: - name: gluufederation/oxauth - newTag: 4.2.1_01 + newTag: 4.2.1_02 diff --git a/pygluu/kubernetes/templates/oxd-server/base/deployments.yaml b/pygluu/kubernetes/templates/oxd-server/base/deployments.yaml index 4772f9da0..443007b36 100644 --- a/pygluu/kubernetes/templates/oxd-server/base/deployments.yaml +++ b/pygluu/kubernetes/templates/oxd-server/base/deployments.yaml @@ -19,7 +19,7 @@ spec: containers: - name: oxd-server imagePullPolicy: Always - image: gluufederation/oxd-server:4.2.1_01 + image: gluufederation/oxd-server:4.2.1_02 command: - /bin/sh - -c diff --git a/pygluu/kubernetes/templates/oxd-server/base/kustomization.yaml b/pygluu/kubernetes/templates/oxd-server/base/kustomization.yaml index 6f5c1d007..443f1dba9 100644 --- a/pygluu/kubernetes/templates/oxd-server/base/kustomization.yaml +++ b/pygluu/kubernetes/templates/oxd-server/base/kustomization.yaml @@ -9,4 +9,4 @@ resources: - deployments.yaml images: - name: gluufederation/oxd-server - newTag: 4.2.1_01 \ No newline at end of file + newTag: 4.2.1_02 \ No newline at end of file diff --git a/pygluu/kubernetes/templates/oxpassport/base/deployments.yaml b/pygluu/kubernetes/templates/oxpassport/base/deployments.yaml index 0c906f8c9..62a860312 100644 --- a/pygluu/kubernetes/templates/oxpassport/base/deployments.yaml +++ b/pygluu/kubernetes/templates/oxpassport/base/deployments.yaml @@ -22,7 +22,7 @@ spec: containers: - name: oxpassport imagePullPolicy: Always - image: gluufederation/oxpassport:4.2.1_01 + image: gluufederation/oxpassport:4.2.1_02 resources: requests: memory: "900Mi" diff --git a/pygluu/kubernetes/templates/oxpassport/base/kustomization.yaml b/pygluu/kubernetes/templates/oxpassport/base/kustomization.yaml index 5c1821ff1..571db76dc 100644 --- a/pygluu/kubernetes/templates/oxpassport/base/kustomization.yaml +++ b/pygluu/kubernetes/templates/oxpassport/base/kustomization.yaml @@ -9,4 +9,4 @@ resources: - services.yaml images: - name: gluufederation/oxpassport - newTag: 4.2.1_01 + newTag: 4.2.1_02 diff --git a/pygluu/kubernetes/templates/oxshibboleth/base/kustomization.yaml b/pygluu/kubernetes/templates/oxshibboleth/base/kustomization.yaml index 4b2123a8f..2ae64bf71 100644 --- a/pygluu/kubernetes/templates/oxshibboleth/base/kustomization.yaml +++ b/pygluu/kubernetes/templates/oxshibboleth/base/kustomization.yaml @@ -9,4 +9,4 @@ resources: - services.yaml images: - name: gluufederation/oxshibboleth - newTag: 4.2.1_01 + newTag: 4.2.1_02 diff --git a/pygluu/kubernetes/templates/oxshibboleth/base/statefulsets.yaml b/pygluu/kubernetes/templates/oxshibboleth/base/statefulsets.yaml index 931265b7a..2ec894efd 100644 --- a/pygluu/kubernetes/templates/oxshibboleth/base/statefulsets.yaml +++ b/pygluu/kubernetes/templates/oxshibboleth/base/statefulsets.yaml @@ -25,7 +25,7 @@ spec: containers: - name: oxshibboleth imagePullPolicy: Always - image: gluufederation/oxshibboleth:4.2.1_01 + image: gluufederation/oxshibboleth:4.2.1_02 command: - /bin/sh - -c diff --git a/pygluu/kubernetes/templates/oxtrust/base/kustomization.yaml b/pygluu/kubernetes/templates/oxtrust/base/kustomization.yaml index a5f76b5d5..5e8167a4e 100644 --- a/pygluu/kubernetes/templates/oxtrust/base/kustomization.yaml +++ b/pygluu/kubernetes/templates/oxtrust/base/kustomization.yaml @@ -9,4 +9,4 @@ resources: - services.yaml images: - name: gluufederation/oxtrust - newTag: 4.2.1_01 + newTag: 4.2.1_02 diff --git a/pygluu/kubernetes/templates/oxtrust/base/statefulsets.yaml b/pygluu/kubernetes/templates/oxtrust/base/statefulsets.yaml index 940e710b8..bd7dc1f06 100644 --- a/pygluu/kubernetes/templates/oxtrust/base/statefulsets.yaml +++ b/pygluu/kubernetes/templates/oxtrust/base/statefulsets.yaml @@ -23,7 +23,7 @@ spec: containers: - name: oxtrust imagePullPolicy: Always - image: gluufederation/oxtrust:4.2.1_01 + image: gluufederation/oxtrust:4.2.1_02 command: - /bin/sh - -c @@ -52,15 +52,17 @@ spec: - mountPath: /scripts name: update-lb-ip livenessProbe: - httpGet: - path: /identity/restv1/health-check - port: 8080 + exec: + command: + - python3 + - /app/scripts/healthcheck.py initialDelaySeconds: 30 periodSeconds: 30 readinessProbe: - httpGet: - path: /identity/restv1/health-check - port: 8080 + exec: + command: + - python3 + - /app/scripts/healthcheck.py initialDelaySeconds: 25 periodSeconds: 25 hostAliases: diff --git a/pygluu/kubernetes/templates/persistence/base/jobs.yaml b/pygluu/kubernetes/templates/persistence/base/jobs.yaml index e456d6fd1..d84fa2938 100644 --- a/pygluu/kubernetes/templates/persistence/base/jobs.yaml +++ b/pygluu/kubernetes/templates/persistence/base/jobs.yaml @@ -10,7 +10,7 @@ spec: restartPolicy: Never containers: - name: persistence-load-job - image: gluufederation/persistence:4.2.1_01 + image: gluufederation/persistence:4.2.1_02 envFrom: - configMapRef: name: gluu-config-cm diff --git a/pygluu/kubernetes/templates/persistence/base/kustomization.yaml b/pygluu/kubernetes/templates/persistence/base/kustomization.yaml index f7dfc403b..cf090659e 100644 --- a/pygluu/kubernetes/templates/persistence/base/kustomization.yaml +++ b/pygluu/kubernetes/templates/persistence/base/kustomization.yaml @@ -8,5 +8,5 @@ resources: - jobs.yaml images: - name: gluufederation/persistence - newTag: 4.2.1_01 + newTag: 4.2.1_02 diff --git a/pygluu/kubernetes/templates/radius/base/deployments.yaml b/pygluu/kubernetes/templates/radius/base/deployments.yaml index b42b0b25e..3a68dd7cd 100644 --- a/pygluu/kubernetes/templates/radius/base/deployments.yaml +++ b/pygluu/kubernetes/templates/radius/base/deployments.yaml @@ -20,7 +20,7 @@ spec: containers: - name: radius imagePullPolicy: Always - image: gluufederation/radius:4.2.1_01 + image: gluufederation/radius:4.2.1_02 command: - /bin/sh - -c diff --git a/pygluu/kubernetes/templates/radius/base/kustomization.yaml b/pygluu/kubernetes/templates/radius/base/kustomization.yaml index 11e66c586..19bcb02e0 100644 --- a/pygluu/kubernetes/templates/radius/base/kustomization.yaml +++ b/pygluu/kubernetes/templates/radius/base/kustomization.yaml @@ -9,4 +9,4 @@ resources: - services.yaml images: - name: gluufederation/radius - newTag: 4.2.1_01 + newTag: 4.2.1_02 diff --git a/pygluu/kubernetes/templates/scim/base/deployments.yaml b/pygluu/kubernetes/templates/scim/base/deployments.yaml index 2f3c12468..2a18b89c9 100644 --- a/pygluu/kubernetes/templates/scim/base/deployments.yaml +++ b/pygluu/kubernetes/templates/scim/base/deployments.yaml @@ -21,7 +21,7 @@ spec: containers: - name: scim imagePullPolicy: Always - image: gluufederation/scim:4.2.1_01 + image: gluufederation/scim:4.2.1_02 command: - /bin/sh - -c diff --git a/pygluu/kubernetes/templates/scim/base/kustomization.yaml b/pygluu/kubernetes/templates/scim/base/kustomization.yaml index aa0a2b987..b05a9fca9 100644 --- a/pygluu/kubernetes/templates/scim/base/kustomization.yaml +++ b/pygluu/kubernetes/templates/scim/base/kustomization.yaml @@ -9,4 +9,4 @@ resources: - deployments.yaml images: - name: gluufederation/scim - newTag: 4.2.1_01 + newTag: 4.2.1_02 diff --git a/pygluu/kubernetes/templates/upgrade/base/jobs.yaml b/pygluu/kubernetes/templates/upgrade/base/jobs.yaml index 64c7d6c48..2f5c6d096 100644 --- a/pygluu/kubernetes/templates/upgrade/base/jobs.yaml +++ b/pygluu/kubernetes/templates/upgrade/base/jobs.yaml @@ -10,7 +10,7 @@ spec: restartPolicy: Never containers: - name: gluu-upgrade-job - image: gluufederation/upgrade:4.2.1_01 + image: gluufederation/upgrade:4.2.1_02 envFrom: - configMapRef: name: upgrade-cm diff --git a/pygluu/kubernetes/templates/upgrade/base/kustomization.yaml b/pygluu/kubernetes/templates/upgrade/base/kustomization.yaml index ac4a1b746..4dfd51282 100644 --- a/pygluu/kubernetes/templates/upgrade/base/kustomization.yaml +++ b/pygluu/kubernetes/templates/upgrade/base/kustomization.yaml @@ -8,7 +8,7 @@ resources: - jobs.yaml images: - name: gluufederation/upgrade - newTag: 4.2.1_01 + newTag: 4.2.1_02 configMapGenerator: - name: upgrade-cm literals: diff --git a/pygluu/kubernetes/terminal/images.py b/pygluu/kubernetes/terminal/images.py index f70245363..2831a220d 100644 --- a/pygluu/kubernetes/terminal/images.py +++ b/pygluu/kubernetes/terminal/images.py @@ -48,7 +48,7 @@ def prompt_and_set_setting(service, image_name_key, image_tag_key): # LDAP if self.settings.get("PERSISTENCE_BACKEND") == "hybrid" or \ self.settings.get("PERSISTENCE_BACKEND") == "ldap": - prompt_and_set_setting("WrenDS", "LDAP_IMAGE_NAME", "LDAP_IMAGE_TAG") + prompt_and_set_setting("OpenDJ", "LDAP_IMAGE_NAME", "LDAP_IMAGE_TAG") # Jackrabbit prompt_and_set_setting("jackrabbit", "JACKRABBIT_IMAGE_NAME", "JACKRABBIT_IMAGE_TAG") # OXAUTH diff --git a/pygluu/kubernetes/terminal/ldap.py b/pygluu/kubernetes/terminal/ldap.py index 2bb478153..6d756c792 100644 --- a/pygluu/kubernetes/terminal/ldap.py +++ b/pygluu/kubernetes/terminal/ldap.py @@ -32,7 +32,7 @@ def prompt_hybrid_ldap_held_data(self): if self.settings.get("HYBRID_LDAP_HELD_DATA") not in hybrid_ldap_map.values(): print("|------------------------------------------------------------------|") - print("| Hybrid [WrendDS + Couchbase] |") + print("| Hybrid [OpenDJ + Couchbase] |") print("|------------------------------------------------------------------|") print("| [1] Default |") print("| [2] User |") diff --git a/pygluu/kubernetes/terminal/persistencebackend.py b/pygluu/kubernetes/terminal/persistencebackend.py index 05c89618b..5ff2abee8 100644 --- a/pygluu/kubernetes/terminal/persistencebackend.py +++ b/pygluu/kubernetes/terminal/persistencebackend.py @@ -31,9 +31,9 @@ def prompt_persistence_backend(self): print("|------------------------------------------------------------------|") print("| Persistence layer |") print("|------------------------------------------------------------------|") - print("| [1] WrenDS [default] |") + print("| [1] OpenDJ [default] |") print("| [2] Couchbase |") - print("| [3] Hybrid(WrenDS + Couchbase) |") + print("| [3] Hybrid(OpenDJ + Couchbase) |") print("|------------------------------------------------------------------|") choice = click.prompt("Persistence layer", default=1) diff --git a/tests/terminal/test_version.py b/tests/terminal/test_version.py index 3feb2b4f8..fd489bb4d 100644 --- a/tests/terminal/test_version.py +++ b/tests/terminal/test_version.py @@ -13,15 +13,15 @@ def test_version_no_prompt(settings): @pytest.mark.parametrize("given, expected", [ - ("", "4.2.1_01"), # default if empty - ("4.2.1_dev", "4.2.1_dev"), # non-empty shouldn't be overriden + ("", "4.2.1_02"), # default if empty + ("4.2.2_dev", "4.2.2_dev"), # non-empty shouldn't be overriden ]) def test_version_merge_names_tags(settings, given, expected): import json from pygluu.kubernetes.terminal.version import PromptVersion with open("./gluu_versions.json", "w") as f: - json.dump({"4.2": {"LDAP_IMAGE_TAG": "4.2.1_01"}}, f) + json.dump({"4.2": {"LDAP_IMAGE_TAG": "4.2.1_02"}}, f) settings.set("GLUU_VERSION", "4.2") settings.set("LDAP_IMAGE_TAG", given)