From 71b31a28125b2aae43e841ebb73f13ff154244c0 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 9 May 2021 16:06:27 +0200 Subject: [PATCH 01/19] ci: fix web api client not being generated before docker build Signed-off-by: Jens Langhammer --- .github/workflows/tag.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index 293289567..d2160ddd3 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -11,6 +11,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@master + - name: prepare ts api client + run: | + docker run --rm -v $(pwd):/local openapitools/openapi-generator-cli generate -i /local/swagger.yaml -g typescript-fetch -o /local/web/api --additional-properties=typescriptThreePlus=true,supportsES6=true,npmName=authentik-api,npmVersion=1.0.0 - name: Pre-release test run: | sudo apt-get install -y pwgen From 70c25692ebf6b8870a128991021fd25797debd63 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 9 May 2021 16:07:50 +0200 Subject: [PATCH 02/19] release: 2021.5.1-rc1 --- .bumpversion.cfg | 2 +- .github/workflows/release.yml | 14 +++++++------- authentik/__init__.py | 2 +- docker-compose.yml | 4 ++-- internal/constants/constants.go | 2 +- outpost/pkg/version.go | 2 +- web/nginx.conf | 2 +- web/src/constants.ts | 2 +- website/docs/installation/docker-compose.md | 2 +- .../docs/outposts/manual-deploy-docker-compose.md | 2 +- website/docs/outposts/manual-deploy-kubernetes.md | 14 +++++++------- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index c00de9016..09d266474 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2021.4.5 +current_version = 2021.5.1-rc1 tag = True commit = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)\-?(?P.*) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bb922e2dd..351e1caa9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,9 +24,9 @@ jobs: with: push: true tags: | - beryju/authentik:2021.4.5, + beryju/authentik:2021.5.1-rc1, beryju/authentik:latest, - ghcr.io/goauthentik/server:2021.4.5, + ghcr.io/goauthentik/server:2021.5.1-rc1, ghcr.io/goauthentik/server:latest platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8 build-proxy: @@ -56,9 +56,9 @@ jobs: with: push: true tags: | - beryju/authentik-proxy:2021.4.5, + beryju/authentik-proxy:2021.5.1-rc1, beryju/authentik-proxy:latest, - ghcr.io/goauthentik/proxy:2021.4.5, + ghcr.io/goauthentik/proxy:2021.5.1-rc1, ghcr.io/goauthentik/proxy:latest context: outpost/ file: outpost/proxy.Dockerfile @@ -90,9 +90,9 @@ jobs: with: push: true tags: | - beryju/authentik-ldap:2021.4.5, + beryju/authentik-ldap:2021.5.1-rc1, beryju/authentik-ldap:latest, - ghcr.io/goauthentik/ldap:2021.4.5, + ghcr.io/goauthentik/ldap:2021.5.1-rc1, ghcr.io/goauthentik/ldap:latest context: outpost/ file: outpost/ldap.Dockerfile @@ -128,5 +128,5 @@ jobs: SENTRY_PROJECT: authentik SENTRY_URL: https://sentry.beryju.org with: - version: authentik@2021.4.5 + version: authentik@2021.5.1-rc1 environment: beryjuorg-prod diff --git a/authentik/__init__.py b/authentik/__init__.py index e89c3acb0..f55cc9d29 100644 --- a/authentik/__init__.py +++ b/authentik/__init__.py @@ -1,3 +1,3 @@ """authentik""" -__version__ = "2021.4.5" +__version__ = "2021.5.1-rc1" ENV_GIT_HASH_KEY = "GIT_BUILD_HASH" diff --git a/docker-compose.yml b/docker-compose.yml index dcabafb97..450f060da 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: networks: - internal server: - image: ${AUTHENTIK_IMAGE:-beryju/authentik}:${AUTHENTIK_TAG:-2021.4.5} + image: ${AUTHENTIK_IMAGE:-beryju/authentik}:${AUTHENTIK_TAG:-2021.5.1-rc1} restart: unless-stopped command: server environment: @@ -52,7 +52,7 @@ services: - "0.0.0.0:9000:9000" - "0.0.0.0:9443:9443" worker: - image: ${AUTHENTIK_IMAGE:-beryju/authentik}:${AUTHENTIK_TAG:-2021.4.5} + image: ${AUTHENTIK_IMAGE:-beryju/authentik}:${AUTHENTIK_TAG:-2021.5.1-rc1} restart: unless-stopped command: worker networks: diff --git a/internal/constants/constants.go b/internal/constants/constants.go index cae501e05..7c720a5e0 100644 --- a/internal/constants/constants.go +++ b/internal/constants/constants.go @@ -1,3 +1,3 @@ package constants -const VERSION = "2021.4.5" +const VERSION = "2021.5.1-rc1" diff --git a/outpost/pkg/version.go b/outpost/pkg/version.go index 3745556ef..122525099 100644 --- a/outpost/pkg/version.go +++ b/outpost/pkg/version.go @@ -1,3 +1,3 @@ package pkg -const VERSION = "2021.4.5" +const VERSION = "2021.5.1-rc1" diff --git a/web/nginx.conf b/web/nginx.conf index 13085576e..23c791849 100644 --- a/web/nginx.conf +++ b/web/nginx.conf @@ -81,7 +81,7 @@ http { location /static/ { expires 31d; add_header Cache-Control "public, no-transform"; - add_header X-authentik-version "2021.4.5"; + add_header X-authentik-version "2021.5.1-rc1"; add_header Vary X-authentik-version; } diff --git a/web/src/constants.ts b/web/src/constants.ts index 601bd2231..8bdabbaa2 100644 --- a/web/src/constants.ts +++ b/web/src/constants.ts @@ -3,7 +3,7 @@ export const SUCCESS_CLASS = "pf-m-success"; export const ERROR_CLASS = "pf-m-danger"; export const PROGRESS_CLASS = "pf-m-in-progress"; export const CURRENT_CLASS = "pf-m-current"; -export const VERSION = "2021.4.5"; +export const VERSION = "2021.5.1-rc1"; export const PAGE_SIZE = 20; export const EVENT_REFRESH = "ak-refresh"; export const EVENT_NOTIFICATION_TOGGLE = "ak-notification-toggle"; diff --git a/website/docs/installation/docker-compose.md b/website/docs/installation/docker-compose.md index b08d66766..96531e290 100644 --- a/website/docs/installation/docker-compose.md +++ b/website/docs/installation/docker-compose.md @@ -16,7 +16,7 @@ Download the latest `docker-compose.yml` from [here](https://raw.githubuserconte To optionally enable error-reporting, run `echo AUTHENTIK_ERROR_REPORTING__ENABLED=true >> .env` -To optionally deploy a different version run `echo AUTHENTIK_TAG=2021.4.5 >> .env` +To optionally deploy a different version run `echo AUTHENTIK_TAG=2021.5.1-rc1 >> .env` If this is a fresh authentik install run the following commands to generate a password: diff --git a/website/docs/outposts/manual-deploy-docker-compose.md b/website/docs/outposts/manual-deploy-docker-compose.md index e46401882..a4dc5a082 100644 --- a/website/docs/outposts/manual-deploy-docker-compose.md +++ b/website/docs/outposts/manual-deploy-docker-compose.md @@ -11,7 +11,7 @@ version: "3.5" services: authentik_proxy: - image: beryju/authentik-proxy:2021.4.5 + image: beryju/authentik-proxy:2021.5.1-rc1 ports: - 4180:4180 - 4443:4443 diff --git a/website/docs/outposts/manual-deploy-kubernetes.md b/website/docs/outposts/manual-deploy-kubernetes.md index f265db3b3..68eb3fd6c 100644 --- a/website/docs/outposts/manual-deploy-kubernetes.md +++ b/website/docs/outposts/manual-deploy-kubernetes.md @@ -14,7 +14,7 @@ metadata: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.4.5 + app.kubernetes.io/version: 2021.5.1-rc1 name: authentik-outpost-api stringData: authentik_host: "__AUTHENTIK_URL__" @@ -29,7 +29,7 @@ metadata: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.4.5 + app.kubernetes.io/version: 2021.5.1-rc1 name: authentik-outpost spec: ports: @@ -54,7 +54,7 @@ metadata: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.4.5 + app.kubernetes.io/version: 2021.5.1-rc1 name: authentik-outpost spec: selector: @@ -62,14 +62,14 @@ spec: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.4.5 + app.kubernetes.io/version: 2021.5.1-rc1 template: metadata: labels: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.4.5 + app.kubernetes.io/version: 2021.5.1-rc1 spec: containers: - env: @@ -88,7 +88,7 @@ spec: secretKeyRef: key: authentik_host_insecure name: authentik-outpost-api - image: beryju/authentik-proxy:2021.4.5 + image: beryju/authentik-proxy:2021.5.1-rc1 name: proxy ports: - containerPort: 4180 @@ -110,7 +110,7 @@ metadata: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.4.5 + app.kubernetes.io/version: 2021.5.1-rc1 name: authentik-outpost spec: rules: From ef7d9c4d3557632c7653f7ef98c2f117c3558858 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 9 May 2021 16:37:03 +0200 Subject: [PATCH 03/19] ci: fix mixed environment variables Signed-off-by: Jens Langhammer --- .github/workflows/release.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 351e1caa9..8f0dc86ae 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,8 +17,8 @@ jobs: - name: Docker Login Registry uses: docker/login-action@v1 with: - username: ${{ secrets.DOCKER_PASSWORD }} - password: ${{ secrets.DOCKER_USERNAME }} + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} - name: Building Docker Image uses: docker/build-push-action@v2 with: @@ -49,8 +49,8 @@ jobs: - name: Docker Login Registry uses: docker/login-action@v1 with: - username: ${{ secrets.DOCKER_PASSWORD }} - password: ${{ secrets.DOCKER_USERNAME }} + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} - name: Building Docker Image uses: docker/build-push-action@v2 with: @@ -83,8 +83,8 @@ jobs: - name: Docker Login Registry uses: docker/login-action@v1 with: - username: ${{ secrets.DOCKER_PASSWORD }} - password: ${{ secrets.DOCKER_USERNAME }} + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} - name: Building Docker Image uses: docker/build-push-action@v2 with: From d76a9c211ad48ec1aae1cd8ac4ec034b77075632 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 9 May 2021 16:41:45 +0200 Subject: [PATCH 04/19] ci: fix web api client not being generated for general build Signed-off-by: Jens Langhammer --- .github/workflows/release.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8f0dc86ae..0c4f196e1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,6 +19,9 @@ jobs: with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} + - name: prepare ts api client + run: | + docker run --rm -v $(pwd):/local openapitools/openapi-generator-cli generate -i /local/swagger.yaml -g typescript-fetch -o /local/web/api --additional-properties=typescriptThreePlus=true,supportsES6=true,npmName=authentik-api,npmVersion=1.0.0 - name: Building Docker Image uses: docker/build-push-action@v2 with: From 189427609f935fa1c03979f5701ff7e5016e9186 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 9 May 2021 16:41:52 +0200 Subject: [PATCH 05/19] ci: fix paths for go build Signed-off-by: Jens Langhammer --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0c4f196e1..86975ec25 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -44,7 +44,7 @@ jobs: cd outpost go get -u github.com/go-swagger/go-swagger/cmd/swagger swagger generate client -f ../swagger.yaml -A authentik -t pkg/ - go build -v . + go build -v ./cmd/proxy/server.go - name: Set up QEMU uses: docker/setup-qemu-action@v1 - name: Set up Docker Buildx @@ -78,7 +78,7 @@ jobs: cd outpost go get -u github.com/go-swagger/go-swagger/cmd/swagger swagger generate client -f ../swagger.yaml -A authentik -t pkg/ - go build -v . + go build -v ./cmd/ldap/server.go - name: Set up QEMU uses: docker/setup-qemu-action@v1 - name: Set up Docker Buildx From d3feab9463904097f4fef29546f72293e252453d Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 9 May 2021 16:43:36 +0200 Subject: [PATCH 06/19] release: 2021.5.1-rc2 --- .bumpversion.cfg | 2 +- .github/workflows/release.yml | 14 +++++++------- authentik/__init__.py | 2 +- docker-compose.yml | 4 ++-- internal/constants/constants.go | 2 +- outpost/pkg/version.go | 2 +- web/nginx.conf | 2 +- web/src/constants.ts | 2 +- website/docs/installation/docker-compose.md | 2 +- .../docs/outposts/manual-deploy-docker-compose.md | 2 +- website/docs/outposts/manual-deploy-kubernetes.md | 14 +++++++------- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 09d266474..65afba3f3 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2021.5.1-rc1 +current_version = 2021.5.1-rc2 tag = True commit = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)\-?(?P.*) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 86975ec25..9c20754ef 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,9 +27,9 @@ jobs: with: push: true tags: | - beryju/authentik:2021.5.1-rc1, + beryju/authentik:2021.5.1-rc2, beryju/authentik:latest, - ghcr.io/goauthentik/server:2021.5.1-rc1, + ghcr.io/goauthentik/server:2021.5.1-rc2, ghcr.io/goauthentik/server:latest platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8 build-proxy: @@ -59,9 +59,9 @@ jobs: with: push: true tags: | - beryju/authentik-proxy:2021.5.1-rc1, + beryju/authentik-proxy:2021.5.1-rc2, beryju/authentik-proxy:latest, - ghcr.io/goauthentik/proxy:2021.5.1-rc1, + ghcr.io/goauthentik/proxy:2021.5.1-rc2, ghcr.io/goauthentik/proxy:latest context: outpost/ file: outpost/proxy.Dockerfile @@ -93,9 +93,9 @@ jobs: with: push: true tags: | - beryju/authentik-ldap:2021.5.1-rc1, + beryju/authentik-ldap:2021.5.1-rc2, beryju/authentik-ldap:latest, - ghcr.io/goauthentik/ldap:2021.5.1-rc1, + ghcr.io/goauthentik/ldap:2021.5.1-rc2, ghcr.io/goauthentik/ldap:latest context: outpost/ file: outpost/ldap.Dockerfile @@ -131,5 +131,5 @@ jobs: SENTRY_PROJECT: authentik SENTRY_URL: https://sentry.beryju.org with: - version: authentik@2021.5.1-rc1 + version: authentik@2021.5.1-rc2 environment: beryjuorg-prod diff --git a/authentik/__init__.py b/authentik/__init__.py index f55cc9d29..1f6a26496 100644 --- a/authentik/__init__.py +++ b/authentik/__init__.py @@ -1,3 +1,3 @@ """authentik""" -__version__ = "2021.5.1-rc1" +__version__ = "2021.5.1-rc2" ENV_GIT_HASH_KEY = "GIT_BUILD_HASH" diff --git a/docker-compose.yml b/docker-compose.yml index 450f060da..a7c1d669e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: networks: - internal server: - image: ${AUTHENTIK_IMAGE:-beryju/authentik}:${AUTHENTIK_TAG:-2021.5.1-rc1} + image: ${AUTHENTIK_IMAGE:-beryju/authentik}:${AUTHENTIK_TAG:-2021.5.1-rc2} restart: unless-stopped command: server environment: @@ -52,7 +52,7 @@ services: - "0.0.0.0:9000:9000" - "0.0.0.0:9443:9443" worker: - image: ${AUTHENTIK_IMAGE:-beryju/authentik}:${AUTHENTIK_TAG:-2021.5.1-rc1} + image: ${AUTHENTIK_IMAGE:-beryju/authentik}:${AUTHENTIK_TAG:-2021.5.1-rc2} restart: unless-stopped command: worker networks: diff --git a/internal/constants/constants.go b/internal/constants/constants.go index 7c720a5e0..3b1937e00 100644 --- a/internal/constants/constants.go +++ b/internal/constants/constants.go @@ -1,3 +1,3 @@ package constants -const VERSION = "2021.5.1-rc1" +const VERSION = "2021.5.1-rc2" diff --git a/outpost/pkg/version.go b/outpost/pkg/version.go index 122525099..283f7abd2 100644 --- a/outpost/pkg/version.go +++ b/outpost/pkg/version.go @@ -1,3 +1,3 @@ package pkg -const VERSION = "2021.5.1-rc1" +const VERSION = "2021.5.1-rc2" diff --git a/web/nginx.conf b/web/nginx.conf index 23c791849..9784ea62d 100644 --- a/web/nginx.conf +++ b/web/nginx.conf @@ -81,7 +81,7 @@ http { location /static/ { expires 31d; add_header Cache-Control "public, no-transform"; - add_header X-authentik-version "2021.5.1-rc1"; + add_header X-authentik-version "2021.5.1-rc2"; add_header Vary X-authentik-version; } diff --git a/web/src/constants.ts b/web/src/constants.ts index 8bdabbaa2..d8eda0685 100644 --- a/web/src/constants.ts +++ b/web/src/constants.ts @@ -3,7 +3,7 @@ export const SUCCESS_CLASS = "pf-m-success"; export const ERROR_CLASS = "pf-m-danger"; export const PROGRESS_CLASS = "pf-m-in-progress"; export const CURRENT_CLASS = "pf-m-current"; -export const VERSION = "2021.5.1-rc1"; +export const VERSION = "2021.5.1-rc2"; export const PAGE_SIZE = 20; export const EVENT_REFRESH = "ak-refresh"; export const EVENT_NOTIFICATION_TOGGLE = "ak-notification-toggle"; diff --git a/website/docs/installation/docker-compose.md b/website/docs/installation/docker-compose.md index 96531e290..c4c18f251 100644 --- a/website/docs/installation/docker-compose.md +++ b/website/docs/installation/docker-compose.md @@ -16,7 +16,7 @@ Download the latest `docker-compose.yml` from [here](https://raw.githubuserconte To optionally enable error-reporting, run `echo AUTHENTIK_ERROR_REPORTING__ENABLED=true >> .env` -To optionally deploy a different version run `echo AUTHENTIK_TAG=2021.5.1-rc1 >> .env` +To optionally deploy a different version run `echo AUTHENTIK_TAG=2021.5.1-rc2 >> .env` If this is a fresh authentik install run the following commands to generate a password: diff --git a/website/docs/outposts/manual-deploy-docker-compose.md b/website/docs/outposts/manual-deploy-docker-compose.md index a4dc5a082..13417b5f3 100644 --- a/website/docs/outposts/manual-deploy-docker-compose.md +++ b/website/docs/outposts/manual-deploy-docker-compose.md @@ -11,7 +11,7 @@ version: "3.5" services: authentik_proxy: - image: beryju/authentik-proxy:2021.5.1-rc1 + image: beryju/authentik-proxy:2021.5.1-rc2 ports: - 4180:4180 - 4443:4443 diff --git a/website/docs/outposts/manual-deploy-kubernetes.md b/website/docs/outposts/manual-deploy-kubernetes.md index 68eb3fd6c..d093aa7aa 100644 --- a/website/docs/outposts/manual-deploy-kubernetes.md +++ b/website/docs/outposts/manual-deploy-kubernetes.md @@ -14,7 +14,7 @@ metadata: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.5.1-rc1 + app.kubernetes.io/version: 2021.5.1-rc2 name: authentik-outpost-api stringData: authentik_host: "__AUTHENTIK_URL__" @@ -29,7 +29,7 @@ metadata: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.5.1-rc1 + app.kubernetes.io/version: 2021.5.1-rc2 name: authentik-outpost spec: ports: @@ -54,7 +54,7 @@ metadata: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.5.1-rc1 + app.kubernetes.io/version: 2021.5.1-rc2 name: authentik-outpost spec: selector: @@ -62,14 +62,14 @@ spec: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.5.1-rc1 + app.kubernetes.io/version: 2021.5.1-rc2 template: metadata: labels: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.5.1-rc1 + app.kubernetes.io/version: 2021.5.1-rc2 spec: containers: - env: @@ -88,7 +88,7 @@ spec: secretKeyRef: key: authentik_host_insecure name: authentik-outpost-api - image: beryju/authentik-proxy:2021.5.1-rc1 + image: beryju/authentik-proxy:2021.5.1-rc2 name: proxy ports: - containerPort: 4180 @@ -110,7 +110,7 @@ metadata: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.5.1-rc1 + app.kubernetes.io/version: 2021.5.1-rc2 name: authentik-outpost spec: rules: From 7abfd241500d20cc0c559da71fa2dc73cdf18b91 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 9 May 2021 17:23:19 +0200 Subject: [PATCH 07/19] ci: only build arm64 and arm Signed-off-by: Jens Langhammer --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9c20754ef..3c62cfd24 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,7 +31,7 @@ jobs: beryju/authentik:latest, ghcr.io/goauthentik/server:2021.5.1-rc2, ghcr.io/goauthentik/server:latest - platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8 + platforms: linux/amd64,linux/arm64,linux/arm build-proxy: runs-on: ubuntu-latest steps: @@ -65,7 +65,7 @@ jobs: ghcr.io/goauthentik/proxy:latest context: outpost/ file: outpost/proxy.Dockerfile - platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8 + platforms: linux/amd64,linux/arm64,linux/arm build-ldap: runs-on: ubuntu-latest steps: @@ -99,7 +99,7 @@ jobs: ghcr.io/goauthentik/ldap:latest context: outpost/ file: outpost/ldap.Dockerfile - platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8 + platforms: linux/amd64,linux/arm64,linux/arm test-release: needs: - build-server From cd3f02fd3b02f6e89ce65cd1dca37523806fc8c2 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 9 May 2021 17:25:48 +0200 Subject: [PATCH 08/19] release: 2021.5.1-rc3 --- .bumpversion.cfg | 2 +- .github/workflows/release.yml | 14 +++++++------- authentik/__init__.py | 2 +- docker-compose.yml | 4 ++-- internal/constants/constants.go | 2 +- outpost/pkg/version.go | 2 +- web/nginx.conf | 2 +- web/src/constants.ts | 2 +- website/docs/installation/docker-compose.md | 2 +- .../docs/outposts/manual-deploy-docker-compose.md | 2 +- website/docs/outposts/manual-deploy-kubernetes.md | 14 +++++++------- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 65afba3f3..51fe42f39 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2021.5.1-rc2 +current_version = 2021.5.1-rc3 tag = True commit = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)\-?(?P.*) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3c62cfd24..8bef9c060 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,9 +27,9 @@ jobs: with: push: true tags: | - beryju/authentik:2021.5.1-rc2, + beryju/authentik:2021.5.1-rc3, beryju/authentik:latest, - ghcr.io/goauthentik/server:2021.5.1-rc2, + ghcr.io/goauthentik/server:2021.5.1-rc3, ghcr.io/goauthentik/server:latest platforms: linux/amd64,linux/arm64,linux/arm build-proxy: @@ -59,9 +59,9 @@ jobs: with: push: true tags: | - beryju/authentik-proxy:2021.5.1-rc2, + beryju/authentik-proxy:2021.5.1-rc3, beryju/authentik-proxy:latest, - ghcr.io/goauthentik/proxy:2021.5.1-rc2, + ghcr.io/goauthentik/proxy:2021.5.1-rc3, ghcr.io/goauthentik/proxy:latest context: outpost/ file: outpost/proxy.Dockerfile @@ -93,9 +93,9 @@ jobs: with: push: true tags: | - beryju/authentik-ldap:2021.5.1-rc2, + beryju/authentik-ldap:2021.5.1-rc3, beryju/authentik-ldap:latest, - ghcr.io/goauthentik/ldap:2021.5.1-rc2, + ghcr.io/goauthentik/ldap:2021.5.1-rc3, ghcr.io/goauthentik/ldap:latest context: outpost/ file: outpost/ldap.Dockerfile @@ -131,5 +131,5 @@ jobs: SENTRY_PROJECT: authentik SENTRY_URL: https://sentry.beryju.org with: - version: authentik@2021.5.1-rc2 + version: authentik@2021.5.1-rc3 environment: beryjuorg-prod diff --git a/authentik/__init__.py b/authentik/__init__.py index 1f6a26496..4cbbf2635 100644 --- a/authentik/__init__.py +++ b/authentik/__init__.py @@ -1,3 +1,3 @@ """authentik""" -__version__ = "2021.5.1-rc2" +__version__ = "2021.5.1-rc3" ENV_GIT_HASH_KEY = "GIT_BUILD_HASH" diff --git a/docker-compose.yml b/docker-compose.yml index a7c1d669e..108dcbc0e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: networks: - internal server: - image: ${AUTHENTIK_IMAGE:-beryju/authentik}:${AUTHENTIK_TAG:-2021.5.1-rc2} + image: ${AUTHENTIK_IMAGE:-beryju/authentik}:${AUTHENTIK_TAG:-2021.5.1-rc3} restart: unless-stopped command: server environment: @@ -52,7 +52,7 @@ services: - "0.0.0.0:9000:9000" - "0.0.0.0:9443:9443" worker: - image: ${AUTHENTIK_IMAGE:-beryju/authentik}:${AUTHENTIK_TAG:-2021.5.1-rc2} + image: ${AUTHENTIK_IMAGE:-beryju/authentik}:${AUTHENTIK_TAG:-2021.5.1-rc3} restart: unless-stopped command: worker networks: diff --git a/internal/constants/constants.go b/internal/constants/constants.go index 3b1937e00..2fc0c3f07 100644 --- a/internal/constants/constants.go +++ b/internal/constants/constants.go @@ -1,3 +1,3 @@ package constants -const VERSION = "2021.5.1-rc2" +const VERSION = "2021.5.1-rc3" diff --git a/outpost/pkg/version.go b/outpost/pkg/version.go index 283f7abd2..755dfc9fe 100644 --- a/outpost/pkg/version.go +++ b/outpost/pkg/version.go @@ -1,3 +1,3 @@ package pkg -const VERSION = "2021.5.1-rc2" +const VERSION = "2021.5.1-rc3" diff --git a/web/nginx.conf b/web/nginx.conf index 9784ea62d..c60cb204c 100644 --- a/web/nginx.conf +++ b/web/nginx.conf @@ -81,7 +81,7 @@ http { location /static/ { expires 31d; add_header Cache-Control "public, no-transform"; - add_header X-authentik-version "2021.5.1-rc2"; + add_header X-authentik-version "2021.5.1-rc3"; add_header Vary X-authentik-version; } diff --git a/web/src/constants.ts b/web/src/constants.ts index d8eda0685..7d77036c8 100644 --- a/web/src/constants.ts +++ b/web/src/constants.ts @@ -3,7 +3,7 @@ export const SUCCESS_CLASS = "pf-m-success"; export const ERROR_CLASS = "pf-m-danger"; export const PROGRESS_CLASS = "pf-m-in-progress"; export const CURRENT_CLASS = "pf-m-current"; -export const VERSION = "2021.5.1-rc2"; +export const VERSION = "2021.5.1-rc3"; export const PAGE_SIZE = 20; export const EVENT_REFRESH = "ak-refresh"; export const EVENT_NOTIFICATION_TOGGLE = "ak-notification-toggle"; diff --git a/website/docs/installation/docker-compose.md b/website/docs/installation/docker-compose.md index c4c18f251..2be9f0bff 100644 --- a/website/docs/installation/docker-compose.md +++ b/website/docs/installation/docker-compose.md @@ -16,7 +16,7 @@ Download the latest `docker-compose.yml` from [here](https://raw.githubuserconte To optionally enable error-reporting, run `echo AUTHENTIK_ERROR_REPORTING__ENABLED=true >> .env` -To optionally deploy a different version run `echo AUTHENTIK_TAG=2021.5.1-rc2 >> .env` +To optionally deploy a different version run `echo AUTHENTIK_TAG=2021.5.1-rc3 >> .env` If this is a fresh authentik install run the following commands to generate a password: diff --git a/website/docs/outposts/manual-deploy-docker-compose.md b/website/docs/outposts/manual-deploy-docker-compose.md index 13417b5f3..3b8267f2b 100644 --- a/website/docs/outposts/manual-deploy-docker-compose.md +++ b/website/docs/outposts/manual-deploy-docker-compose.md @@ -11,7 +11,7 @@ version: "3.5" services: authentik_proxy: - image: beryju/authentik-proxy:2021.5.1-rc2 + image: beryju/authentik-proxy:2021.5.1-rc3 ports: - 4180:4180 - 4443:4443 diff --git a/website/docs/outposts/manual-deploy-kubernetes.md b/website/docs/outposts/manual-deploy-kubernetes.md index d093aa7aa..0228cef99 100644 --- a/website/docs/outposts/manual-deploy-kubernetes.md +++ b/website/docs/outposts/manual-deploy-kubernetes.md @@ -14,7 +14,7 @@ metadata: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.5.1-rc2 + app.kubernetes.io/version: 2021.5.1-rc3 name: authentik-outpost-api stringData: authentik_host: "__AUTHENTIK_URL__" @@ -29,7 +29,7 @@ metadata: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.5.1-rc2 + app.kubernetes.io/version: 2021.5.1-rc3 name: authentik-outpost spec: ports: @@ -54,7 +54,7 @@ metadata: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.5.1-rc2 + app.kubernetes.io/version: 2021.5.1-rc3 name: authentik-outpost spec: selector: @@ -62,14 +62,14 @@ spec: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.5.1-rc2 + app.kubernetes.io/version: 2021.5.1-rc3 template: metadata: labels: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.5.1-rc2 + app.kubernetes.io/version: 2021.5.1-rc3 spec: containers: - env: @@ -88,7 +88,7 @@ spec: secretKeyRef: key: authentik_host_insecure name: authentik-outpost-api - image: beryju/authentik-proxy:2021.5.1-rc2 + image: beryju/authentik-proxy:2021.5.1-rc3 name: proxy ports: - containerPort: 4180 @@ -110,7 +110,7 @@ metadata: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.5.1-rc2 + app.kubernetes.io/version: 2021.5.1-rc3 name: authentik-outpost spec: rules: From 481260a5cabbab9f6c917028aa896bad4b146401 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 9 May 2021 17:51:56 +0200 Subject: [PATCH 09/19] ci: bump checkout actions Signed-off-by: Jens Langhammer --- .github/workflows/release.yml | 10 +++++----- .github/workflows/tag.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8bef9c060..194d0a784 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,7 @@ jobs: build-server: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Set up QEMU uses: docker/setup-qemu-action@v1 - name: Set up Docker Buildx @@ -35,7 +35,7 @@ jobs: build-proxy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: go-version: "^1.15" @@ -69,7 +69,7 @@ jobs: build-ldap: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: go-version: "^1.15" @@ -107,7 +107,7 @@ jobs: - build-ldap runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Run test suite in final docker images run: | sudo apt-get install -y pwgen @@ -122,7 +122,7 @@ jobs: - test-release runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Create a Sentry.io release uses: getsentry/action-release@v1 env: diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index d2160ddd3..97e7e9c8c 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -10,7 +10,7 @@ jobs: name: Create Release from Tag runs-on: ubuntu-latest steps: - - uses: actions/checkout@master + - uses: actions/checkout@v2 - name: prepare ts api client run: | docker run --rm -v $(pwd):/local openapitools/openapi-generator-cli generate -i /local/swagger.yaml -g typescript-fetch -o /local/web/api --additional-properties=typescriptThreePlus=true,supportsES6=true,npmName=authentik-api,npmVersion=1.0.0 From 9a9e55ae32cd27cc97d7576847ba47ebb4f924e1 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 9 May 2021 17:53:57 +0200 Subject: [PATCH 10/19] ci: bump qemu action version Signed-off-by: Jens Langhammer --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 194d0a784..b7f64d54c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v1.1.0 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - name: Docker Login Registry @@ -46,7 +46,7 @@ jobs: swagger generate client -f ../swagger.yaml -A authentik -t pkg/ go build -v ./cmd/proxy/server.go - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v1.1.0 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - name: Docker Login Registry @@ -80,7 +80,7 @@ jobs: swagger generate client -f ../swagger.yaml -A authentik -t pkg/ go build -v ./cmd/ldap/server.go - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v1.1.0 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - name: Docker Login Registry From 20e59158c2b792b57f7bd8dfa11ec5e00778a562 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 9 May 2021 18:08:06 +0200 Subject: [PATCH 11/19] root: add github actions to dependabot Signed-off-by: Jens Langhammer --- .github/dependabot.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index e6cffffd1..966bbd646 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,5 +1,13 @@ version: 2 updates: +- package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: daily + time: "04:00" + open-pull-requests-limit: 10 + assignees: + - BeryJu - package-ecosystem: gomod directory: "/outpost" schedule: From 04aae8f58471139da03427ac551c9bc5b878660a Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 9 May 2021 21:40:22 +0200 Subject: [PATCH 12/19] sources/oauth: make secret write_only Signed-off-by: Jens Langhammer --- authentik/sources/oauth/api/source.py | 1 + 1 file changed, 1 insertion(+) diff --git a/authentik/sources/oauth/api/source.py b/authentik/sources/oauth/api/source.py index 13db82c1e..b2813af1f 100644 --- a/authentik/sources/oauth/api/source.py +++ b/authentik/sources/oauth/api/source.py @@ -75,6 +75,7 @@ class OAuthSourceSerializer(SourceSerializer): "callback_url", "type", ] + extra_kwargs = {"consumer_secret": {"write_only": True}} class OAuthSourceViewSet(ModelViewSet): From 465d9c2b93551f011c50a516b03668202f49bd15 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 9 May 2021 21:42:22 +0200 Subject: [PATCH 13/19] ci: use local context for docker build Signed-off-by: Jens Langhammer --- .github/workflows/release.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b7f64d54c..bdda6741d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,6 +32,7 @@ jobs: ghcr.io/goauthentik/server:2021.5.1-rc3, ghcr.io/goauthentik/server:latest platforms: linux/amd64,linux/arm64,linux/arm + context: . build-proxy: runs-on: ubuntu-latest steps: @@ -66,6 +67,7 @@ jobs: context: outpost/ file: outpost/proxy.Dockerfile platforms: linux/amd64,linux/arm64,linux/arm + context: . build-ldap: runs-on: ubuntu-latest steps: @@ -100,6 +102,7 @@ jobs: context: outpost/ file: outpost/ldap.Dockerfile platforms: linux/amd64,linux/arm64,linux/arm + context: . test-release: needs: - build-server From f7fd31cc8486a7e185741b84431d64a2c518996e Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 9 May 2021 21:43:38 +0200 Subject: [PATCH 14/19] release: 2021.5.1-rc4 --- .bumpversion.cfg | 2 +- .github/workflows/release.yml | 14 +++++++------- authentik/__init__.py | 2 +- docker-compose.yml | 4 ++-- internal/constants/constants.go | 2 +- outpost/pkg/version.go | 2 +- web/nginx.conf | 2 +- web/src/constants.ts | 2 +- website/docs/installation/docker-compose.md | 2 +- .../docs/outposts/manual-deploy-docker-compose.md | 2 +- website/docs/outposts/manual-deploy-kubernetes.md | 14 +++++++------- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 51fe42f39..ef4c55843 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2021.5.1-rc3 +current_version = 2021.5.1-rc4 tag = True commit = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)\-?(?P.*) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bdda6741d..8699b2261 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,9 +27,9 @@ jobs: with: push: true tags: | - beryju/authentik:2021.5.1-rc3, + beryju/authentik:2021.5.1-rc4, beryju/authentik:latest, - ghcr.io/goauthentik/server:2021.5.1-rc3, + ghcr.io/goauthentik/server:2021.5.1-rc4, ghcr.io/goauthentik/server:latest platforms: linux/amd64,linux/arm64,linux/arm context: . @@ -60,9 +60,9 @@ jobs: with: push: true tags: | - beryju/authentik-proxy:2021.5.1-rc3, + beryju/authentik-proxy:2021.5.1-rc4, beryju/authentik-proxy:latest, - ghcr.io/goauthentik/proxy:2021.5.1-rc3, + ghcr.io/goauthentik/proxy:2021.5.1-rc4, ghcr.io/goauthentik/proxy:latest context: outpost/ file: outpost/proxy.Dockerfile @@ -95,9 +95,9 @@ jobs: with: push: true tags: | - beryju/authentik-ldap:2021.5.1-rc3, + beryju/authentik-ldap:2021.5.1-rc4, beryju/authentik-ldap:latest, - ghcr.io/goauthentik/ldap:2021.5.1-rc3, + ghcr.io/goauthentik/ldap:2021.5.1-rc4, ghcr.io/goauthentik/ldap:latest context: outpost/ file: outpost/ldap.Dockerfile @@ -134,5 +134,5 @@ jobs: SENTRY_PROJECT: authentik SENTRY_URL: https://sentry.beryju.org with: - version: authentik@2021.5.1-rc3 + version: authentik@2021.5.1-rc4 environment: beryjuorg-prod diff --git a/authentik/__init__.py b/authentik/__init__.py index 4cbbf2635..1346e0231 100644 --- a/authentik/__init__.py +++ b/authentik/__init__.py @@ -1,3 +1,3 @@ """authentik""" -__version__ = "2021.5.1-rc3" +__version__ = "2021.5.1-rc4" ENV_GIT_HASH_KEY = "GIT_BUILD_HASH" diff --git a/docker-compose.yml b/docker-compose.yml index 108dcbc0e..b0002ad61 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: networks: - internal server: - image: ${AUTHENTIK_IMAGE:-beryju/authentik}:${AUTHENTIK_TAG:-2021.5.1-rc3} + image: ${AUTHENTIK_IMAGE:-beryju/authentik}:${AUTHENTIK_TAG:-2021.5.1-rc4} restart: unless-stopped command: server environment: @@ -52,7 +52,7 @@ services: - "0.0.0.0:9000:9000" - "0.0.0.0:9443:9443" worker: - image: ${AUTHENTIK_IMAGE:-beryju/authentik}:${AUTHENTIK_TAG:-2021.5.1-rc3} + image: ${AUTHENTIK_IMAGE:-beryju/authentik}:${AUTHENTIK_TAG:-2021.5.1-rc4} restart: unless-stopped command: worker networks: diff --git a/internal/constants/constants.go b/internal/constants/constants.go index 2fc0c3f07..b2cde3bce 100644 --- a/internal/constants/constants.go +++ b/internal/constants/constants.go @@ -1,3 +1,3 @@ package constants -const VERSION = "2021.5.1-rc3" +const VERSION = "2021.5.1-rc4" diff --git a/outpost/pkg/version.go b/outpost/pkg/version.go index 755dfc9fe..83b3293fa 100644 --- a/outpost/pkg/version.go +++ b/outpost/pkg/version.go @@ -1,3 +1,3 @@ package pkg -const VERSION = "2021.5.1-rc3" +const VERSION = "2021.5.1-rc4" diff --git a/web/nginx.conf b/web/nginx.conf index c60cb204c..ba19b2fdd 100644 --- a/web/nginx.conf +++ b/web/nginx.conf @@ -81,7 +81,7 @@ http { location /static/ { expires 31d; add_header Cache-Control "public, no-transform"; - add_header X-authentik-version "2021.5.1-rc3"; + add_header X-authentik-version "2021.5.1-rc4"; add_header Vary X-authentik-version; } diff --git a/web/src/constants.ts b/web/src/constants.ts index 7d77036c8..e99ecaa83 100644 --- a/web/src/constants.ts +++ b/web/src/constants.ts @@ -3,7 +3,7 @@ export const SUCCESS_CLASS = "pf-m-success"; export const ERROR_CLASS = "pf-m-danger"; export const PROGRESS_CLASS = "pf-m-in-progress"; export const CURRENT_CLASS = "pf-m-current"; -export const VERSION = "2021.5.1-rc3"; +export const VERSION = "2021.5.1-rc4"; export const PAGE_SIZE = 20; export const EVENT_REFRESH = "ak-refresh"; export const EVENT_NOTIFICATION_TOGGLE = "ak-notification-toggle"; diff --git a/website/docs/installation/docker-compose.md b/website/docs/installation/docker-compose.md index 2be9f0bff..b975260d1 100644 --- a/website/docs/installation/docker-compose.md +++ b/website/docs/installation/docker-compose.md @@ -16,7 +16,7 @@ Download the latest `docker-compose.yml` from [here](https://raw.githubuserconte To optionally enable error-reporting, run `echo AUTHENTIK_ERROR_REPORTING__ENABLED=true >> .env` -To optionally deploy a different version run `echo AUTHENTIK_TAG=2021.5.1-rc3 >> .env` +To optionally deploy a different version run `echo AUTHENTIK_TAG=2021.5.1-rc4 >> .env` If this is a fresh authentik install run the following commands to generate a password: diff --git a/website/docs/outposts/manual-deploy-docker-compose.md b/website/docs/outposts/manual-deploy-docker-compose.md index 3b8267f2b..b827b8357 100644 --- a/website/docs/outposts/manual-deploy-docker-compose.md +++ b/website/docs/outposts/manual-deploy-docker-compose.md @@ -11,7 +11,7 @@ version: "3.5" services: authentik_proxy: - image: beryju/authentik-proxy:2021.5.1-rc3 + image: beryju/authentik-proxy:2021.5.1-rc4 ports: - 4180:4180 - 4443:4443 diff --git a/website/docs/outposts/manual-deploy-kubernetes.md b/website/docs/outposts/manual-deploy-kubernetes.md index 0228cef99..3e790ad5f 100644 --- a/website/docs/outposts/manual-deploy-kubernetes.md +++ b/website/docs/outposts/manual-deploy-kubernetes.md @@ -14,7 +14,7 @@ metadata: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.5.1-rc3 + app.kubernetes.io/version: 2021.5.1-rc4 name: authentik-outpost-api stringData: authentik_host: "__AUTHENTIK_URL__" @@ -29,7 +29,7 @@ metadata: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.5.1-rc3 + app.kubernetes.io/version: 2021.5.1-rc4 name: authentik-outpost spec: ports: @@ -54,7 +54,7 @@ metadata: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.5.1-rc3 + app.kubernetes.io/version: 2021.5.1-rc4 name: authentik-outpost spec: selector: @@ -62,14 +62,14 @@ spec: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.5.1-rc3 + app.kubernetes.io/version: 2021.5.1-rc4 template: metadata: labels: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.5.1-rc3 + app.kubernetes.io/version: 2021.5.1-rc4 spec: containers: - env: @@ -88,7 +88,7 @@ spec: secretKeyRef: key: authentik_host_insecure name: authentik-outpost-api - image: beryju/authentik-proxy:2021.5.1-rc3 + image: beryju/authentik-proxy:2021.5.1-rc4 name: proxy ports: - containerPort: 4180 @@ -110,7 +110,7 @@ metadata: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.5.1-rc3 + app.kubernetes.io/version: 2021.5.1-rc4 name: authentik-outpost spec: rules: From b7d828702d6f4fe453ad39a01b747db2d0248fe0 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 9 May 2021 22:56:44 +0200 Subject: [PATCH 15/19] sources/oauth: don't set username on google source Signed-off-by: Jens Langhammer --- authentik/sources/oauth/types/google.py | 1 - 1 file changed, 1 deletion(-) diff --git a/authentik/sources/oauth/types/google.py b/authentik/sources/oauth/types/google.py index ee6bdf63f..28735b635 100644 --- a/authentik/sources/oauth/types/google.py +++ b/authentik/sources/oauth/types/google.py @@ -23,7 +23,6 @@ class GoogleOAuth2Callback(OAuthCallback): info: dict[str, Any], ) -> dict[str, Any]: return { - "username": info.get("email"), "email": info.get("email"), "name": info.get("name"), } From 9cfeeb35ba228c428419aaa89d1b67ce36175313 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 9 May 2021 22:56:50 +0200 Subject: [PATCH 16/19] ci: fix invalid workflow file Signed-off-by: Jens Langhammer --- .github/workflows/release.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8699b2261..6112af90d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -67,7 +67,6 @@ jobs: context: outpost/ file: outpost/proxy.Dockerfile platforms: linux/amd64,linux/arm64,linux/arm - context: . build-ldap: runs-on: ubuntu-latest steps: @@ -102,7 +101,6 @@ jobs: context: outpost/ file: outpost/ldap.Dockerfile platforms: linux/amd64,linux/arm64,linux/arm - context: . test-release: needs: - build-server From d4de243e3b2b1487371c04f80661559fc780de50 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 9 May 2021 23:09:48 +0200 Subject: [PATCH 17/19] ci: always run on release for version branches but don't push images Signed-off-by: Jens Langhammer --- .github/workflows/release.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6112af90d..29fc16557 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,6 +3,9 @@ name: authentik-on-release on: release: types: [published, created] + push: + branches: + - version-* jobs: # Build @@ -25,7 +28,7 @@ jobs: - name: Building Docker Image uses: docker/build-push-action@v2 with: - push: true + push: ${{ github.event_name == 'release' }} tags: | beryju/authentik:2021.5.1-rc4, beryju/authentik:latest, @@ -58,7 +61,7 @@ jobs: - name: Building Docker Image uses: docker/build-push-action@v2 with: - push: true + push: ${{ github.event_name == 'release' }} tags: | beryju/authentik-proxy:2021.5.1-rc4, beryju/authentik-proxy:latest, @@ -92,7 +95,7 @@ jobs: - name: Building Docker Image uses: docker/build-push-action@v2 with: - push: true + push: ${{ github.event_name == 'release' }} tags: | beryju/authentik-ldap:2021.5.1-rc4, beryju/authentik-ldap:latest, @@ -102,6 +105,7 @@ jobs: file: outpost/ldap.Dockerfile platforms: linux/amd64,linux/arm64,linux/arm test-release: + if: ${{ github.event_name == 'release' }} needs: - build-server - build-proxy @@ -119,6 +123,7 @@ jobs: docker-compose start postgresql redis docker-compose run -u root --entrypoint /bin/bash server -c "pip install --no-cache -r requirements-dev.txt && ./manage.py test authentik" sentry-release: + if: ${{ github.event_name == 'release' }} needs: - test-release runs-on: ubuntu-latest From 5f490c563e7624f5f06c5b0fabd8d104b70de154 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 9 May 2021 23:32:52 +0200 Subject: [PATCH 18/19] ci: build for arm v6 and v8 Signed-off-by: Jens Langhammer --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 29fc16557..02f1a55d0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,7 +34,7 @@ jobs: beryju/authentik:latest, ghcr.io/goauthentik/server:2021.5.1-rc4, ghcr.io/goauthentik/server:latest - platforms: linux/amd64,linux/arm64,linux/arm + platforms: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v8 context: . build-proxy: runs-on: ubuntu-latest @@ -69,7 +69,7 @@ jobs: ghcr.io/goauthentik/proxy:latest context: outpost/ file: outpost/proxy.Dockerfile - platforms: linux/amd64,linux/arm64,linux/arm + platforms: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v8 build-ldap: runs-on: ubuntu-latest steps: @@ -103,7 +103,7 @@ jobs: ghcr.io/goauthentik/ldap:latest context: outpost/ file: outpost/ldap.Dockerfile - platforms: linux/amd64,linux/arm64,linux/arm + platforms: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v8 test-release: if: ${{ github.event_name == 'release' }} needs: From af30b781b668c2c1b355d7494db962ace19e51d8 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 9 May 2021 23:40:27 +0200 Subject: [PATCH 19/19] ci: only arm only v8 Signed-off-by: Jens Langhammer --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 02f1a55d0..923edf71a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,7 +34,7 @@ jobs: beryju/authentik:latest, ghcr.io/goauthentik/server:2021.5.1-rc4, ghcr.io/goauthentik/server:latest - platforms: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v8 + platforms: linux/amd64,linux/arm64,linux/arm/v8 context: . build-proxy: runs-on: ubuntu-latest @@ -69,7 +69,7 @@ jobs: ghcr.io/goauthentik/proxy:latest context: outpost/ file: outpost/proxy.Dockerfile - platforms: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v8 + platforms: linux/amd64,linux/arm64,linux/arm/v8 build-ldap: runs-on: ubuntu-latest steps: @@ -103,7 +103,7 @@ jobs: ghcr.io/goauthentik/ldap:latest context: outpost/ file: outpost/ldap.Dockerfile - platforms: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v8 + platforms: linux/amd64,linux/arm64,linux/arm/v8 test-release: if: ${{ github.event_name == 'release' }} needs: