Skip to content

Commit

Permalink
Release 4.2 CN
Browse files Browse the repository at this point in the history
in installer 1.2.0
  • Loading branch information
moabu committed Jul 20, 2020
1 parent e5c53e4 commit 2b2937f
Show file tree
Hide file tree
Showing 40 changed files with 85 additions and 47 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/awseks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:
{
"ACCEPT_GLUU_LICENSE": "Y",
"TEST_ENVIRONMENT": "Y",
"GLUU_VERSION": "4.2.0_dev",
"GLUU_VERSION": "4.2.0_01",
"GLUU_UPGRADE_TARGET_VERSION": "",
"NGINX_INGRESS_NAMESPACE": "ingress-nginx",
"GLUU_HELM_RELEASE_NAME": "helm",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/googlegke.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:
{
"ACCEPT_GLUU_LICENSE": "Y",
"TEST_ENVIRONMENT": "Y",
"GLUU_VERSION": "4.2.0_dev",
"GLUU_VERSION": "4.2.0_01",
"GLUU_UPGRADE_TARGET_VERSION": "",
"NGINX_INGRESS_NAMESPACE": "ingress-nginx",
"GLUU_HELM_RELEASE_NAME": "helm",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/microk8s.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
max-parallel: 4
matrix:
python-version: [3.7]
gluu-version: ['"4.2.0_dev"']
gluu-version: ['"4.2.0_01"']
test-cases: ["install", "helm-install-gluu"]
persistence-backends: ['"ldap"','"couchbase"']

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/minikube.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
max-parallel: 4
matrix:
python-version: [3.7]
gluu-version: ['"4.2.0_dev"']
gluu-version: ['"4.2.0_01"']
persistence-backends: ['"ldap"']
steps:
- name: Checkout code
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
![googlegke](https://github.com/GluuFederation/cloud-native-edition/workflows/googlegke/badge.svg?branch=4.2)


# pygluu-kubernetes![CDNJS](https://img.shields.io/badge/Release-v1.2.0beta-green.svg?style=for-the-badge)
# pygluu-kubernetes![CDNJS](https://img.shields.io/badge/Release-v1.2.0-green.svg?style=for-the-badge)

## Kubernetes recipes

Expand Down
2 changes: 1 addition & 1 deletion pygluu/kubernetes/templates/casa/base/deployments.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
containers:
- name: casa
imagePullPolicy: Always
image: gluufederation/casa:4.2.0_dev
image: gluufederation/casa:4.2.0_01
command:
- /bin/sh
- -c
Expand Down
2 changes: 1 addition & 1 deletion pygluu/kubernetes/templates/casa/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ resources:
- deployments.yaml
images:
- name: gluufederation/casa
newTag: 4.2.0_dev
newTag: 4.2.0_01
2 changes: 1 addition & 1 deletion pygluu/kubernetes/templates/fido2/base/deployments.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
containers:
- name: fido2
imagePullPolicy: Always
image: gluufederation/fido2:4.2.0_dev
image: gluufederation/fido2:4.2.0_01
command:
- /bin/sh
- -c
Expand Down
2 changes: 1 addition & 1 deletion pygluu/kubernetes/templates/fido2/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ resources:
- deployments.yaml
images:
- name: gluufederation/fido2
newTag: 4.2.0_dev
newTag: 4.2.0_01
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
name: updatelbip
containers:
- name: gg-kong-ui
image: gluufederation/gluu-gateway-ui:4.2.0_dev
image: gluufederation/gluu-gateway-ui:4.2.0_01
command:
- /bin/sh
- -c
Expand Down
2 changes: 1 addition & 1 deletion pygluu/kubernetes/templates/gluu-gateway-ui/base/jobs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
secretName: tls-certificate
containers:
- name: gg-ui-prepareation
image: gluufederation/gluu-gateway-ui:4.2.0_dev
image: gluufederation/gluu-gateway-ui:4.2.0_01
imagePullPolicy: Always
env:
- name: DB_PASSWORD
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ resources:
- ingress.yaml
images:
- name: gluufederation/gluu-gateway-ui
newTag: 4.2.0_dev
newTag: 4.2.0_01
configMapGenerator:
- name: gg-ui-cm
literals:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ spec:
value: /dev/stderr
- name: KONG_PROXY_ERROR_LOG
value: /dev/stderr
image: gluufederation/gluu-gateway:4.2.0_dev
image: gluufederation/gluu-gateway:4.2.0_01
lifecycle:
preStop:
exec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
restartPolicy: Never
containers:
- name: kong-migration
image: gluufederation/gluu-gateway:4.2.0_dev
image: gluufederation/gluu-gateway:4.2.0_01
env:
- name: KONG_DATABASE
value: "postgres"
Expand Down
38 changes: 38 additions & 0 deletions pygluu/kubernetes/templates/gluu_versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,43 @@
"GLUU_GATEWAY_UI_IMAGE_TAG": "4.2.0_dev",
"UPGRADE_IMAGE_NAME": "gluufederation/upgrade",
"UPGRADE_IMAGE_TAG": "4.2.0_dev"
},
"4.2.0_01": {
"CASA_IMAGE_NAME": "gluufederation/casa",
"CASA_IMAGE_TAG": "4.2.0_01",
"FIDO2_IMAGE_NAME": "gluufederation/fido2",
"FIDO2_IMAGE_TAG": "4.2.0_01",
"SCIM_IMAGE_NAME": "gluufederation/scim",
"SCIM_IMAGE_TAG": "4.2.0_01",
"CONFIG_IMAGE_NAME": "gluufederation/config-init",
"CONFIG_IMAGE_TAG": "4.2.0_01",
"CACHE_REFRESH_ROTATE_IMAGE_NAME": "gluufederation/cr-rotate",
"CACHE_REFRESH_ROTATE_IMAGE_TAG": "4.2.0_01",
"CERT_MANAGER_IMAGE_NAME": "gluufederation/certmanager",
"CERT_MANAGER_IMAGE_TAG": "4.2.0_01",
"LDAP_IMAGE_NAME": "gluufederation/wrends",
"LDAP_IMAGE_TAG": "4.2.0_01",
"JACKRABBIT_IMAGE_NAME": "gluufederation/jackrabbit",
"JACKRABBIT_IMAGE_TAG": "4.2.0_01",
"OXAUTH_IMAGE_NAME": "gluufederation/oxauth",
"OXAUTH_IMAGE_TAG": "4.2.0_01",
"OXD_IMAGE_NAME": "gluufederation/oxd-server",
"OXD_IMAGE_TAG": "4.2.0_01",
"OXPASSPORT_IMAGE_NAME": "gluufederation/oxpassport",
"OXPASSPORT_IMAGE_TAG": "4.2.0_01",
"OXSHIBBOLETH_IMAGE_NAME": "gluufederation/oxshibboleth",
"OXSHIBBOLETH_IMAGE_TAG": "4.2.0_01",
"OXTRUST_IMAGE_NAME": "gluufederation/oxtrust",
"OXTRUST_IMAGE_TAG": "4.2.0_01",
"PERSISTENCE_IMAGE_NAME": "gluufederation/persistence",
"PERSISTENCE_IMAGE_TAG": "4.2.0_01",
"RADIUS_IMAGE_NAME": "gluufederation/radius",
"RADIUS_IMAGE_TAG": "4.2.0_01",
"GLUU_GATEWAY_IMAGE_NAME": "gluufederation/gluu-gateway",
"GLUU_GATEWAY_IMAGE_TAG": "4.2.0_01",
"GLUU_GATEWAY_UI_IMAGE_NAME": "gluufederation/gluu-gateway-ui",
"GLUU_GATEWAY_UI_IMAGE_TAG": "4.2.0_01",
"UPGRADE_IMAGE_NAME": "gluufederation/upgrade",
"UPGRADE_IMAGE_TAG": "4.2.0_01"
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# License terms and conditions for Gluu Cloud Native Edition:
# https://www.apache.org/licenses/LICENSE-2.0
apiVersion: v1
appVersion: "4.2.0_dev"
appVersion: "4.2.0_01"
home: https://gluu.org/docs/gg/
maintainers:
- name: Gluu
Expand Down
6 changes: 3 additions & 3 deletions pygluu/kubernetes/templates/helm/gluu-gateway-ui/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
replicaCount: 1
image:
repository: gluufederation/gluu-gateway-ui
tag: 4.2.0_dev
tag: 4.2.0_01
pullPolicy: Always
cloud:
enabled: true
Expand Down Expand Up @@ -38,11 +38,11 @@ opServerUrl: "demoexample.gluu.org"
oxdId:
clientId:
clientSecret:
oxdServerVersion: "4.1"
oxdServerVersion: "4.2"
ggHost: "https://demoexample.gluu.org/gg-ui"
ggUiRedirectUrlHost: ""
explicitHost: "0.0.0.0"
ggVersion: "4.1"
ggVersion: "4.2"
nameOverride: ""
fullnameOverride: ""

Expand Down
2 changes: 1 addition & 1 deletion pygluu/kubernetes/templates/helm/gluu-upgrade/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: gluu-upgrade
description: A Helm chart for upgrading gluu server
type: application
version: 1.0.4
appVersion: 4.2.0_dev
appVersion: 4.2.0_01
maintainers:
- name: Gluu
email: [email protected]
Expand Down
2 changes: 1 addition & 1 deletion pygluu/kubernetes/templates/helm/gluu/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# License terms and conditions for Gluu Cloud Native Edition:
# https://www.apache.org/licenses/LICENSE-2.0
apiVersion: v2
appVersion: "4.2.0_dev"
appVersion: "4.2.0_01"
home: https://www.gluu.org
maintainers:
- name: Gluu
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# License terms and conditions for Gluu Cloud Native Edition:
# https://www.apache.org/licenses/LICENSE-2.0
apiVersion: v1
appVersion: "4.2.0_dev"
appVersion: "4.2.0_01"
description: A Helm chart for casa
name: casa
version: 1.0.4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ replicas: 1

image:
repository: gluufederation/casa
tag: 4.2.0_dev
tag: 4.2.0_01
pullPolicy: Always

imagePullSecrets: []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# https://www.apache.org/licenses/LICENSE-2.0
image:
repository: gluufederation/scim
tag: 4.2.0_dev
tag: 4.2.0_01
pullPolicy: Always

#Resources for the deployment
Expand Down
8 changes: 4 additions & 4 deletions pygluu/kubernetes/templates/helm/gluu/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ config:

image:
repository: gluufederation/config-init
tag: 4.2.0_dev
tag: 4.2.0_01
resources: {}
# limits:
# cpu: 500m
Expand Down Expand Up @@ -249,7 +249,7 @@ fido2:
replicas: 1
image:
repository: gluufederation/fido2
tag: 4.2.0_dev
tag: 4.2.0_01
pullPolicy: Always
# default resource limits
resources:
Expand All @@ -265,7 +265,7 @@ scim:
scimServiceName: scim
image:
repository: gluufederation/scim
tag: 4.2.0_dev
tag: 4.2.0_01
pullPolicy: Always
# default resource limits
resources:
Expand Down Expand Up @@ -301,7 +301,7 @@ casa:
replicas: 1
image:
repository: gluufederation/casa
tag: 4.2.0_dev
tag: 4.2.0_01
pullPolicy: Always
resources:
requests:
Expand Down
2 changes: 1 addition & 1 deletion pygluu/kubernetes/templates/helm/ldap-backup/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: ldap-backup
description: A backup strategy for LDAP
type: application
version: 1.0.0
appVersion: 4.2.0_dev
appVersion: 4.2.0_01
maintainers:
- name: Gluu
email: [email protected]
Expand Down
2 changes: 1 addition & 1 deletion pygluu/kubernetes/templates/helm/ldap-backup/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ fullnameOverride: ""
restartPolicy: Never
image:
repository: gluufederation/wrends
tag: 4.2.0_dev
tag: 4.2.0_01
pullPolicy: Always

serviceAccount:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ resources:
- services.yaml
images:
- name: gluufederation/jackrabbit
newTag: 4.2.0_dev
newTag: 4.2.0_01
2 changes: 1 addition & 1 deletion pygluu/kubernetes/templates/ldap/backup/cronjobs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: backup
image: gluufederation/wrends:4.2.0_dev
image: gluufederation/wrends:4.2.0_01
envFrom:
- configMapRef:
name: opendj-backup-cm
Expand Down
2 changes: 1 addition & 1 deletion pygluu/kubernetes/templates/ldap/backup/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ resources:
- cronjobs.yaml
images:
- name: gluufederation/wrends
newTag: 4.2.0_dev
newTag: 4.2.0_01
configMapGenerator:
- name: opendj-backup-cm
literals:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: oxauth-key-rotation
image: gluufederation/certmanager:4.2.0_dev
image: gluufederation/certmanager:4.2.0_01
resources:
requests:
memory: "300Mi"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ resources:
- cronjobs.yaml
images:
- name: gluufederation/certmanager
newTag: 4.2.0_dev
newTag: 4.2.0_01
2 changes: 1 addition & 1 deletion pygluu/kubernetes/templates/oxauth/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ resources:
- deployments.yaml
images:
- name: gluufederation/oxauth
newTag: 4.2.0_dev
newTag: 4.2.0_01
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ resources:
- services.yaml
images:
- name: gluufederation/oxpassport
newTag: 4.2.0_dev
newTag: 4.2.0_01
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ resources:
- services.yaml
images:
- name: gluufederation/oxshibboleth
newTag: 4.2.0_dev
newTag: 4.2.0_01
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ resources:
- services.yaml
images:
- name: gluufederation/oxtrust
newTag: 4.2.0_dev
newTag: 4.2.0_01
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ resources:
- jobs.yaml
images:
- name: gluufederation/persistence
newTag: 4.2.0_dev
newTag: 4.2.0_01

2 changes: 1 addition & 1 deletion pygluu/kubernetes/templates/radius/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ resources:
- services.yaml
images:
- name: gluufederation/radius
newTag: 4.2.0_dev
newTag: 4.2.0_01
2 changes: 1 addition & 1 deletion pygluu/kubernetes/templates/scim/base/deployments.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
containers:
- name: scim
imagePullPolicy: Always
image: gluufederation/scim:4.2.0_dev
image: gluufederation/scim:4.2.0_01
command:
- /bin/sh
- -c
Expand Down
2 changes: 1 addition & 1 deletion pygluu/kubernetes/templates/scim/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ resources:
- deployments.yaml
images:
- name: gluufederation/scim
newTag: 4.2.0_dev
newTag: 4.2.0_01
2 changes: 1 addition & 1 deletion pygluu/kubernetes/templates/upgrade/base/jobs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
envFrom:
- configMapRef:
name: upgrade-cm
args: ["--source", "4.0", "--target", "4.1"]
args: ["--source", "4.1", "--target", "4.2"]
volumeMounts:
- name: cb-pass
mountPath: "/etc/gluu/conf/couchbase_password"
Expand Down
Loading

0 comments on commit 2b2937f

Please sign in to comment.