From 7af3b6b0cba35d1c8ae32271fc4d47bc321d3dbc Mon Sep 17 00:00:00 2001 From: ronardcaktus Date: Wed, 22 May 2024 14:52:20 +0000 Subject: [PATCH 1/3] Update project packages --- requirements/base/base.txt | 2 +- requirements/deploy/deploy.txt | 2 +- requirements/dev/dev.in | 2 +- requirements/dev/dev.txt | 19 +++++++------------ requirements/test/test.in | 4 ++-- requirements/test/test.txt | 17 ++++++++--------- 6 files changed, 20 insertions(+), 26 deletions(-) diff --git a/requirements/base/base.txt b/requirements/base/base.txt index b46ab8ce..9db3b634 100755 --- a/requirements/base/base.txt +++ b/requirements/base/base.txt @@ -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 diff --git a/requirements/deploy/deploy.txt b/requirements/deploy/deploy.txt index a10f1279..2230ef1d 100644 --- a/requirements/deploy/deploy.txt +++ b/requirements/deploy/deploy.txt @@ -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 diff --git a/requirements/dev/dev.in b/requirements/dev/dev.in index 7889e73c..38a5dff3 100644 --- a/requirements/dev/dev.in +++ b/requirements/dev/dev.in @@ -6,7 +6,7 @@ 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 diff --git a/requirements/dev/dev.txt b/requirements/dev/dev.txt index e9acf2ce..d942a39e 100755 --- a/requirements/dev/dev.txt +++ b/requirements/dev/dev.txt @@ -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 @@ -132,7 +130,7 @@ oauthlib==3.1.0 # via requests-oauthlib openshift==0.12.0 # via -r requirements/dev/dev.in -packaging==20.3 +packaging==24.0 # via # -c requirements/dev/../test/test.txt # ansible-core @@ -168,10 +166,6 @@ 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 python-dateutil==2.8.1 @@ -214,6 +208,8 @@ rstcheck==3.3.1 # via -r requirements/dev/dev.in ruamel-yaml==0.16.10 # via openshift +ruamel-yaml-clib==0.2.8 + # via ruamel-yaml s3transfer==0.6.0 # via # -c requirements/dev/../base/base.txt @@ -229,7 +225,6 @@ six==1.15.0 # kubernetes # livereload # openshift - # packaging # pyrsistent # python-dateutil # traitlets diff --git a/requirements/test/test.in b/requirements/test/test.in index 912733c9..92abd69f 100755 --- a/requirements/test/test.in +++ b/requirements/test/test.in @@ -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 diff --git a/requirements/test/test.txt b/requirements/test/test.txt index 2d6e23f7..753c6b99 100755 --- a/requirements/test/test.txt +++ b/requirements/test/test.txt @@ -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 @@ -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 @@ -52,7 +54,7 @@ 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 @@ -60,8 +62,6 @@ 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 @@ -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 From 76243d71070eb17f672a31407d127794e7d3de27 Mon Sep 17 00:00:00 2001 From: ronardcaktus Date: Wed, 22 May 2024 18:21:26 +0000 Subject: [PATCH 2/3] Upgrade kubernetes from 1.25 to 1.29 --- Dockerfile | 4 ++-- deploy/group_vars/all.yml | 12 ++++++------ deploy/requirements.yml | 6 +++--- docs/hosting-services.md | 2 +- requirements/base/base.in | 4 ++-- requirements/base/base.txt | 6 +++--- requirements/dev/dev.in | 6 +++--- requirements/dev/dev.txt | 38 ++++++++++++++++++++++++++------------ 8 files changed, 46 insertions(+), 32 deletions(-) diff --git a/Dockerfile b/Dockerfile index ae486372..78c0bd65 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 \ diff --git a/deploy/group_vars/all.yml b/deploy/group_vars/all.yml index 06fd4771..f884067b 100644 --- a/deploy/group_vars/all.yml +++ b/deploy/group_vars/all.yml @@ -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: @@ -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. @@ -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" +# 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 diff --git a/deploy/requirements.yml b/deploy/requirements.yml index 83a534ca..e8c76a4d 100755 --- a/deploy/requirements.yml +++ b/deploy/requirements.yml @@ -2,7 +2,7 @@ - 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 @@ -10,8 +10,8 @@ - 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 diff --git a/docs/hosting-services.md b/docs/hosting-services.md index 32bfe2ec..48838588 100644 --- a/docs/hosting-services.md +++ b/docs/hosting-services.md @@ -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`) diff --git a/requirements/base/base.in b/requirements/base/base.in index c883f05e..51e0e2b5 100755 --- a/requirements/base/base.in +++ b/requirements/base/base.in @@ -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 diff --git a/requirements/base/base.txt b/requirements/base/base.txt index 9db3b634..b6df8ea5 100755 --- a/requirements/base/base.txt +++ b/requirements/base/base.txt @@ -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 @@ -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 diff --git a/requirements/dev/dev.in b/requirements/dev/dev.in index 38a5dff3..bf0379fd 100644 --- a/requirements/dev/dev.in +++ b/requirements/dev/dev.in @@ -10,9 +10,9 @@ 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 @@ -22,7 +22,7 @@ sphinx-autobuild rstcheck # AWS tools -awscli==1.27.109 +awscli==1.32.100 django-debug-toolbar diff --git a/requirements/dev/dev.txt b/requirements/dev/dev.txt index d942a39e..b551c1ab 100755 --- a/requirements/dev/dev.txt +++ b/requirements/dev/dev.txt @@ -24,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 @@ -91,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 @@ -107,7 +111,6 @@ jinja2==3.0.3 # via # -r requirements/dev/dev.in # ansible-core - # openshift # sphinx jmespath==1.0.1 # via @@ -120,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==24.0 # via # -c requirements/dev/../test/test.txt # ansible-core + # kubernetes-validate # sphinx parso==0.7.0 # via jedi @@ -167,7 +173,9 @@ pygments==2.6.1 # pudb # sphinx pyrsistent==0.16.0 - # via jsonschema + # via + # jsonschema + # referencing python-dateutil==2.8.1 # via # -c requirements/dev/../base/base.txt @@ -190,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 @@ -206,11 +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 -ruamel-yaml-clib==0.2.8 - # via ruamel-yaml -s3transfer==0.6.0 +s3transfer==0.10.1 # via # -c requirements/dev/../base/base.txt # awscli @@ -260,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 @@ -278,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 From 0ec686ba6a3e0845afcba22054985451131b8286 Mon Sep 17 00:00:00 2001 From: Colin Copeland Date: Mon, 10 Jun 2024 17:59:56 -0400 Subject: [PATCH 3/3] update ansible/kubernetes underlying packages --- requirements/dev/dev.in | 3 +++ requirements/dev/dev.txt | 47 +++++++++++++++++++++++--------------- requirements/test/test.in | 4 ++-- requirements/test/test.txt | 8 +++---- 4 files changed, 37 insertions(+), 25 deletions(-) diff --git a/requirements/dev/dev.in b/requirements/dev/dev.in index bf0379fd..1185f1a0 100644 --- a/requirements/dev/dev.in +++ b/requirements/dev/dev.in @@ -7,12 +7,15 @@ wheel # deploy invoke-kubesae==0.1.0 ansible==6.7.0 +attrs==23.2.0 cryptography==37.0.2 cffi==1.15.0 Jinja2==3.0.3 openshift==0.13.2 kubernetes==12.0.0 kubernetes-validate~=1.29.1 +referencing==0.35.1 +jsonschema==4.22.0 troposphere diff --git a/requirements/dev/dev.txt b/requirements/dev/dev.txt index b551c1ab..d7e10685 100755 --- a/requirements/dev/dev.txt +++ b/requirements/dev/dev.txt @@ -13,16 +13,19 @@ ansible==6.7.0 ansible-core==2.13.13 # via ansible appnope==0.1.0 - # via -r requirements/dev/dev.in + # via + # -r requirements/dev/dev.in + # ipython argh==0.26.2 # via sphinx-autobuild asgiref==3.5.2 # via # -c requirements/dev/../base/base.txt # django -attrs==19.3.0 +attrs==23.2.0 # via # -c requirements/dev/../test/test.txt + # -r requirements/dev/dev.in # jsonschema # referencing awscli==1.32.100 @@ -92,11 +95,13 @@ 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 + # via + # jsonschema + # jsonschema-specifications + # kubernetes-validate invoke==1.4.1 # via invoke-kubesae invoke-kubesae==0.1.0 @@ -117,8 +122,12 @@ jmespath==1.0.1 # -c requirements/dev/../base/base.txt # boto3 # botocore -jsonschema==3.2.0 - # via kubernetes-validate +jsonschema==4.22.0 + # via + # -r requirements/dev/dev.in + # kubernetes-validate +jsonschema-specifications==2023.12.1 + # via jsonschema kubernetes==12.0.0 # via # -r requirements/dev/dev.in @@ -129,8 +138,6 @@ 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.13.2 @@ -151,6 +158,8 @@ pexpect==4.8.0 # via ipython pickleshare==0.7.5 # via ipython +pkgutil-resolve-name==1.3.10 + # via jsonschema port-for==0.3.1 # via sphinx-autobuild prompt-toolkit==3.0.5 @@ -172,10 +181,6 @@ pygments==2.6.1 # ipython # pudb # sphinx -pyrsistent==0.16.0 - # via - # jsonschema - # referencing python-dateutil==2.8.1 # via # -c requirements/dev/../base/base.txt @@ -198,8 +203,12 @@ pyyaml==5.3.1 # kubernetes # kubernetes-validate # sphinx-autobuild -referencing==0.8.11 - # via kubernetes-validate +referencing==0.35.1 + # via + # -r requirements/dev/dev.in + # jsonschema + # jsonschema-specifications + # kubernetes-validate requests==2.28.2 # via # -c requirements/dev/../base/base.txt @@ -210,6 +219,10 @@ requests-oauthlib==1.3.0 # via kubernetes resolvelib==0.5.4 # via ansible-core +rpds-py==0.18.1 + # via + # jsonschema + # referencing rsa==3.4.2 # via # awscli @@ -227,11 +240,9 @@ six==1.15.0 # -c requirements/dev/../test/test.txt # cfn-flip # google-auth - # jsonschema # kubernetes # livereload # openshift - # pyrsistent # python-dateutil # traitlets # websocket-client @@ -280,7 +291,7 @@ urwid==2.1.0 # via pudb watchdog==0.10.3 # via sphinx-autobuild -wcwidth==0.1.9 +wcwidth==0.2.13 # via # -c requirements/dev/../test/test.txt # prompt-toolkit @@ -288,8 +299,6 @@ 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 diff --git a/requirements/test/test.in b/requirements/test/test.in index 92abd69f..b24248ea 100755 --- a/requirements/test/test.in +++ b/requirements/test/test.in @@ -3,10 +3,10 @@ pyyaml isort -pytest +pytest==5.4.2 pytest-cov factory_boy -pytest-django +pytest-django==3.9.0 coverage # Linting flake8 diff --git a/requirements/test/test.txt b/requirements/test/test.txt index 753c6b99..2b84cd79 100755 --- a/requirements/test/test.txt +++ b/requirements/test/test.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=requirements/test/test.txt requirements/test/test.in # -attrs==19.3.0 +attrs==23.2.0 # via pytest black==24.4.2 # via -r requirements/test/test.in @@ -36,7 +36,7 @@ isort==4.3.21 # via -r requirements/test/test.in mccabe==0.6.1 # via flake8 -more-itertools==8.2.0 +more-itertools==10.3.0 # via pytest mypy-extensions==0.4.3 # via black @@ -56,7 +56,7 @@ pluggy==0.13.1 # via pytest pre-commit==3.5.0 # via -r requirements/test/test.in -py==1.8.1 +py==1.11.0 # via pytest pycodestyle==2.6.0 # via flake8 @@ -91,5 +91,5 @@ typing-extensions==4.11.0 # via black virtualenv==20.17.1 # via pre-commit -wcwidth==0.1.9 +wcwidth==0.2.13 # via pytest