Release installer 1.2.7

Release installer 1.2.7 with official Gluu 4.2.1 final.
GluuFederation · Sep 25, 2020 · 0211c78 · 0211c78
1 parent e5be1dd
commit 0211c78
Show file tree

Hide file tree

Showing 89 changed files with 276 additions and 347 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
 }
 }
diff --git 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: [email protected]
 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
@@ -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
@@ -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: [email protected]

diff --git 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: