Skip to content

Commit

Permalink
feat: release aio chart
Browse files Browse the repository at this point in the history
  • Loading branch information
moabu committed Nov 13, 2023
1 parent 495536c commit e6fd336
Show file tree
Hide file tree
Showing 41 changed files with 56 additions and 49 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ jobs:
- name: Copy generated chart from main
run: |
helm package charts/gluu
helm package charts/gluu-all-in-one
cp gluu-*.tgz ../
- name: Import GPG key
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ on:
node_release_as:
description: 'Release version for the admin ui'
required: true
default: '1.0.19'
default: '1.0.20-1'
docker_release_as:
description: 'Release version for the docker images docker-*'
required: true
default: '1.0.19-1'
default: '1.0.20-1'
python_release_as:
description: 'Release version for the python projects'
required: true
default: '1.0.19'
default: '1.0.20'
mega_release_as:
description: 'Mega release version'
required: true
default: '5.0.0-19'
default: '5.0.0-20'
jobs:
release-simple-pr:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion admin-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gluu-admin-ui",
"version": "1.0.19",
"version": "1.0.20",
"description": "UI to administer the jans-sever features",
"keywords": [
"jans-server",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
kubeVersion: ">=v1.22.0-0"
annotations:
artifacthub.io/changes: |
- 1.0.20 dev chart release
- 1.0.20 chart release
artifacthub.io/containsSecurityUpdates: 'true'
artifacthub.io/images: |
- name: all-in-one
Expand All @@ -12,7 +12,7 @@ annotations:
catalog.cattle.io/release-name: flex-all-in-one
catalog.cattle.io/display-name: Flex Cloud Identity and Access Management All-in-One
apiVersion: v2
appVersion: "1.0.20-dev"
appVersion: "5.0.0"
icon: >-
https://gluu.org/docs/gluu-server/favicon.ico
home: https://docs.gluu.org
Expand All @@ -24,4 +24,4 @@ maintainers:
email: support@gluu.org
description: Gluu Access and Identity Management All-in-One Chart. This chart deploys the selected janssen microservice all in one deployment.
name: flex-all-in-one
version: 1.0.20-dev
version: 1.0.20
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ stringData:
{{- end }}
"auth_sig_keys": {{ index .Values "auth-server" "authSigKeys" | quote }},
"auth_enc_keys": {{ index .Values "auth-server" "authEncKeys" | quote }},
"optional_scopes": {{ list (include "flex-all-in-one.optionalScopes" . | fromJsonArray | join ",") }}
"optional_scopes": {{ list (include "flex-all-in-one.optionalScopes" . | fromJsonArray | join ",") }},
"salt": {{ .Values.salt | quote }}
}
{{ if or ( eq .Values.cnPersistenceType "couchbase" ) ( eq .Values.cnPersistenceType "hybrid" ) }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ orgName: Gluu
# -- Resource specs.
# -- State code. Used for certificate creation.
state: TX
# -- Salt. Used for encoding/decoding sensitive data. If omitted or set to empty string, the value will be self-generated. Otherwise, a 24 alphanumeric characters are allowed as its value.
salt: ""
# -- Persistence backend to run Gluu with couchbase|hybrid|sql|spanner.
cnPersistenceType: sql
configmap:
Expand Down Expand Up @@ -212,7 +214,7 @@ auth-server-key-rotation:
# -- Image to use for deploying.
repository: ghcr.io/janssenproject/jans/certmanager
# -- Image tag to use for deploying.
tag: 1.0.20_dev
tag: 1.0.20-1
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Auth server key rotation keys life in hours
Expand Down Expand Up @@ -615,7 +617,7 @@ image:
# -- Image to use for deploying.
repository: ghcr.io/janssenproject/jans/all-in-one
# -- Image tag to use for deploying.
tag: 1.0.20_dev
tag: 1.0.20-1
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Service replica number.
Expand Down
18 changes: 9 additions & 9 deletions charts/gluu/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,25 @@ annotations:
artifacthub.io/containsSecurityUpdates: "true"
artifacthub.io/images: |
- name: auth-server
image: ghcr.io/janssenproject/jans/auth-server:1.0.19_dev
image: ghcr.io/janssenproject/jans/auth-server:1.0.20_dev
- name: auth-server-key-rotation
image: ghcr.io/janssenproject/jans/certmanager:1.0.19_dev
image: ghcr.io/janssenproject/jans/certmanager:1.0.20_dev
- name: configuration-manager
image: ghcr.io/janssenproject/jans/configurator:1.0.19_dev
image: ghcr.io/janssenproject/jans/configurator:1.0.20_dev
- name: config-api
image: ghcr.io/janssenproject/jans/config-api:1.0.19_dev
image: ghcr.io/janssenproject/jans/config-api:1.0.20_dev
- name: fido2
image: ghcr.io/janssenproject/jans/fido2:1.0.19_dev
image: ghcr.io/janssenproject/jans/fido2:1.0.20_dev
- name: opendj
image: gluufederation/opendj:5.0.0-1
- name: persistence
image: ghcr.io/janssenproject/jans/persistence-loader:1.0.19_dev
image: ghcr.io/janssenproject/jans/persistence-loader:1.0.20_dev
- name: scim
image: ghcr.io/janssenproject/jans/scim:1.0.19_dev
image: ghcr.io/janssenproject/jans/scim:1.0.20_dev
- name: casa
image: ghcr.io/janssenproject/jans/casa:1.0.19_dev
image: ghcr.io/janssenproject/jans/casa:1.0.20_dev
- name: admin-ui
image: ghcr.io/gluufederation/flex/admin-ui:1.0.19_dev
image: ghcr.io/gluufederation/flex/admin-ui:1.0.20_dev
artifacthub.io/license: Apache-2.0
artifacthub.io/prerelease: "true"
catalog.cattle.io/certified: partner
Expand Down
2 changes: 1 addition & 1 deletion charts/gluu/charts/admin-ui/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ image:
# -- Image to use for deploying.
repository: gluufederation/admin-ui
# -- Image tag to use for deploying.
tag: 1.0.20_dev
tag: 1.0.20-1
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Service replica number.
Expand Down
2 changes: 1 addition & 1 deletion charts/gluu/charts/auth-server-key-rotation/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ image:
# -- Image to use for deploying.
repository: janssenproject/certmanager
# -- Image tag to use for deploying.
tag: 1.0.20_dev
tag: 1.0.20-1
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Auth server key rotation keys life in hours
Expand Down
2 changes: 1 addition & 1 deletion charts/gluu/charts/auth-server/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ image:
# -- Image to use for deploying.
repository: janssenproject/auth-server
# -- Image tag to use for deploying.
tag: 1.0.20_dev
tag: 1.0.20-1
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Service replica number.
Expand Down
2 changes: 1 addition & 1 deletion charts/gluu/charts/casa/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ image:
# -- Image to use for deploying.
repository: janssenproject/casa
# -- Image tag to use for deploying.
tag: 1.0.20_dev
tag: 1.0.20-1
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Service replica number.
Expand Down
2 changes: 1 addition & 1 deletion charts/gluu/charts/config-api/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ image:
# -- Image to use for deploying.
repository: janssenproject/config-api
# -- Image tag to use for deploying.
tag: 1.0.20_dev
tag: 1.0.20-1
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Service replica number.
Expand Down
3 changes: 2 additions & 1 deletion charts/gluu/charts/config/templates/secrets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ stringData:
{{- end }}
"auth_sig_keys": {{ index .Values "global" "auth-server" "authSigKeys" | quote }},
"auth_enc_keys": {{ index .Values "global" "auth-server" "authEncKeys" | quote }},
"optional_scopes": {{ list (include "config.optionalScopes" . | fromJsonArray | join ",") }}
"optional_scopes": {{ list (include "config.optionalScopes" . | fromJsonArray | join ",") }},
"salt": {{ .Values.salt | quote }}
}
{{ if or ( eq .Values.global.cnPersistenceType "couchbase" ) ( eq .Values.global.cnPersistenceType "hybrid" ) }}
Expand Down
2 changes: 1 addition & 1 deletion charts/gluu/charts/config/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ image:
# -- Image to use for deploying.
repository: janssenproject/configurator
# -- Image tag to use for deploying.
tag: 1.0.20_dev
tag: 1.0.20-1
# -- Image Pull Secrets
pullSecrets: [ ]
# -- LDAP admin password if OpennDJ is used for persistence.
Expand Down
2 changes: 1 addition & 1 deletion charts/gluu/charts/fido2/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ image:
# -- Image to use for deploying.
repository: janssenproject/fido2
# -- Image tag to use for deploying.
tag: 1.0.20_dev
tag: 1.0.20-1
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Service replica number.
Expand Down
2 changes: 1 addition & 1 deletion charts/gluu/charts/persistence/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ image:
# -- Image to use for deploying.
repository: janssenproject/persistence
# -- Image tag to use for deploying.
tag: 1.0.20_dev
tag: 1.0.20-1
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Resource specs.
Expand Down
2 changes: 1 addition & 1 deletion charts/gluu/charts/scim/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ image:
# -- Image to use for deploying.
repository: janssenproject/scim
# -- Image tag to use for deploying.
tag: 1.0.20_dev
tag: 1.0.20-1
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Service replica number.
Expand Down
8 changes: 4 additions & 4 deletions charts/gluu/openbanking-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ auth-server:
# -- Image to use for deploying.
repository: janssenproject/auth-server
# -- Image tag to use for deploying.
tag: 1.0.19_dev
tag: 1.0.20-1
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Service replica number.
Expand Down Expand Up @@ -167,7 +167,7 @@ config:
# -- Image to use for deploying.
repository: janssenproject/configurator
# -- Image tag to use for deploying.
tag: 1.0.19_dev
tag: 1.0.20-1
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Organization name. Used for certificate creation.
Expand Down Expand Up @@ -231,7 +231,7 @@ config-api:
# -- Image to use for deploying.
repository: janssenproject/config-api
# -- Image tag to use for deploying.
tag: 1.0.19_dev
tag: 1.0.20-1
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Service replica number.
Expand Down Expand Up @@ -664,7 +664,7 @@ persistence:
# -- Image to use for deploying.
repository: janssenproject/persistence-loader
# -- Image tag to use for deploying.
tag: 1.0.19_dev
tag: 1.0.20-1
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Resource specs.
Expand Down
20 changes: 11 additions & 9 deletions charts/gluu/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ admin-ui:
# -- Image to use for deploying.
repository: ghcr.io/gluufederation/flex/admin-ui
# -- Image tag to use for deploying.
tag: 1.0.20_dev
tag: 1.0.20-1
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Service replica number.
Expand Down Expand Up @@ -203,7 +203,7 @@ auth-server:
# -- Image to use for deploying.
repository: ghcr.io/janssenproject/jans/auth-server
# -- Image tag to use for deploying.
tag: 1.0.20_dev
tag: 1.0.20-1
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Service replica number.
Expand Down Expand Up @@ -276,7 +276,7 @@ auth-server-key-rotation:
# -- Image to use for deploying.
repository: ghcr.io/janssenproject/jans/certmanager
# -- Image tag to use for deploying.
tag: 1.0.20_dev
tag: 1.0.20-1
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Auth server key rotation keys life in hours
Expand Down Expand Up @@ -357,7 +357,7 @@ casa:
# -- Image to use for deploying.
repository: ghcr.io/janssenproject/jans/casa
# -- Image tag to use for deploying.
tag: 1.0.20_dev
tag: 1.0.20-1
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Service replica number.
Expand Down Expand Up @@ -539,7 +539,7 @@ config:
# -- Image to use for deploying.
repository: ghcr.io/janssenproject/jans/configurator
# -- Image tag to use for deploying.
tag: 1.0.20_dev
tag: 1.0.20-1
# -- Image Pull Secrets
pullSecrets: [ ]
# -- LDAP admin password if OpenDJ is used for persistence.
Expand All @@ -564,6 +564,8 @@ config:
memory: 300Mi
# -- State code. Used for certificate creation.
state: TX
# -- Salt. Used for encoding/decoding sensitive data. If omitted or set to empty string, the value will be self-generated. Otherwise, a 24 alphanumeric characters are allowed as its value.
salt: ""
# -- Configure any additional volumes that need to be attached to the pod
volumes: []
# -- Configure any additional volumesMounts that need to be attached to the containers
Expand Down Expand Up @@ -642,7 +644,7 @@ config-api:
# -- Image to use for deploying.
repository: ghcr.io/janssenproject/jans/config-api
# -- Image tag to use for deploying.
tag: 1.0.20_dev
tag: 1.0.20-1
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Service replica number.
Expand Down Expand Up @@ -741,7 +743,7 @@ fido2:
# -- Image to use for deploying.
repository: ghcr.io/janssenproject/jans/fido2
# -- Image tag to use for deploying.
tag: 1.0.20_dev
tag: 1.0.20-1
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Service replica number.
Expand Down Expand Up @@ -1395,7 +1397,7 @@ persistence:
# -- Image to use for deploying.
repository: ghcr.io/janssenproject/jans/persistence-loader
# -- Image tag to use for deploying.
tag: 1.0.20_dev
tag: 1.0.20-1
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Resource specs.
Expand Down Expand Up @@ -1475,7 +1477,7 @@ scim:
# -- Image to use for deploying.
repository: ghcr.io/janssenproject/jans/scim
# -- Image tag to use for deploying.
tag: 1.0.20_dev
tag: 1.0.20-1
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Service replica number.
Expand Down
4 changes: 2 additions & 2 deletions docker-admin-ui/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUN apk update \
# TODO:
# - use NODE_ENV=production
# - download build package (not git clone)
ENV ADMIN_UI_VERSION=136990a032e3e38e737ab488a7968085d3e21a6a
ENV ADMIN_UI_VERSION=495536cefedfe27116df174c3c73ac05369f90a1

RUN mkdir -p /opt/flex

Expand Down Expand Up @@ -68,7 +68,7 @@ RUN python3 -m ensurepip \
# jans-linux-setup sync
# =====================

ENV JANS_SOURCE_VERSION=bf6a25156523757c68de8a98cacaa33c54a8332e
ENV JANS_SOURCE_VERSION=a3026d7957a1aaefa30269904744975352ae4642
ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup

# note that as we're pulling from a monorepo (with multiple project in it)
Expand Down
4 changes: 2 additions & 2 deletions docker-flex-all-in-one/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

# the following ARGs set default base images
# they can be overriden in build process via --build-arg option
ARG JANS_AIO_IMAGE=ghcr.io/janssenproject/jans/all-in-one:1.0.20_dev
ARG FLEX_ADMIN_UI_IMAGE=ghcr.io/gluufederation/flex/admin-ui:1.0.20_dev
ARG JANS_AIO_IMAGE=ghcr.io/janssenproject/jans/all-in-one:1.0.20-1
ARG FLEX_ADMIN_UI_IMAGE=ghcr.io/gluufederation/flex/admin-ui:1.0.20-1

# original Janssen version
ARG CN_VERSION=1.0.20-SNAPSHOT
Expand Down
4 changes: 2 additions & 2 deletions docker-flex-monolith/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ EXPOSE 443 8080 1636
# flex-linux-setup
# =====================

ENV FLEX_SOURCE_VERSION=2d8e13deb4364063ffc7270d617697eb0994ead7
ENV FLEX_SOURCE_VERSION=495536cefedfe27116df174c3c73ac05369f90a1
# cleanup
RUN rm -rf /tmp/jans

Expand Down Expand Up @@ -88,7 +88,7 @@ ENV CN_GLUU_LICENSE_SSA="" \
LABEL org.opencontainers.image.url="ghcr.io/gluufederation/flex/monolith" \
org.opencontainers.image.authors="GluuFederation <support@gluu.org>" \
org.opencontainers.image.vendor="GluuFederation" \
org.opencontainers.image.version="1.0.19" \
org.opencontainers.image.version="1.0.20" \
org.opencontainers.image.title="GluuFederation Flex Monolith Image" \
org.opencontainers.image.description="Janssen Authorization server + Casa + AdminUI"

Expand Down

0 comments on commit e6fd336

Please sign in to comment.