From b12c40304ab33d5f1bd72376f6fcf0bbdd7e09f6 Mon Sep 17 00:00:00 2001 From: Dylan Leard Date: Thu, 9 Jan 2025 15:13:16 -0800 Subject: [PATCH 01/18] chore: update hpa k8s api version --- chart/cas-cif/templates/hpa.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart/cas-cif/templates/hpa.yaml b/chart/cas-cif/templates/hpa.yaml index ac1c66f549..a689c05785 100644 --- a/chart/cas-cif/templates/hpa.yaml +++ b/chart/cas-cif/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ include "cas-cif.fullname" . }} From 96fe915cdefdab2bc1649a4a2276edb8b5369cc7 Mon Sep 17 00:00:00 2001 From: Dylan Leard Date: Thu, 9 Jan 2025 16:12:13 -0800 Subject: [PATCH 02/18] chore: add oc-installer to gh action --- .github/workflows/lint-chart.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/lint-chart.yml b/.github/workflows/lint-chart.yml index 7bb6223f85..8f13af07c4 100644 --- a/.github/workflows/lint-chart.yml +++ b/.github/workflows/lint-chart.yml @@ -10,6 +10,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - name: Install oc + uses: redhat-actions/oc-installer@v1 + with: + oc_version: "4.6" - name: Authenticate to OpenShift Linter namespace uses: redhat-actions/oc-login@v1 with: From 09dc2b7e95b34da7b96d86fb1f96e03cdd700bee Mon Sep 17 00:00:00 2001 From: Dylan Leard Date: Thu, 9 Jan 2025 16:37:32 -0800 Subject: [PATCH 03/18] chore: update tool-versions to pg16 --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index f3e6fa0ca5..a3c95e61c3 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,5 +1,5 @@ nodejs 20.14.0 yarn 1.22.22 -postgres 14.0 +postgres 16.0 python 3.9.19 golang 1.22.0 From 483adffdcec05b4125d98f9b28e0807a7bb49e3c Mon Sep 17 00:00:00 2001 From: Dylan Leard Date: Thu, 9 Jan 2025 16:49:39 -0800 Subject: [PATCH 04/18] chore: add --without-readline flag to make install dev tools --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4462536cd4..e1cabb92b3 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ install_asdf_tools: @cat .tool-versions | cut -f 1 -d ' ' | xargs -n 1 asdf plugin-add || true @asdf plugin-update --all @#MAKELEVEL=0 is required because of https://www.postgresql.org/message-id/1118.1538056039%40sss.pgh.pa.us - @MAKELEVEL=0 POSTGRES_EXTRA_CONFIGURE_OPTIONS='--with-libxml' asdf install + @MAKELEVEL=0 POSTGRES_EXTRA_CONFIGURE_OPTIONS='--with-libxml --without-readline' asdf install @asdf reshim @pip install -r requirements.txt @asdf reshim From 824d8cc221153b7fd6e6276e9d0e1559efdd12fc Mon Sep 17 00:00:00 2001 From: Dylan Leard Date: Thu, 9 Jan 2025 17:04:25 -0800 Subject: [PATCH 05/18] chore: add uuid to postgres install --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e1cabb92b3..5058257d6d 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ install_asdf_tools: @cat .tool-versions | cut -f 1 -d ' ' | xargs -n 1 asdf plugin-add || true @asdf plugin-update --all @#MAKELEVEL=0 is required because of https://www.postgresql.org/message-id/1118.1538056039%40sss.pgh.pa.us - @MAKELEVEL=0 POSTGRES_EXTRA_CONFIGURE_OPTIONS='--with-libxml --without-readline' asdf install + @MAKELEVEL=0 POSTGRES_EXTRA_CONFIGURE_OPTIONS='--with-libxml --without-readline --with-uuid' asdf install @asdf reshim @pip install -r requirements.txt @asdf reshim From f04479e67ee322c4fa30311b38e93a9885180867 Mon Sep 17 00:00:00 2001 From: Dylan Leard Date: Thu, 9 Jan 2025 17:11:34 -0800 Subject: [PATCH 06/18] chore: add arg to --with-uuid flag --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5058257d6d..552686be7e 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ install_asdf_tools: @cat .tool-versions | cut -f 1 -d ' ' | xargs -n 1 asdf plugin-add || true @asdf plugin-update --all @#MAKELEVEL=0 is required because of https://www.postgresql.org/message-id/1118.1538056039%40sss.pgh.pa.us - @MAKELEVEL=0 POSTGRES_EXTRA_CONFIGURE_OPTIONS='--with-libxml --without-readline --with-uuid' asdf install + @MAKELEVEL=0 POSTGRES_EXTRA_CONFIGURE_OPTIONS='--with-libxml --without-readline --with-uuid=e2fs' asdf install @asdf reshim @pip install -r requirements.txt @asdf reshim From 8f450b1b792b643149e8fd57b6cd31292800cd56 Mon Sep 17 00:00:00 2001 From: Dylan Leard Date: Thu, 9 Jan 2025 17:19:33 -0800 Subject: [PATCH 07/18] chore: add with-openssl flag to postgres install --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 552686be7e..7b2e1ce126 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ install_asdf_tools: @cat .tool-versions | cut -f 1 -d ' ' | xargs -n 1 asdf plugin-add || true @asdf plugin-update --all @#MAKELEVEL=0 is required because of https://www.postgresql.org/message-id/1118.1538056039%40sss.pgh.pa.us - @MAKELEVEL=0 POSTGRES_EXTRA_CONFIGURE_OPTIONS='--with-libxml --without-readline --with-uuid=e2fs' asdf install + @MAKELEVEL=0 POSTGRES_EXTRA_CONFIGURE_OPTIONS='--with-openssl --with-libxml --without-readline --with-uuid=e2fs' asdf install @asdf reshim @pip install -r requirements.txt @asdf reshim From 555030e3ba85d5ccb73695bafbcbd4622e931d04 Mon Sep 17 00:00:00 2001 From: Dylan Leard Date: Thu, 9 Jan 2025 17:23:43 -0800 Subject: [PATCH 08/18] chore: undo changes to makefile, add packages to github workflow --- .github/actions/dev-env-setup/action.yml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/dev-env-setup/action.yml b/.github/actions/dev-env-setup/action.yml index 73963bbb1f..14ecd92477 100644 --- a/.github/actions/dev-env-setup/action.yml +++ b/.github/actions/dev-env-setup/action.yml @@ -7,7 +7,7 @@ runs: uses: asdf-vm/actions/setup@v1 - uses: shogo82148/actions-setup-perl@v1 - name: install pg perl library - run: sudo apt-get install -y libpq-dev libdbd-pg-perl + run: sudo apt-get install -y libpq-dev libdbd-pg-perl libreadline6 uuid shell: bash - name: set perl env variables shell: bash diff --git a/Makefile b/Makefile index 7b2e1ce126..4462536cd4 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ install_asdf_tools: @cat .tool-versions | cut -f 1 -d ' ' | xargs -n 1 asdf plugin-add || true @asdf plugin-update --all @#MAKELEVEL=0 is required because of https://www.postgresql.org/message-id/1118.1538056039%40sss.pgh.pa.us - @MAKELEVEL=0 POSTGRES_EXTRA_CONFIGURE_OPTIONS='--with-openssl --with-libxml --without-readline --with-uuid=e2fs' asdf install + @MAKELEVEL=0 POSTGRES_EXTRA_CONFIGURE_OPTIONS='--with-libxml' asdf install @asdf reshim @pip install -r requirements.txt @asdf reshim From ec30804fa51621e5ae98df0ed260829fde186537 Mon Sep 17 00:00:00 2001 From: Dylan Leard Date: Thu, 9 Jan 2025 17:27:18 -0800 Subject: [PATCH 09/18] chore: change package name in gh action --- .github/actions/dev-env-setup/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/dev-env-setup/action.yml b/.github/actions/dev-env-setup/action.yml index 14ecd92477..9f81583dc5 100644 --- a/.github/actions/dev-env-setup/action.yml +++ b/.github/actions/dev-env-setup/action.yml @@ -7,7 +7,7 @@ runs: uses: asdf-vm/actions/setup@v1 - uses: shogo82148/actions-setup-perl@v1 - name: install pg perl library - run: sudo apt-get install -y libpq-dev libdbd-pg-perl libreadline6 uuid + run: sudo apt-get install -y libpq-dev libdbd-pg-perl libreadline-dev uuid shell: bash - name: set perl env variables shell: bash From 49c57b3c1f969ccb8b885d6a7658fe9a66201832 Mon Sep 17 00:00:00 2001 From: Dylan Leard Date: Thu, 9 Jan 2025 17:33:39 -0800 Subject: [PATCH 10/18] chore: uuid error --- .github/actions/dev-env-setup/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/dev-env-setup/action.yml b/.github/actions/dev-env-setup/action.yml index 9f81583dc5..3194bc0cea 100644 --- a/.github/actions/dev-env-setup/action.yml +++ b/.github/actions/dev-env-setup/action.yml @@ -7,7 +7,7 @@ runs: uses: asdf-vm/actions/setup@v1 - uses: shogo82148/actions-setup-perl@v1 - name: install pg perl library - run: sudo apt-get install -y libpq-dev libdbd-pg-perl libreadline-dev uuid + run: sudo apt-get install -y libpq-dev libdbd-pg-perl libreadline-dev libuuid-devel shell: bash - name: set perl env variables shell: bash From 41c8b438feca0edf657ab14d4ae5cb79a8faa4b4 Mon Sep 17 00:00:00 2001 From: Dylan Leard Date: Thu, 9 Jan 2025 17:37:28 -0800 Subject: [PATCH 11/18] chore: uuid --- .github/actions/dev-env-setup/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/dev-env-setup/action.yml b/.github/actions/dev-env-setup/action.yml index 3194bc0cea..1c6e6a1493 100644 --- a/.github/actions/dev-env-setup/action.yml +++ b/.github/actions/dev-env-setup/action.yml @@ -7,7 +7,7 @@ runs: uses: asdf-vm/actions/setup@v1 - uses: shogo82148/actions-setup-perl@v1 - name: install pg perl library - run: sudo apt-get install -y libpq-dev libdbd-pg-perl libreadline-dev libuuid-devel + run: sudo apt-get install -y libpq-dev libdbd-pg-perl libreadline-dev uuid-dev shell: bash - name: set perl env variables shell: bash From 417ee8d545613efd2418af2349934382bac88732 Mon Sep 17 00:00:00 2001 From: Dylan Leard Date: Fri, 10 Jan 2025 08:50:42 -0800 Subject: [PATCH 12/18] chore: update pgtap version --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4462536cd4..1f1bbe54e6 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ SQITCH_VERSION=${word 3,${shell ${SQITCH} --version}} SQITCH_MIN_VERSION=1.1.0 DB_NAME=cif PG_PROVE=pg_prove -h localhost -PGTAP_VERSION=1.2.0 +PGTAP_VERSION=1.3.3 help: ## Show this help. @sed -ne '/@sed/!s/## //p' $(MAKEFILE_LIST) From 12f82c6bc879b75712f99e3464819f452d7caf7b Mon Sep 17 00:00:00 2001 From: Dylan Leard Date: Fri, 10 Jan 2025 09:21:45 -0800 Subject: [PATCH 13/18] chore: add libsqlite3-dev package in ci --- .github/actions/dev-env-setup/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/dev-env-setup/action.yml b/.github/actions/dev-env-setup/action.yml index 1c6e6a1493..7929bd9b55 100644 --- a/.github/actions/dev-env-setup/action.yml +++ b/.github/actions/dev-env-setup/action.yml @@ -7,7 +7,7 @@ runs: uses: asdf-vm/actions/setup@v1 - uses: shogo82148/actions-setup-perl@v1 - name: install pg perl library - run: sudo apt-get install -y libpq-dev libdbd-pg-perl libreadline-dev uuid-dev + run: sudo apt-get install -y libpq-dev libdbd-pg-perl libreadline-dev uuid-dev libsqlite3-dev shell: bash - name: set perl env variables shell: bash From 9eaf88e4d4483012614e2adea08cf7c9742df29c Mon Sep 17 00:00:00 2001 From: Dylan Leard Date: Fri, 10 Jan 2025 09:36:40 -0800 Subject: [PATCH 14/18] chore: update pre-commit version --- .github/actions/dev-env-setup/action.yml | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/dev-env-setup/action.yml b/.github/actions/dev-env-setup/action.yml index 7929bd9b55..1c6e6a1493 100644 --- a/.github/actions/dev-env-setup/action.yml +++ b/.github/actions/dev-env-setup/action.yml @@ -7,7 +7,7 @@ runs: uses: asdf-vm/actions/setup@v1 - uses: shogo82148/actions-setup-perl@v1 - name: install pg perl library - run: sudo apt-get install -y libpq-dev libdbd-pg-perl libreadline-dev uuid-dev libsqlite3-dev + run: sudo apt-get install -y libpq-dev libdbd-pg-perl libreadline-dev uuid-dev shell: bash - name: set perl env variables shell: bash diff --git a/requirements.txt b/requirements.txt index 517530a06b..cda962d7ab 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -pre-commit==2.19.0 +pre-commit==4.0.1 gitlint==0.17.0 From ff652567525a06e8b319489a27bf7c5e7c45a0f5 Mon Sep 17 00:00:00 2001 From: Dylan Leard Date: Fri, 10 Jan 2025 10:19:23 -0800 Subject: [PATCH 15/18] chore: pre-commit --- .tool-versions | 2 +- requirements.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.tool-versions b/.tool-versions index a3c95e61c3..b2c7fcd780 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,5 +1,5 @@ nodejs 20.14.0 yarn 1.22.22 postgres 16.0 -python 3.9.19 +python 3.11.0 golang 1.22.0 diff --git a/requirements.txt b/requirements.txt index cda962d7ab..6c4180d023 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,3 @@ -pre-commit==4.0.1 +setuptools=75.8.0 +pre-commit==3.8.0 gitlint==0.17.0 From 97ab8a29636a2db9839b6b94ca2195c1f871c7b7 Mon Sep 17 00:00:00 2001 From: Dylan Leard Date: Fri, 10 Jan 2025 10:42:29 -0800 Subject: [PATCH 16/18] chore: pre-commit --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6c4180d023..6380dfb9ca 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -setuptools=75.8.0 +setuptools==75.8.0 pre-commit==3.8.0 gitlint==0.17.0 From 2e733fc610949572fc87296fd33d4f05c345a4b0 Mon Sep 17 00:00:00 2001 From: Dylan Leard Date: Fri, 10 Jan 2025 11:14:22 -0800 Subject: [PATCH 17/18] chore: add missing package to ci --- .github/actions/dev-env-setup/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/dev-env-setup/action.yml b/.github/actions/dev-env-setup/action.yml index 1c6e6a1493..7929bd9b55 100644 --- a/.github/actions/dev-env-setup/action.yml +++ b/.github/actions/dev-env-setup/action.yml @@ -7,7 +7,7 @@ runs: uses: asdf-vm/actions/setup@v1 - uses: shogo82148/actions-setup-perl@v1 - name: install pg perl library - run: sudo apt-get install -y libpq-dev libdbd-pg-perl libreadline-dev uuid-dev + run: sudo apt-get install -y libpq-dev libdbd-pg-perl libreadline-dev uuid-dev libsqlite3-dev shell: bash - name: set perl env variables shell: bash From f1ae450f6b04ae4cc8cffcf1def0b8b91f8bc535 Mon Sep 17 00:00:00 2001 From: Dylan Leard Date: Fri, 10 Jan 2025 11:21:42 -0800 Subject: [PATCH 18/18] chore: invalidate asdf cache in ci --- .github/actions/dev-env-setup/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/dev-env-setup/action.yml b/.github/actions/dev-env-setup/action.yml index 7929bd9b55..bc3ebe844f 100644 --- a/.github/actions/dev-env-setup/action.yml +++ b/.github/actions/dev-env-setup/action.yml @@ -23,7 +23,7 @@ runs: with: path: | ~/.asdf - key: ${{ runner.os }}-asdf-cache-${{ hashFiles('.tool-versions') }} + key: ${{ runner.os }}-asdf-cache-${{ hashFiles('.tool-versions') }}-v1 - uses: actions/cache@v3 id: perl-cache with: