Skip to content

Commit 234f895

Browse files
moabumoabu
authored
chore: prepare for flex 5.5.0 release (#2034)
* chore: prepare for flex 6.0.0 release Signed-off-by: moabu <[email protected]> * chore: prepare for flex 5.4.0 release Signed-off-by: moabu <[email protected]> * chore: update flex charts Signed-off-by: moabu <[email protected]> * ci: update build package Signed-off-by: moabu <[email protected]> * ci: add ubuntu nobel packaging instructions Signed-off-by: moabu <[email protected]> --------- Signed-off-by: moabu <[email protected]> Signed-off-by: Mohammad Abudayyeh <[email protected]>
1 parent b82564d commit 234f895

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+413
-850
lines changed

‎.github/workflows/build-packages.yml

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,48 @@ permissions:
1010
jobs:
1111
publish_binary_packages:
1212
if: github.repository == 'GluuFederation/flex'
13-
runs-on: ubuntu-20.04
13+
runs-on: ${{ matrix.os }}
14+
permissions:
15+
id-token: write
1416
strategy:
1517
fail-fast: false
1618
matrix:
17-
name: [ubuntu22, ubuntu20, el8, suse15]
18-
19+
name: [ubuntu24, ubuntu22, ubuntu20, el8, suse15]
1920
include:
21+
- name: ubuntu24
22+
os: ubuntu-latest
23+
asset_suffix: ~ubuntu24.04_amd64.deb
24+
build_files: deb/noble
25+
asset_prefix: '_'
26+
asset_path: flex
27+
sign_cmd: cosign sign-blob --yes --output-certificate cert.pem --output-signature sig
28+
python_version: 3.11
2029
- name: ubuntu22
30+
os: ubuntu-20.04
2131
asset_suffix: ~ubuntu22.04_amd64.deb
2232
build_files: deb/jammy
2333
asset_prefix: '_'
2434
asset_path: flex
2535
sign_cmd: dpkg-sig -s builder -k DE92BEF14A1A4E542F678B64DC3C790386C73900
2636
python_version: "3.8"
2737
- name: ubuntu20
38+
os: ubuntu-20.04
2839
asset_suffix: ~ubuntu20.04_amd64.deb
2940
build_files: deb/focal
3041
asset_prefix: '_'
3142
asset_path: flex
3243
sign_cmd: dpkg-sig -s builder -k DE92BEF14A1A4E542F678B64DC3C790386C73900
3344
python_version: "3.8"
3445
- name: el8
46+
os: ubuntu-20.04
3547
asset_suffix: .el8.x86_64.rpm
3648
build_files: rpm/el8
3749
asset_prefix: '-'
3850
asset_path: flex/rpmbuild/RPMS/x86_64
3951
sign_cmd: rpm --addsign
4052
python_version: "3.6"
4153
- name: suse15
54+
os: ubuntu-20.04
4255
asset_suffix: .suse15.x86_64.rpm
4356
build_files: rpm/suse15
4457
asset_prefix: '-'
@@ -59,16 +72,17 @@ jobs:
5972

6073
- name: Getting build dependencies
6174
id: get_dependencies
62-
run: |
75+
run: |
6376
mkdir -p flex/flex-src/opt/
6477
cp -rp temp-flex/automation/packaging/${{ matrix.build_files }}/* flex/
6578
cp temp-flex/flex-linux-setup/flex_linux_setup/flex_setup.py flex/flex_setup.py
6679
sudo add-apt-repository ppa:deadsnakes/ppa
6780
sudo apt-get update
6881
sudo apt-get install -y python${{ matrix.python_version }}
69-
sudo apt install -y build-essential devscripts debhelper rpm dpkg-sig python3-dev python3-requests python3-ruamel.yaml python3-pymysql python3-crypto python3-distutils python3-prompt-toolkit python${{ matrix.python_version }}-distutils libpq-dev python${{ matrix.python_version }}-dev apache2 rsyslog python3-urllib3 python3-certifi postgresql postgresql-contrib
82+
sudo apt install -y build-essential devscripts debhelper rpm python3-dev python3-requests python3-ruamel.yaml python3-pymysql python3-prompt-toolkit python${{ matrix.python_version }}-distutils libpq-dev python${{ matrix.python_version }}-dev apache2 rsyslog python3-urllib3 python3-certifi postgresql postgresql-contrib
83+
sudo apt install -y dpkg-sig python3-crypto python3-distutils || sudo apt install -y python3-distutils-extra python3-cryptography
7084
sudo cp -r /usr/lib/python3/dist-packages /usr/lib/python${{ matrix.python_version }}/
71-
sudo python${{ matrix.python_version }} -m pip install psycopg2-binary psycopg2
85+
sudo python${{ matrix.python_version }} -m pip install psycopg2-binary psycopg2 || echo "failed to install psycopg2"
7286
- name: Import GPG key
7387
id: import_gpg
7488
continue-on-error: true
@@ -100,7 +114,7 @@ jobs:
100114
id: run_build
101115
run: |
102116
cd flex/
103-
sudo python${{ matrix.python_version }} flex_setup.py --jans-branch="main" --jans-setup-branch="main" -download-exit -yes --keep-downloads --keep-setup -force-download
117+
sudo python${{ matrix.python_version }} flex_setup.py --jans-branch="v1.5.0" --jans-setup-branch="v1.5.0" -download-exit -yes --keep-downloads --keep-setup -force-download
104118
cp -r /opt/dist flex-src/opt/
105119
cp -r /opt/jans flex-src/opt/
106120
touch flex-src/opt/jans/jans-setup/package
@@ -110,6 +124,10 @@ jobs:
110124
sed -i "s/%VERSION%/${{ steps.previoustag.outputs.version }}/g" run-build.sh
111125
cat run-build.sh
112126
sudo ./run-build.sh
127+
128+
- name: Install Cosign
129+
uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 # v3.5.0
130+
113131
- name: Sign package
114132
id: sign_package
115133
run : |

‎admin-ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gluu-admin-ui",
3-
"version": "0.0.0",
3+
"version": "5.5.0",
44
"description": "UI to administer the jans-sever features",
55
"keywords": [
66
"jans-server",

‎automation/packaging/deb/focal/debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ Package: flex
1010
Architecture: any
1111
Multi-Arch: foreign
1212
Depends: ${misc:Depends}, ${shlibs:Depends}, apache2, rsyslog, python3-urllib3, python3-certifi, postgresql, postgresql-contrib, python3-requests, python3-ruamel.yaml, python3-crypto, python3-psycopg2, curl, wget, xz-utils, unzip, rsyslog, bzip2
13-
Description: Janssen enables organizations to build a scalable centralized authentication and authorization service using free open source software.
13+
Description: Gluu enables organizations to build a scalable centralized authentication and authorization service using free open source software.

‎automation/packaging/deb/jammy/debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ Package: flex
1010
Architecture: any
1111
Multi-Arch: foreign
1212
Depends: ${misc:Depends}, ${shlibs:Depends}, apache2, curl, wget, xz-utils, unzip, rsyslog, bzip2, python3-urllib3, python3-certifi, python3-requests, python3-ruamel.yaml, python3-pymysql, python3-cryptography, python3-distutils, python3-psycopg2, postgresql-contrib, postgresql
13-
Description: Janssen enables organizations to build a scalable centralized authentication and authorization service using free open source software.
13+
Description: Gluu enables organizations to build a scalable centralized authentication and authorization service using free open source software.

‎automation/packaging/deb/noble/checksum.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/bash
2+
VERSION=%VERSION%
3+
sha256sum flex_%VERSION%~ubuntu24.04_amd64.deb > flex_%VERSION%~ubuntu24.04_amd64.deb.sha256sum
4+
sed -i 's/~/./g' flex_%VERSION%~ubuntu24.04_amd64.deb.sha256sum

‎automation/packaging/deb/noble/debian/changelog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
flex (%VER%~ubuntu24.04) unstable; urgency=low
2+
3+
* Release Notes.
4+
5+
-- https://github.com/GluuFederation/flex/releases

‎automation/packaging/deb/noble/debian/compat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
11

‎automation/packaging/deb/noble/debian/control

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Source: flex
2+
Section: java
3+
Priority: optional
4+
Maintainer: The Packaging Team <[email protected]>
5+
Build-Depends: debhelper (>=11~)
6+
Standards-Version: 4.1.4
7+
Homepage: https://gluu.org
8+
9+
Package: flex
10+
Architecture: any
11+
Multi-Arch: foreign
12+
Depends: ${misc:Depends}, ${shlibs:Depends}, apache2, rsyslog, python3-urllib3, python3-certifi, postgresql, postgresql-contrib, python3-requests, python3-ruamel.yaml, python3-psycopg2, python3-cryptography, curl, wget, xz-utils, unzip, rsyslog, bzip2
13+
Description: Gluu enables organizations to build a scalable centralized authentication and authorization service using free open source software.

‎automation/packaging/deb/noble/debian/copyright

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
2+
Upstream-Name: flex
3+
Source: https://gluu.org
4+
5+
Files: *
6+
Copyright: 2025 Gluu Inc. [email protected]
7+
License: Apache-2.0

‎automation/packaging/deb/noble/debian/install

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
opt/dist/* /opt/dist/
2+
opt/jans/* /opt/jans/

‎automation/packaging/deb/noble/debian/postrm

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/bash
2+
3+
if [ "$1" = "remove" ] ; then
4+
rm -rf /etc/systemd/system/jans-*.service
5+
rm -rf /etc/systemd/system/opendj.service
6+
rm -rf /etc/jans
7+
rm -rf /etc/certs
8+
rm -rf /etc/default/jans-*
9+
rm -rf /var/lib/dpkg/info/jans.*
10+
rm -rf /opt/jans
11+
rm -rf /opt/dist
12+
rm -rf /opt/opendj
13+
rm -rf /opt/amazon-corretto-*
14+
rm -rf /opt/jython*
15+
rm -rf /opt/jetty*
16+
rm -rf /opt/jre
17+
fi
18+
exit 0

‎automation/packaging/deb/noble/debian/prerm

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
#!/bin/bash
2+
3+
set -e
4+
5+
echo "Checking to make sure service is down..."
6+
7+
case $1 in
8+
remove)
9+
if [ -f /etc/systemd/system/jans-auth.service ]; then
10+
systemctl stop jans-auth.service
11+
fi
12+
if [ -f /etc/systemd/system/jans-config-api.service ]; then
13+
systemctl stop jans-config-api.service
14+
fi
15+
if [ -f /etc/systemd/system/jans-fido2.service ]; then
16+
systemctl stop jans-fido2.service
17+
fi
18+
if [ -f /etc/systemd/system/jans-scim.service ]; then
19+
systemctl stop jans-scim.service
20+
fi
21+
22+
if [ -d /opt/jans.saved ]; then
23+
rm -rf /opt/jans.saved
24+
fi
25+
if [ -d /opt/jans ]; then
26+
echo "Your changes will be saved into /opt/jans.saved"
27+
mkdir /opt/jans.saved
28+
cp -rp /opt/jans /opt/jans.saved/
29+
if [ -d /opt/dist ]; then
30+
cp -rp /opt/dist /opt/jans.saved/
31+
fi
32+
if [ -e /opt/jetty-* ]; then
33+
cp -rp /opt/jetty-* /opt/jans.saved/
34+
fi
35+
if [ -e /opt/jython-* ]; then
36+
cp -rp /opt/jython-* /opt/jans.saved/
37+
fi
38+
if [ -e /opt/opendj ]; then
39+
cp -rp /opt/opendj /opt/jans.saved/
40+
fi
41+
if [ -e /opt/amazon-corretto-* ]; then
42+
cp -rp /opt/amazon-corretto-* /opt/jans.saved/
43+
fi
44+
fi
45+
exit 0
46+
;;
47+
deconfigure|upgrade)
48+
if [ -f /etc/systemd/system/jans-auth.service ]; then
49+
systemctl stop jans-auth.service
50+
fi
51+
if [ -f /etc/systemd/system/jans-config-api.service ]; then
52+
systemctl stop jans-config-api.service
53+
fi
54+
if [ -f /etc/systemd/system/jans-fido2.service ]; then
55+
systemctl stop jans-fido2.service
56+
fi
57+
if [ -f /etc/systemd/system/jans-scim.service ]; then
58+
systemctl stop jans-scim.service
59+
fi
60+
if [ -f /etc/systemd/system/opendj.service ]; then
61+
systemctl stop opendj.service
62+
fi
63+
exit 0
64+
;;
65+
failed-upgrade)
66+
exit 2
67+
;;
68+
*)
69+
echo "Prerm called with unknown argument '$1'" >&2
70+
exit 0
71+
;;
72+
esac
73+
exit $?

‎automation/packaging/deb/noble/debian/rules

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/usr/bin/make -f
2+
# You must remove unused comment lines for the released package.
3+
#export DH_VERBOSE = 1
4+
#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
5+
#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
6+
#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
7+
8+
%:
9+
dh $@
10+
11+
override_dh_strip_nondeterminism:

‎automation/packaging/deb/noble/run-build.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/bash
2+
VERSION=%VERSION%
3+
sed -i "s/%VER%/$VERSION/g" debian/changelog
4+
cd flex-src
5+
tar cvfz ../flex_%VERSION%.tar.gz *
6+
cp -a ../debian .
7+
tar cvfz ../flex_%VERSION%.orig.tar.gz *
8+
debuild -us -uc
9+
cd ..
10+
chmod a+w flex_%VERSION%~ubuntu24.04_amd64.deb

‎automation/packaging/rpm/el8/flex.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ URL: https://www.gluu.org/
77
Source0: flex-%VER%.tar.gz
88
Requires: httpd, mod_ssl, mod_auth_openidc, curl, wget, tar, xz, unzip, rsyslog, bzip2, python3-requests, python3-ruamel-yaml, python3-certifi, python3-PyMySQL, python3-cryptography, python3-psycopg2
99
%description
10-
Janssen enables organizations to build a scalable centralized authentication and authorization service using free open source software.
10+
Gluu enables organizations to build a scalable centralized authentication and authorization service using free open source software.
1111

1212
%global _python_bytecompile_extra 0
1313
%global _python_bytecompile_errors_terminate_build 0

‎automation/packaging/rpm/suse15/flex.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Source0: flex-%VER%.tar.gz
88
Requires: apache2, apache2-mod_auth_openidc, curl, wget, tar, xz, unzip, rsyslog, bzip2, python3-requests, python3-ruamel.yaml, python3-certifi, python3-PyMySQL, python3-cryptography, python3-psycopg2
99
AutoReqProv: no
1010
%description
11-
Janssen enables organizations to build a scalable centralized authentication and authorization service using free open source software.
11+
Gluu enables organizations to build a scalable centralized authentication and authorization service using free open source software.
1212

1313
%global _python_bytecompile_extra 0
1414
%global _python_bytecompile_errors_terminate_build 0

‎automation/rancher-partner-charts/questions.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -703,7 +703,7 @@ questions:
703703
- variable: auth-server.image.tag
704704
required: true
705705
type: string
706-
default: "0.0.0-nightly"
706+
default: "5.5.0-1"
707707
description: "The Auth Server Image tag"
708708
label: Auth Server image tag
709709
group: "Images"
@@ -732,7 +732,7 @@ questions:
732732
- variable: admin-ui.image.tag
733733
required: true
734734
type: string
735-
default: "0.0.0-nightly"
735+
default: "5.5.0-1"
736736
description: "The AdminUI Image tag"
737737
label: AdminUI image tag
738738
group: "Images"
@@ -761,7 +761,7 @@ questions:
761761
- variable: auth-server-key-rotation.image.tag
762762
required: true
763763
type: string
764-
default: "0.0.0-nightly"
764+
default: "5.5.0-1"
765765
description: "The Auth Server Image tag"
766766
label: Auth Server KeyRotation image tag
767767
group: "Images"
@@ -790,7 +790,7 @@ questions:
790790
- variable: casa.image.tag
791791
required: true
792792
type: string
793-
default: "0.0.0-nightly"
793+
default: "5.5.0-1"
794794
description: "The Casa Image tag"
795795
label: Casa image tag
796796
group: "Images"
@@ -819,7 +819,7 @@ questions:
819819
- variable: config.image.tag
820820
required: true
821821
type: string
822-
default: "0.0.0-nightly"
822+
default: "5.5.0-1"
823823
description: "The Configurator Image tag"
824824
label: Configurator image tag
825825
group: "Images"
@@ -848,7 +848,7 @@ questions:
848848
- variable: config-api.image.tag
849849
required: true
850850
type: string
851-
default: "0.0.0-nightly"
851+
default: "5.5.0-1"
852852
description: "The ConfigAPI Image tag"
853853
label: ConfigAPI image tag
854854
group: "Images"
@@ -877,7 +877,7 @@ questions:
877877
- variable: fido2.image.tag
878878
required: true
879879
type: string
880-
default: "0.0.0-nightly"
880+
default: "5.5.0-1"
881881
description: "The Fido2 Image tag"
882882
label: Fido2 image tag
883883
group: "Images"
@@ -906,7 +906,7 @@ questions:
906906
- variable: persistence.image.tag
907907
required: true
908908
type: string
909-
default: "0.0.0-nightly"
909+
default: "5.5.0-1"
910910
description: "The Persistence Image tag"
911911
label: Persistence image tag
912912
group: "Images"
@@ -935,7 +935,7 @@ questions:
935935
- variable: scim.image.tag
936936
required: true
937937
type: string
938-
default: "0.0.0-nightly"
938+
default: "5.5.0-1"
939939
description: "The SCIM Image tag"
940940
label: SCIM image tag
941941
group: "Images"

‎automation/startflexdemo.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ if [[ $GLUU_PERSISTENCE != "MYSQL" ]] && [[ $GLUU_PERSISTENCE != "PGSQL" ]]; the
2222
exit 1
2323
fi
2424
if [[ -z $GLUU_VERSION ]]; then
25-
GLUU_VERSION="0.0.0-nightly"
25+
GLUU_VERSION="5.5.0"
2626
fi
2727
LOG_TARGET="FILE"
2828
LOG_LEVEL="TRACE"

‎charts/gluu-all-in-one/Chart.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ annotations:
33
artifacthub.io/containsSecurityUpdates: 'true'
44
artifacthub.io/images: |
55
- name: all-in-one
6-
image: ghcr.io/gluufederation/flex/flex-all-in-one:0.0.0-nightly
6+
image: ghcr.io/gluufederation/flex/flex-all-in-one:5.5.0-1
77
artifacthub.io/license: Apache-2.0
88
catalog.cattle.io/certified: partner
99
catalog.cattle.io/release-name: gluu-all-in-one
1010
catalog.cattle.io/display-name: Gluu Flex Cloud Identity and Access Management All-in-One
1111
apiVersion: v2
12-
appVersion: "0.0.0-nightly"
12+
appVersion: "5.5.0"
1313
icon: >-
1414
https://gluu.org/docs/gluu-server/favicon.ico
1515
home: https://docs.gluu.org
@@ -21,4 +21,4 @@ maintainers:
2121
email: [email protected]
2222
description: Gluu Access and Identity Management All-in-One Chart. This chart deploys the selected janssen microservice all in one deployment.
2323
name: gluu-all-in-one
24-
version: 0.0.0-nightly
24+
version: 5.5.0

0 commit comments

Comments
 (0)