Skip to content

Commit

Permalink
Merge branch 'devel' into group_dependabot
Browse files Browse the repository at this point in the history
  • Loading branch information
tpantelis authored Dec 17, 2023
2 parents c0ca044 + 8fd761f commit ac92e71
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
10 changes: 4 additions & 6 deletions .github/workflows/consuming.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package/Dockerfile.shipyard-linting
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ac92e71

Please sign in to comment.