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

Kubernetes Upgrade v1.25 -> v1.29 #299

Merged
merged 4 commits into from
Jul 9, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ RUN groupadd --gid $USER_GID $USERNAME \
# openssh-client -- for git over SSH
# sudo -- to run commands as superuser
# vim -- enhanced vi editor for commits
ENV KUBE_CLIENT_VERSION="v1.25.10"
ENV HELM_VERSION="3.12.0"
ENV KUBE_CLIENT_VERSION="v1.29.4"
ENV HELM_VERSION="3.14.4"
RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt \
--mount=type=cache,mode=0755,target=/root/.cache/pip \
set -ex \
Expand Down
12 changes: 6 additions & 6 deletions deploy/group_vars/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ k8s_install_descheduler: yes
# You must set the k8s_descheduler_chart_version to match the Kubernetes
# node version (0.23.x -> K8s 1.23.x); see:
# https://github.com/kubernetes-sigs/descheduler#compatibility-matrix
k8s_descheduler_chart_version: v0.25.2
k8s_descheduler_chart_version: v0.29.0
# See values.yaml for options:
# https://github.com/kubernetes-sigs/descheduler/blob/master/charts/descheduler/values.yaml#L63
k8s_descheduler_release_values:
Expand Down Expand Up @@ -94,9 +94,9 @@ k8s_iam_users: [copelco]
# Pin ingress-nginx and cert-manager to current versions so future upgrades of this
# role will not upgrade these charts without your intervention:
# https://github.com/kubernetes/ingress-nginx/releases
k8s_ingress_nginx_chart_version: "4.4.2"
k8s_ingress_nginx_chart_version: "4.9.1"
# https://github.com/jetstack/cert-manager/releases
k8s_cert_manager_chart_version: "v1.11.1"
k8s_cert_manager_chart_version: "v1.14.3"
# AWS only:
# Use the newer load balancer type (NLB). DO NOT edit k8s_aws_load_balancer_type after
# creating your Service.
Expand All @@ -106,11 +106,11 @@ k8s_aws_load_balancer_type: nlb
# caktus.k8s-hosting-services: Logging and monitoring configuration
# ----------------------------------------------------------------------------

k8s_papertrail_logspout_destination: "syslog+tls://logs2.papertrailapp.com:20851"
k8s_papertrail_logspout_memory_limit: 128Mi
# k8s_papertrail_logspout_destination: "syslog+tls://logs2.papertrailapp.com:20851"
Copy link
Member Author

Choose a reason for hiding this comment

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

I’m pretty certain this isn’t needed anymore since we moved away from Papertrail, but I did not want to delete without asking first.

Copy link
Collaborator

Choose a reason for hiding this comment

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

@ronardcaktus I would like to defer to either @copelco or @tobiasmcnulty on removing this from the codebase.

# k8s_papertrail_logspout_memory_limit: 128Mi

# New Relic Account: forwardjustice-team@caktusgroup.com
k8s_newrelic_chart_version: "5.0.4"
k8s_newrelic_chart_version: "5.0.68"
k8s_newrelic_logging_enabled: true
k8s_newrelic_license_key: !vault |
$ANSIBLE_VAULT;1.1;AES256
Expand Down
6 changes: 3 additions & 3 deletions deploy/requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

- src: https://github.com/caktus/ansible-role-django-k8s
name: caktus.django-k8s
version: v1.6.0
version: v1.9.0

- src: https://github.com/caktus/ansible-role-aws-web-stacks
name: caktus.aws-web-stacks
version: ''

- src: https://github.com/caktus/ansible-role-k8s-web-cluster
name: caktus.k8s-web-cluster
version: v1.5.0
version: v1.6.0

- src: https://github.com/caktus/ansible-role-k8s-hosting-services
name: caktus.k8s-hosting-services
version: v0.11.0
version: v0.12.0
2 changes: 1 addition & 1 deletion docs/hosting-services.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ The services configured for this project are:
* PostgreSQL database backups to S3 (within Caktus AWS account)
* Currently, this is only `traffic_stops`, which contains users, census data, etc.
* `traffic_stops_nc` is not backed up since the entire dataset is re-imported daily.
* Papertrail logging (to Caktus account)
* New Relic logging (to Caktus account)
* New Relic Infrastructure monitoring (Account: `admin+newrelic@caktusgroup.com`)


Expand Down
4 changes: 2 additions & 2 deletions requirements/base/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ census==0.8.19
us
dealer
boto
boto3==1.26.87
botocore==1.29.109
boto3==1.34.100
botocore==1.34.100
click==8.1.3
django-cache-machine==1.2.0
django-ckeditor==6.7.0
Expand Down
8 changes: 4 additions & 4 deletions requirements/base/base.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.9
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile --output-file=requirements/base/base.txt requirements/base/base.in
Expand All @@ -12,9 +12,9 @@ billiard==3.6.3.0
# via celery
boto==2.49.0
# via -r requirements/base/base.in
boto3==1.26.87
boto3==1.34.100
# via -r requirements/base/base.in
botocore==1.29.109
botocore==1.34.100
# via
# -r requirements/base/base.in
# boto3
Expand Down Expand Up @@ -108,7 +108,7 @@ requests==2.28.2
# via
# -r requirements/base/base.in
# census
s3transfer==0.6.0
s3transfer==0.10.1
# via boto3
six==1.15.0
# via
Expand Down
2 changes: 1 addition & 1 deletion requirements/deploy/deploy.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.9
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile --output-file=requirements/deploy/deploy.txt requirements/deploy/deploy.in
Expand Down
8 changes: 4 additions & 4 deletions requirements/dev/dev.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ wheel

# deploy
invoke-kubesae==0.1.0
ansible==5.9.0
ansible==6.7.0
cryptography==37.0.2
cffi==1.15.0
Jinja2==3.0.3
openshift==0.12
openshift==0.13.2
kubernetes==12.0.0
kubernetes-validate~=1.25.0
kubernetes-validate~=1.29.1

troposphere

Expand All @@ -22,7 +22,7 @@ sphinx-autobuild
rstcheck

# AWS tools
awscli==1.27.109
awscli==1.32.100

django-debug-toolbar

Expand Down
53 changes: 31 additions & 22 deletions requirements/dev/dev.txt
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
#
# This file is autogenerated by pip-compile with Python 3.9
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile --output-file=requirements/dev/dev.txt requirements/dev/dev.in
#
alabaster==0.7.12
# via sphinx
ansible==5.9.0
ansible==6.7.0
# via
# -r requirements/dev/dev.in
# invoke-kubesae
ansible-core==2.12.7
ansible-core==2.13.13
# via ansible
appnope==0.1.0
# via
# -r requirements/dev/dev.in
# ipython
# via -r requirements/dev/dev.in
argh==0.26.2
# via sphinx-autobuild
asgiref==3.5.2
Expand All @@ -26,17 +24,18 @@ attrs==19.3.0
# via
# -c requirements/dev/../test/test.txt
# jsonschema
awscli==1.27.109
# referencing
awscli==1.32.100
# via -r requirements/dev/dev.in
babel==2.8.0
# via sphinx
backcall==0.1.0
# via ipython
boto3==1.26.87
boto3==1.34.100
# via
# -c requirements/dev/../base/base.txt
# invoke-kubesae
botocore==1.29.109
botocore==1.34.100
# via
# -c requirements/dev/../base/base.txt
# awscli
Expand Down Expand Up @@ -93,8 +92,11 @@ idna==2.10
# via
# -c requirements/dev/../base/base.txt
# requests
# yarl
imagesize==1.2.0
# via sphinx
importlib-resources==6.4.0
# via kubernetes-validate
invoke==1.4.1
# via invoke-kubesae
invoke-kubesae==0.1.0
Expand All @@ -109,7 +111,6 @@ jinja2==3.0.3
# via
# -r requirements/dev/dev.in
# ansible-core
# openshift
# sphinx
jmespath==1.0.1
# via
Expand All @@ -122,20 +123,23 @@ kubernetes==12.0.0
# via
# -r requirements/dev/dev.in
# openshift
kubernetes-validate==1.25.2
kubernetes-validate==1.29.1
# via -r requirements/dev/dev.in
livereload==2.6.2
# via sphinx-autobuild
markupsafe==2.1.1
# via jinja2
multidict==6.0.5
# via yarl
oauthlib==3.1.0
# via requests-oauthlib
openshift==0.12.0
openshift==0.13.2
# via -r requirements/dev/dev.in
packaging==20.3
packaging==24.0
# via
# -c requirements/dev/../test/test.txt
# ansible-core
# kubernetes-validate
# sphinx
parso==0.7.0
# via jedi
Expand Down Expand Up @@ -168,12 +172,10 @@ pygments==2.6.1
# ipython
# pudb
# sphinx
pyparsing==2.4.7
# via
# -c requirements/dev/../test/test.txt
# packaging
pyrsistent==0.16.0
# via jsonschema
# via
# jsonschema
# referencing
python-dateutil==2.8.1
# via
# -c requirements/dev/../base/base.txt
Expand All @@ -196,6 +198,8 @@ pyyaml==5.3.1
# kubernetes
# kubernetes-validate
# sphinx-autobuild
referencing==0.8.11
# via kubernetes-validate
requests==2.28.2
# via
# -c requirements/dev/../base/base.txt
Expand All @@ -212,9 +216,7 @@ rsa==3.4.2
# google-auth
rstcheck==3.3.1
# via -r requirements/dev/dev.in
ruamel-yaml==0.16.10
# via openshift
s3transfer==0.6.0
s3transfer==0.10.1
# via
# -c requirements/dev/../base/base.txt
# awscli
Expand All @@ -229,7 +231,6 @@ six==1.15.0
# kubernetes
# livereload
# openshift
# packaging
# pyrsistent
# python-dateutil
# traitlets
Expand Down Expand Up @@ -265,6 +266,10 @@ traitlets==4.3.3
# via ipython
troposphere==3.1.1
# via -r requirements/dev/dev.in
typing-extensions==4.11.0
# via
# -c requirements/dev/../test/test.txt
# kubernetes-validate
urllib3==1.26.14
# via
# -c requirements/dev/../base/base.txt
Expand All @@ -283,6 +288,10 @@ websocket-client==0.57.0
# via kubernetes
wheel==0.37.1
# via -r requirements/dev/dev.in
yarl==1.9.4
# via referencing
zipp==3.18.2
# via importlib-resources

# The following packages are considered to be unsafe in a requirements file:
# setuptools
4 changes: 2 additions & 2 deletions requirements/test/test.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ pytest-django
coverage
# Linting
flake8
black==22.3.0
pre-commit==2.21.0
black==24.4.2
pre-commit==3.5.0
identify==2.5.13
17 changes: 8 additions & 9 deletions requirements/test/test.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#
# This file is autogenerated by pip-compile with Python 3.9
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile --output-file=requirements/test/test.txt requirements/test/test.in
#
attrs==19.3.0
# via pytest
black==22.3.0
black==24.4.2
# via -r requirements/test/test.in
cfgv==3.1.0
# via pre-commit
Expand Down Expand Up @@ -42,8 +42,10 @@ mypy-extensions==0.4.3
# via black
nodeenv==1.3.5
# via pre-commit
packaging==20.3
# via pytest
packaging==24.0
# via
# black
# pytest
pathspec==0.9.0
# via black
platformdirs==2.4.0
Expand All @@ -52,16 +54,14 @@ platformdirs==2.4.0
# virtualenv
pluggy==0.13.1
# via pytest
pre-commit==2.21.0
pre-commit==3.5.0
# via -r requirements/test/test.in
py==1.8.1
# via pytest
pycodestyle==2.6.0
# via flake8
pyflakes==2.2.0
# via flake8
pyparsing==2.4.7
# via packaging
pytest==5.4.2
# via
# -r requirements/test/test.in
Expand All @@ -82,13 +82,12 @@ pyyaml==5.3.1
six==1.15.0
# via
# -c requirements/test/../base/base.txt
# packaging
# python-dateutil
text-unidecode==1.3
# via faker
tomli==1.2.2
# via black
typing-extensions==4.0.0
typing-extensions==4.11.0
# via black
virtualenv==20.17.1
# via pre-commit
Expand Down
Loading