Skip to content

Commit c940b17

Browse files
committed
Update integration script to skip checks for Kubernetes versions <1.31 and adjust private registry configuration
1 parent 4fead05 commit c940b17

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

.github/workflows/workflow.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ jobs:
4545
env:
4646
CROSS: 1
4747
TAG: ${{ startsWith(github.ref, 'refs/tags/') && github.ref_name || '' }}
48-
STAGE_REGISTRY_ENDPOINT: ${{ secrets.STAGE_REGISTRY_ENDPOINT }}
49-
STAGE_REGISTRY_USERNAME: ${{ secrets.STAGE_REGISTRY_USERNAME }}
50-
STAGE_REGISTRY_PASSWORD: ${{ secrets.STAGE_REGISTRY_PASSWORD }}
5148
- name: Generate sha256 file for release
5249
if: github.event_name == 'push' && github.ref_type == 'tag'
5350
run: |

scripts/integration

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,17 @@ if [ "$default_version_found" == "false" ]; then
7979
fi
8080

8181
for ver in "${!versions_to_test[@]}"; do
82+
8283
version_to_test=${versions_to_test["${ver}"]}
8384
echo_with_time "Testing version ${version_to_test}"
8485

86+
MAJOR_VERSION=$(echo ${version_to_test} | cut -d. -f1 | sed 's/v//')
8587
MINOR_VERSION=$(echo ${version_to_test} | cut -d. -f2)
88+
if [ ${MAJOR_VERSION} -eq 1 ] && [ ${MINOR_VERSION} -lt 31 ]; then
89+
echo_with_time "Skipping checks for k8s version ${version_to_test} (<1.31)"
90+
continue
91+
fi
92+
8693
if [ ${MINOR_VERSION} -ge 30 ] && [ "${NETWORK_PLUGIN}" == "weave" ]; then
8794
echo "Skipping weave testing with ${version_to_test} since weave is not supported for version >=1.30.0"
8895
continue
@@ -119,6 +126,7 @@ private_registries:
119126
- url: ${STAGE_REGISTRY_ENDPOINT}
120127
user: ${STAGE_REGISTRY_USERNAME}
121128
password: ${STAGE_REGISTRY_PASSWORD}
129+
is_default: true
122130
EOF
123131

124132
if [ "x${NETWORK_PLUGIN}" != "x" ]; then

0 commit comments

Comments
 (0)