From eef39781801439b1cd8d7e4b5b2aec8d423d80fa Mon Sep 17 00:00:00 2001 From: Mike Kolesnik Date: Mon, 11 Dec 2023 11:14:37 +0200 Subject: [PATCH 1/2] Fix linting image build failure due to PEP 668 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pip had a check enabled that fails the install due to packages being managed by the OS. The added flag ignores this check. Otherwise, the build fails with: ``` 11.85 × This environment is externally managed 11.85 ╰─> 11.85 The system-wide python installation should be maintained using the 11.85 system package manager (apk) only. ... 11.85 note: If you believe this is a mistake, please contact your Python installation or OS distribution provider. You can override this, at the risk of breaking your Python installation or OS, by passing --break-system-packages. 11.85 hint: See PEP 668 for the detailed specification. ``` Signed-off-by: Mike Kolesnik --- package/Dockerfile.shipyard-linting | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/Dockerfile.shipyard-linting b/package/Dockerfile.shipyard-linting index b93ecca53..7d995b809 100644 --- a/package/Dockerfile.shipyard-linting +++ b/package/Dockerfile.shipyard-linting @@ -29,7 +29,7 @@ ENV MARKDOWNLINT_VERSION=0.33.0 \ RUN apk add --no-cache bash findutils git grep make nodejs py3-six shellcheck upx yamllint yq && \ apk add --no-cache --virtual installers npm py3-pip && \ npm install -g markdownlint-cli@${MARKDOWNLINT_VERSION} && \ - pip install gitlint==${GITLINT_VERSION} && \ + pip install --break-system-packages gitlint==${GITLINT_VERSION} && \ find /usr/bin/ -type f -executable -newercc /proc -size +1M \( -execdir upx {} \; -o -true \) && \ find /usr/lib/ -name __pycache__ -type d -exec rm -rf {} + && \ apk del installers From 8fd761f0e54e375bbd126cf665779b13f5b44cd7 Mon Sep 17 00:00:00 2001 From: Daniel Farrell Date: Mon, 20 Nov 2023 11:35:37 -0500 Subject: [PATCH 2/2] Update K8s versions tested in E2E Add Kubernetes 1.26 and 1.28, remove end-of-life 1.22-1.25. Signed-off-by: Daniel Farrell --- .github/workflows/consuming.yml | 10 ++++------ Makefile.inc | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/consuming.yml b/.github/workflows/consuming.yml index dc5f3c180..0d84c0db2 100644 --- a/.github/workflows/consuming.yml +++ b/.github/workflows/consuming.yml @@ -21,7 +21,8 @@ jobs: project: ['admiral', 'lighthouse', 'subctl', 'submariner', 'submariner-operator'] deploytool: ['operator', 'helm'] cabledriver: ['libreswan'] - k8s_version: ['1.25'] + # Run most tests against the latest K8s version + k8s_version: ['1.28'] exclude: # Admiral E2E doesn't respect deploy-tool params, as it uses clusters without Submariner - project: admiral @@ -35,11 +36,8 @@ jobs: cabledriver: wireguard # Test multiple K8s versions only in submariner-operator, balancing coverage and jobs - project: submariner-operator - k8s_version: '1.22' - - project: submariner-operator - k8s_version: '1.23' - - project: submariner-operator - k8s_version: '1.24' + # Bottom of supported K8s version range + k8s_version: '1.26' steps: - name: Check out the ${{ matrix.project }} repository uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 diff --git a/Makefile.inc b/Makefile.inc index 8cb9b8f7e..9db4f156f 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -12,7 +12,7 @@ TIMEOUT ?= 5m export AIR_GAPPED DEBUG_PRINT DUAL_STACK GLOBALNET LOAD_BALANCER PARALLEL PLUGIN PRELOAD_IMAGES PROVIDER SETTINGS TEST_ARGS TIMEOUT # Specific to `clusters` -K8S_VERSION ?= 1.25 +K8S_VERSION ?= 1.28 METALLB_VERSION ?= 0.13.5 OLM_VERSION ?= v0.18.3 export K8S_VERSION METALLB_VERSION OLM OLM_VERSION PROMETHEUS