Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: correct to create kubernetes with helm/kind-action. #1524

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions .github/workflows/kind-e2e.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: kind-e2e
on:
push:
branches: [main]
workflow_dispatch:
jobs:
kind-e2e:
Expand All @@ -11,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
k8sVersion: ["1.25.x", "1.26.x", "1.27.x", "1.28.x", "1.29.x", "1.30.x"]
k8sVersion: ["1.25.0", "1.26.0", "1.27.0", "1.28.0", "1.29.0", "1.30.0"]
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- name: Set up Python 3.10
Expand All @@ -23,6 +22,8 @@ jobs:
k8sVersion: ${{ matrix.k8sVersion }}
- name: Kind Cluster
uses: helm/kind-action@0025e74a8c7512023d06dc019c617aa3cf561fde # v1.10.0
with:
node_image: docker.io/kindest/node:v${{matrix.k8sVersion}}
- name: check kind cluster and taint nodes
shell: bash
run: |
Expand All @@ -37,7 +38,7 @@ jobs:
shell: bash
run: |
make toolchain
make install-kwok
#make install-kwok
export KWOK_REPO=kind.local
export KIND_CLUSTER_NAME=chart-testing
make apply-with-kind
Expand Down Expand Up @@ -70,6 +71,11 @@ jobs:
export OUTPUT_DIR
echo OUTPUT_DIR="$OUTPUT_DIR" >> "$GITHUB_ENV"
make e2etests
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808
if: always()
with:
name: artifacts_${{ matrix.k8sVersion}}
path: ${{ env.OUTPUT_DIR }}
- name: run test analysis
shell: bash
run: |
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/presubmit.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: presubmit
on:
push:
branches: [main]
pull_request:
workflow_dispatch:
permissions:
Expand All @@ -14,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
k8sVersion: ["1.25.x", "1.26.x", "1.27.x", "1.28.x", "1.29.x", "1.30.x"]
k8sVersion: ["1.25.0", "1.26.x", "1.27.x", "1.28.x", "1.29.x", "1.30.x"]
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: ./.github/actions/install-deps
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ apply-with-kind: verify build-with-kind ## Deploy the kwok controller from the c
e2etests: ## Run the e2e suite against your local cluster
cd test && go test \
-count 1 \
-timeout 30m \
-timeout 120m \
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's testing

-v \
./suites/$(shell echo $(TEST_SUITE) | tr A-Z a-z)/... \
--ginkgo.focus="${FOCUS}" \
--ginkgo.timeout=30m \
--ginkgo.timeout=120m \
--ginkgo.grace-period=5m \
--ginkgo.vv

Expand Down
2 changes: 1 addition & 1 deletion hack/toolchain.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ kubebuilder() {
find $KUBEBUILDER_ASSETS

# Install latest binaries for 1.25.x (contains CEL fix)
if [[ "${K8S_VERSION}" = "1.25.x" ]] && [[ "$OSTYPE" == "linux"* ]]; then
if [[ "${K8S_VERSION}" = "1.25.0" ]] && [[ "$OSTYPE" == "linux"* ]]; then
for binary in 'kube-apiserver' 'kubectl'; do
rm $KUBEBUILDER_ASSETS/$binary
wget -P $KUBEBUILDER_ASSETS dl.k8s.io/v1.25.16/bin/linux/${arch}/${binary}
Expand Down
Loading