chore(cloud-native)!: remove spanner support from OCI images (#10070)

* chore(cloud-native)!: remove spanner support from OCI images Signed-off-by: iromli <[email protected]> * chore: remove unused templates and scripts Signed-off-by: iromli <[email protected]> * chore: sync jans-pycloudlib Signed-off-by: iromli <[email protected]> * docs: fix refs * fix: remove from demo and monolith setup * chore: sync templates into images Signed-off-by: iromli <[email protected]> * docs: remove spanner references Signed-off-by: iromli <[email protected]> * docs: update refs --------- Signed-off-by: iromli <[email protected]> Co-authored-by: Mohammad Abudayyeh <[email protected]>
JanssenProject · Nov 12, 2024 · 5527f75 · 5527f75
1 parent 2fad780
commit 5527f75
Show file tree

Hide file tree

Showing 96 changed files with 284 additions and 1,643 deletions.
diff --git a/.github/workflows/test_docker_linux_installer.yml b/.github/workflows/test_docker_linux_installer.yml
@@ -21,7 +21,7 @@ jobs:
       max-parallel: 6
       matrix:
         # add '"pgsql" when supported
-        persistence-backends: ["MYSQL", "PGSQL", "LDAP", "COUCHBASE", "SPANNER"]
+        persistence-backends: ["MYSQL", "PGSQL", "COUCHBASE"]
         python-version: ["3.7"]
       fail-fast: false
     steps:

diff --git a/automation/rancher-partner-charts/questions.yaml b/automation/rancher-partner-charts/questions.yaml
@@ -58,11 +58,10 @@ questions:
   type: enum
   group: "Persistence"
   label: Gluu Persistence backend
-  description: "Persistence backend to run Gluu with couchbase|hybrid|sql|spanner"
+  description: "Persistence backend to run Gluu with couchbase|sql|"
   options:
     - "couchbase"
     - "hybrid"
-    - "spanner"
     - "sql"
 
 # Hybrid
@@ -132,35 +131,6 @@ questions:
   type: string
   label: SQL database name
   show_if: "global.cnPersistenceType=sql"
-# Spanner
-- variable: config.configmap.cnGoogleSpannerInstanceId
-  default: ""
-  group: "Persistence"
-  description: "The google spanner instance ID"
-  type: string
-  label: Google Spanner Instance ID
-  show_if: "global.cnPersistenceType=spanner"
-- variable: config.configmap.cnGoogleSpannerDatabaseId
-  default: ""
-  group: "Persistence"
-  description: "The google spanner database ID"
-  type: string
-  label: Google Spanner Database ID
-  show_if: "global.cnPersistenceType=spanner"
-- variable: config.configmap.cnGoogleSecretManagerServiceAccount
-  default: ""
-  group: "Persistence"
-  description: "The service account with access roles/secretmanager.admin to use Google secret manager and/or roles/spanner.databaseUser to use Spanner."
-  type: multiline
-  label: Google Spanner Service Account json
-  show_if: "global.cnPersistenceType=spanner"
-- variable: config.configmap.cnGoogleProjectId
-  default: ""
-  group: "Persistence"
-  description: "The Google Project ID"
-  type: string
-  label: Google Project ID
-  show_if: "global.cnPersistenceType=spanner"
 #Couchbase
 - variable: config.configmap.cnCouchbaseCrt
   default: ""

diff --git a/automation/startjanssenmonolithdemo.sh b/automation/startjanssenmonolithdemo.sh
@@ -12,7 +12,7 @@ if [[ ! "$JANS_FQDN" ]]; then
   read -rp "Enter Hostname [demoexample.jans.io]:                           " JANS_FQDN
 fi
 if [[ ! "$JANS_PERSISTENCE" ]]; then
-  read -rp "Enter persistence type [MYSQL|PGSQL|COUCHBASE[TEST]|SPANNER[TEST]]:                            " JANS_PERSISTENCE
+  read -rp "Enter persistence type [MYSQL|PGSQL]:                            " JANS_PERSISTENCE
 fi
 
 if [[ -z $EXT_IP ]]; then
@@ -72,7 +72,6 @@ if [[ "$JANS_BUILD_COMMIT" ]]; then
   python3 -c "from pathlib import Path ; import ruamel.yaml ; compose = Path('/tmp/jans/docker-jans-monolith/jans-mysql-compose.yml') ; yaml = ruamel.yaml.YAML() ; data = yaml.load(compose) ; data['services']['jans']['build'] = '.' ; del data['services']['jans']['image'] ; yaml.dump(data, compose)"
   python3 -c "from pathlib import Path ; import ruamel.yaml ; compose = Path('/tmp/jans/docker-jans-monolith/jans-postgres-compose.yml') ; yaml = ruamel.yaml.YAML() ; data = yaml.load(compose) ; data['services']['jans']['build'] = '.' ; del data['services']['jans']['image'] ; yaml.dump(data, compose)"
   python3 -c "from pathlib import Path ; import ruamel.yaml ; compose = Path('/tmp/jans/docker-jans-monolith/jans-couchbase-compose.yml') ; yaml = ruamel.yaml.YAML() ; data = yaml.load(compose) ; data['services']['jans']['build'] = '.' ; del data['services']['jans']['image'] ; yaml.dump(data, compose)"
-  python3 -c "from pathlib import Path ; import ruamel.yaml ; compose = Path('/tmp/jans/docker-jans-monolith/jans-spanner-compose.yml') ; yaml = ruamel.yaml.YAML() ; data = yaml.load(compose) ; data['services']['jans']['build'] = '.' ; del data['services']['jans']['image'] ; yaml.dump(data, compose)"
 fi
 # --
 if [[ "$IS_FQDN_REGISTERED" ]]; then
@@ -88,8 +87,6 @@ elif [[ $JANS_PERSISTENCE == "PGSQL" ]]; then
   bash /tmp/jans/docker-jans-monolith/up.sh postgres
 elif [[ $JANS_PERSISTENCE == "COUCHBASE" ]]; then
   bash /tmp/jans/docker-jans-monolith/up.sh couchbase
-elif [[ $JANS_PERSISTENCE == "SPANNER" ]]; then
-  bash /tmp/jans/docker-jans-monolith/up.sh spanner
 fi
 echo "$EXT_IP $JANS_FQDN" | sudo tee -a /etc/hosts > /dev/null
 jans_status="unhealthy"

diff --git a/demos/benchmarking/docker-jans-loadtesting-jmeter/Dockerfile b/demos/benchmarking/docker-jans-loadtesting-jmeter/Dockerfile
@@ -34,17 +34,8 @@ ENV FQDN="https://demoexample.jans.io" \
     USER_NUMBER_STARTING_POINT=0 \
     USER_NUMBER_ENDING_POINT=50000000 \
     LOAD_USERS_TO_COUCHBASE=false \
-    LOAD_USERS_TO_LDAP=false \
-    LOAD_USERS_TO_SPANNER=false \
     LOAD_USERS_TO_RDBMS=false \
     USER_SPLIT_PARALLEL_THREADS=20 \
-    GOOGLE_APPLICATION_CREDENTIALS=""\
-    GOOGLE_PROJECT_ID=""\
-    GOOGLE_SPANNER_INSTANCE_ID=""\
-    GOOGLE_SPANNER_DATABASE_ID=""\
-    LDAP_URL="opendj:1636" \
-    LDAP_PW="" \
-    LDAP_DN="cn=directory manager" \
     # pgsql or mysql
     RDBMS_TYPE="mysql" \
     RDBMS_DB="jans" \

diff --git a/demos/benchmarking/docker-jans-loadtesting-jmeter/README.md b/demos/benchmarking/docker-jans-loadtesting-jmeter/README.md
@@ -22,13 +22,8 @@ Installation depends on the set of environment variables shown below. These envi
 | `USER_NUMBER_STARTING_POINT`     | The user number to start from . This is appended to the username i.e test_user0                               | `0`                    |
 | `USER_NUMBER_ENDING_POINT`       | The user number to end at.                                                                                    | `50000000`             |
 | `LOAD_USERS_TO_COUCHBASE`        | Enable loading users to Couchbase persistence. `true` or `false` == ``                                        | `false`                |
-| `LOAD_USERS_TO_SPANNER`          | Enable loading users to Spanner persistence. `true` or `false` == ``                                          | `false`                |
 | `LOAD_USERS_TO_RDBMS`            | Enable loading users to RDBMS persistence. `true` or `false` == ``                                            | `false`                |
 | `USER_SPLIT_PARALLEL_THREADS`    | The number of parallel threads to break the total number users across. This number heavily effects CPU usage. | `20`                   |
-| `GOOGLE_APPLICATION_CREDENTIALS` | Google Credentials JSON SA file. **Used with Spanner**                                                        | ``                     |
-| `GOOGLE_PROJECT_ID`              | Google Project ID. **Used with Spanner**                                                                      | ``                     |
-| `GOOGLE_SPANNER_INSTANCE_ID`     | Google Spanner Instance ID. **Used with Spanner**                                                             | ``                     |
-| `GOOGLE_SPANNER_DATABASE_ID`     | Google Spanner Database ID. **Used with Spanner**                                                             | ``                     |
 | `RDBMS_TYPE`                     | RDBMS type if `mysql` or `pgsql` is the persistence to load users in.                                         | `mysql`                |
 | `RDBMS_DB`                       | RDBMS Database name if `mysql` or `pgsql` is the persistence to load users in.                                | `jans`                 |
 | `RDBMS_USER`                     | RDBMS user if `mysql` or `pgsql` is the persistence to load users in.                                         | `jans`                 |

diff --git a/demos/benchmarking/docker-jans-loadtesting-jmeter/requirements.txt b/demos/benchmarking/docker-jans-loadtesting-jmeter/requirements.txt
@@ -3,10 +3,6 @@ joblib
 pygtail
 psycopg2-binary
 PyMySQL
-# =======================
-# Install Spanner package
-# =======================
-google-cloud-spanner
 # ===============
 # Install Couchbase Client
 # ===============

diff --git a/demos/benchmarking/docker-jans-loadtesting-jmeter/scripts/add_users_spanner.py b/demos/benchmarking/docker-jans-loadtesting-jmeter/scripts/add_users_spanner.py
diff --git a/demos/benchmarking/docker-jans-loadtesting-jmeter/scripts/entrypoint.sh b/demos/benchmarking/docker-jans-loadtesting-jmeter/scripts/entrypoint.sh
@@ -8,12 +8,6 @@ if [[ "$LOAD_USERS_TO_COUCHBASE" = "true" ]]; then
   /usr/bin/python3 /scripts/add_users_couchbase.py
   exit 0
 # ================================================================================================ #
-# Check if this is a  user loading job to  the backend spanner                                     #
-# ================================================================================================ #
-elif [[ "$LOAD_USERS_TO_SPANNER" = "true" ]]; then
-  /usr/bin/python3 /scripts/add_users_spanner.py
-  exit 0
-# ================================================================================================ #
 # Check if this is a  user loading job to  the backend RDBMS                                     #
 # ================================================================================================ #
 elif [[ "$LOAD_USERS_TO_RDBMS" = "true" ]]; then

diff --git a/...s/benchmarking/docker-jans-loadtesting-jmeter/yaml/load-users/load_users_spanner_job.yaml b/...s/benchmarking/docker-jans-loadtesting-jmeter/yaml/load-users/load_users_spanner_job.yaml
diff --git a/docker-jans-all-in-one/Dockerfile b/docker-jans-all-in-one/Dockerfile
@@ -58,7 +58,7 @@ RUN apk update \
 # Assets sync
 # ===========
 
-ENV JANS_SOURCE_VERSION=4f155cfe9e197b15d65be6aa938276862fe36a06
+ENV JANS_SOURCE_VERSION=6e00e723a99d700a4f82713b0c25b2d6e3ef5775
 
 # note that as we're pulling from a monorepo (with multiple project in it)
 # we are using partial-clone and sparse-checkout to get the assets

diff --git a/docker-jans-auth-server/Dockerfile b/docker-jans-auth-server/Dockerfile
@@ -103,7 +103,7 @@ RUN mkdir -p ${JETTY_BASE}/jans-auth/agama/fl \
     /app/static/rdbm \
     /app/schema
 
-ENV JANS_SOURCE_VERSION=4f155cfe9e197b15d65be6aa938276862fe36a06
+ENV JANS_SOURCE_VERSION=6e00e723a99d700a4f82713b0c25b2d6e3ef5775
 ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup
 
 # note that as we're pulling from a monorepo (with multiple project in it)
@@ -119,7 +119,6 @@ RUN git clone --depth 500 --filter blob:none --no-checkout https://github.com/ja
     && cp ${JANS_SETUP_DIR}/static/rdbm/sql_data_types.json /app/static/rdbm/ \
     && cp ${JANS_SETUP_DIR}/static/rdbm/ldap_sql_data_type_mapping.json /app/static/rdbm/ \
     && cp ${JANS_SETUP_DIR}/static/rdbm/opendj_attributes_syntax.json /app/static/rdbm/ \
-    && cp ${JANS_SETUP_DIR}/static/rdbm/sub_tables.json /app/static/rdbm/ \
     && cp ${JANS_SETUP_DIR}/schema/jans_schema.json /app/schema/ \
     && cp ${JANS_SETUP_DIR}/schema/custom_schema.json /app/schema/ \
     && cp ${JANS_SETUP_DIR}/schema/opendj_types.json /app/schema/ \
@@ -217,9 +216,7 @@ ENV CN_PERSISTENCE_TYPE=sql \
     CN_COUCHBASE_BUCKET_PREFIX=jans \
     CN_COUCHBASE_TRUSTSTORE_ENABLE=true \
     CN_COUCHBASE_KEEPALIVE_INTERVAL=30000 \
-    CN_COUCHBASE_KEEPALIVE_TIMEOUT=2500 \
-    CN_GOOGLE_SPANNER_INSTANCE_ID="" \
-    CN_GOOGLE_SPANNER_DATABASE_ID=""
+    CN_COUCHBASE_KEEPALIVE_TIMEOUT=2500
 
 # ===========
 # Generic ENV
@@ -274,7 +271,6 @@ RUN mkdir -p ${JETTY_BASE}/jans-auth/custom/pages \
     ${JETTY_BASE}/jans-auth/custom/libs \
     ${JETTY_BASE}/jans-auth/custom/i18n \
     ${JETTY_BASE}/jans-auth/logs \
-    ${JETTY_BASE}/common/libs/spanner \
     ${JETTY_BASE}/common/libs/couchbase \
     ${JETTY_HOME}/temp \
     /etc/jans/conf \