Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

core: bump django from 4.1.7 to 4.2 #5238

Merged
merged 5 commits into from Aug 1, 2023
Merged

core: bump django from 4.1.7 to 4.2 #5238

merged 5 commits into from Aug 1, 2023

Conversation

BeryJu
Copy link
Member

@BeryJu BeryJu commented Apr 13, 2023

re-bump after we upgrade to postgres 12+

needs some sort of docs on how to upgrade postgres in a container

  • docker-compose uses postgres 12 which is still supported
  • kubernetes uses 11 by default which needs to be upgraded

@codecov
Copy link

codecov bot commented Apr 13, 2023

Codecov Report

Patch coverage: 100.00% and project coverage change: +0.01% 🎉

Comparison is base (5139656) 92.46% compared to head (4919400) 92.47%.
Report is 9 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #5238      +/-   ##
==========================================
+ Coverage   92.46%   92.47%   +0.01%     
==========================================
  Files         561      561              
  Lines       27053    27075      +22     
==========================================
+ Hits        25013    25036      +23     
+ Misses       2040     2039       -1     
Flag Coverage Δ
e2e 51.62% <50.00%> (+0.04%) ⬆️
integration 26.56% <50.00%> (+0.05%) ⬆️
unit 89.27% <100.00%> (-<0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed Coverage Δ
authentik/lib/sentry.py 94.29% <100.00%> (ø)
authentik/root/install_id.py 63.16% <100.00%> (ø)

... and 13 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@BeryJu BeryJu changed the title core: bump django from 4.1.7 to 4.2 (#5151) core: bump django from 4.1.7 to 4.2 Apr 13, 2023
@BeryJu BeryJu added this to the Release 2023.5 milestone Apr 13, 2023
@BeryJu BeryJu force-pushed the core/upgrade-django-4.2 branch 2 times, most recently from 09cc19d to de55812 Compare May 12, 2023 11:48
@netlify
Copy link

netlify bot commented May 12, 2023

Deploy Preview for authentik ready!

Name Link
🔨 Latest commit 09cc19d
🔍 Latest deploy log https://app.netlify.com/sites/authentik/deploys/645e274dfcff7c0008401d19
😎 Deploy Preview https://deploy-preview-5238--authentik.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@netlify
Copy link

netlify bot commented Jun 8, 2023

Deploy Preview for authentik-storybook canceled.

Name Link
🔨 Latest commit 1421e9b
🔍 Latest deploy log https://app.netlify.com/sites/authentik-storybook/deploys/64c94103f608730008176ad6

@netlify
Copy link

netlify bot commented Jun 8, 2023

Deploy Preview for authentik ready!

Name Link
🔨 Latest commit 539eca9
🔍 Latest deploy log https://app.netlify.com/sites/authentik/deploys/64819fb02595f2000864af69
😎 Deploy Preview https://deploy-preview-5238--authentik.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@BeryJu BeryJu modified the milestones: Release 2023.6, Future release Jun 13, 2023
@BeryJu BeryJu modified the milestones: Future release, Release 2023.7 Jun 25, 2023
@BeryJu BeryJu self-assigned this Jul 26, 2023
@BeryJu BeryJu marked this pull request as ready for review July 26, 2023 18:21
@BeryJu BeryJu requested a review from a team as a code owner July 26, 2023 18:21
@BeryJu BeryJu requested review from tanberry and removed request for a team July 26, 2023 18:21
@@ -150,7 +150,7 @@ lxml = "*"
opencontainers = { extras = ["reggie"], version = "*" }
packaging = "*"
paramiko = "*"
psycopg2-binary = "*"
psycopg = { extras = ["binary"], version = "*" }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
psycopg = { extras = ["binary"], version = "*" }
psycopg = { extras = ["c"], version = "*" }

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And apt install libpq-dev in Dockerfile

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to check on the impact of this on the build time and the image size, will probably test that in a separate PR

@github-actions
Copy link
Contributor

github-actions bot commented Jul 27, 2023

authentik PR Installation instructions

Instructions for docker-compose

Add the following block to your .env file:

AUTHENTIK_IMAGE=ghcr.io/goauthentik/dev-server
AUTHENTIK_TAG=gh-core-upgrade-django-4.2-1690834467-4919400
AUTHENTIK_OUTPOSTS__CONTAINER_IMAGE_BASE=ghcr.io/goauthentik/dev-%(type)s:gh-%(build_hash)s

For arm64, use these values:

AUTHENTIK_IMAGE=ghcr.io/goauthentik/dev-server
AUTHENTIK_TAG=gh-core-upgrade-django-4.2-1690834467-4919400-arm64
AUTHENTIK_OUTPOSTS__CONTAINER_IMAGE_BASE=ghcr.io/goauthentik/dev-%(type)s:gh-%(build_hash)s

Afterwards, run the upgrade commands from the latest release notes.

Instructions for Kubernetes

Add the following block to your values.yml file:

authentik:
    outposts:
        container_image_base: ghcr.io/goauthentik/dev-%(type)s:gh-%(build_hash)s
image:
    repository: ghcr.io/goauthentik/dev-server
    tag: gh-core-upgrade-django-4.2-1690834467-4919400

For arm64, use these values:

authentik:
    outposts:
        container_image_base: ghcr.io/goauthentik/dev-%(type)s:gh-%(build_hash)s
image:
    repository: ghcr.io/goauthentik/dev-server
    tag: gh-core-upgrade-django-4.2-1690834467-4919400-arm64

Afterwards, run the upgrade commands from the latest release notes.

@netlify
Copy link

netlify bot commented Jul 27, 2023

Deploy Preview for authentik ready!

Name Link
🔨 Latest commit 1421e9b
🔍 Latest deploy log https://app.netlify.com/sites/authentik/deploys/64c941032ff4ff0008da83d7
😎 Deploy Preview https://deploy-preview-5238--authentik.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

dependabot bot and others added 3 commits July 31, 2023 14:13
* core: bump django from 4.1.7 to 4.2

Bumps [django](https://github.com/django/django) from 4.1.7 to 4.2.
- [Release notes](https://github.com/django/django/releases)
- [Commits](django/django@4.1.7...4.2)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* upgrade to psycopg3, use custom engine for prometheus metrics

See korfuri/django-prometheus#350

Signed-off-by: Jens Langhammer <jens@goauthentik.io>

* make scripts use pscopg3

Signed-off-by: Jens Langhammer <jens@goauthentik.io>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Jens Langhammer <jens@goauthentik.io>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jens Langhammer <jens@goauthentik.io>
Signed-off-by: Jens Langhammer <jens@goauthentik.io>
Signed-off-by: Jens Langhammer <jens@goauthentik.io>
Signed-off-by: Jens Langhammer <jens@goauthentik.io>
Copy link
Contributor

@tanberry tanberry left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new procedural looks great! I left a question about the ##Placeholder section; not sure what that section is for?

title: Upgrading PostgreSQL on Kubernetes
---

## Placeholders
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@BeryJu what is this section for (what does Placeholders mean?)?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Basically just strings that are used in the comments below that might need to be replaced depending on the installation

Co-authored-by: Tana M Berry <tanamarieberry@yahoo.com>
Signed-off-by: Jens L. <jens@beryju.org>
Signed-off-by: Jens Langhammer <jens@goauthentik.io>
Signed-off-by: Jens Langhammer <jens@goauthentik.io>
@BeryJu BeryJu merged commit cc6824f into main Aug 1, 2023
36 of 38 checks passed
@BeryJu BeryJu deleted the core/upgrade-django-4.2 branch August 1, 2023 17:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants