Merge remote-tracking branch 'origin' into CU-86890uc9q-fix-build

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 \

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: [email protected]
-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

deploy/requirements.yml

@@ -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

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: `[email protected]`)
 
 

requirements/dev/dev.txt

@@ -151,6 +151,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.47