Skip to content

Commit

Permalink
ipv6-7
Browse files Browse the repository at this point in the history
  • Loading branch information
alpeb committed May 2, 2024
1 parent eb2df39 commit 40d0e7e
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 2 deletions.
41 changes: 40 additions & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Integration tests

on: pull_request
on: push

permissions:
contents: read
Expand Down Expand Up @@ -205,6 +205,45 @@ jobs:
LINKERD_DOCKER_REGISTRY: ${{ env.DOCKER_REGISTRY }}
TAG: ${{ needs.meta.outputs.tag }}

test-ipv6:
needs: [meta, build-cli, build-core]
if: needs.meta.outputs.changed == 'true'
strategy:
matrix:
config:
- kind-ipv6.yml
- kind-dual.yml
test:
- cni-calico-deep
- deep
runs-on: ubuntu-22.04
timeout-minutes: 15
steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491
with:
go-version: "1.22"
- uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427
with:
pattern: image-archives-*
path: image-archives
merge-multiple: true
- run: cp image-archives/linkerd "$HOME" && chmod 755 "$HOME/linkerd"
- run: find image-archives -ls
- uses: helm/kind-action@99576bfa6ddf9a8e612d83b513da5a75875caced
with:
config: test/integration/deep/${{ matrix.config }}
cluster_name: ${{ matrix.test }}
# TODO(alpeb): remove when the default is v1.29 or higher
kubectl_version: v1.29.3
# TODO(alpeb): remove when the default is v0.22.0 or higher
version: v0.22.0
- run: bin/image-load --archive --cluster ${{ matrix.test }} proxy controller policy-controller
- run: bin/tests --images archive --cleanup-docker --skip-cluster-create --name ${{ matrix.test }} "$HOME/linkerd"
env:
LINKERD_DOCKER_REGISTRY: ${{ env.DOCKER_REGISTRY }}
TAG: ${{ needs.meta.outputs.tag }}

##
## Policy: Only run policy tests when the policy controller or proxy changes
##
Expand Down
3 changes: 2 additions & 1 deletion bin/_test-helpers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ testdir="$bindir"/../test/integration

export default_test_names=(deep deep-native-sidecar viz external helm-upgrade uninstall upgrade-edge default-policy-deny rsa-ca)
export external_resource_test_names=(external-resources)
export all_test_names=(cluster-domain cni-calico-deep multicluster "${default_test_names[*]}" "${external_resource_test_names[*]}")
export dual_stack_test_names=(deep-dual-stack cni-calico-deep-dual-stack)
export all_test_names=(cluster-domain cni-calico-deep multicluster "${default_test_names[*]}" "${external_resource_test_names[*]}" "${dual_stack_test_names[*]}")
images_load_default=(proxy controller policy-controller web metrics-api tap)

tests_usage() {
Expand Down
4 changes: 4 additions & 0 deletions test/integration/deep/kind-dualstack.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
kind: Cluster
apiVersion: kind.x-k8s.io/v1alpha4
networking:
ipFamily: dual
4 changes: 4 additions & 0 deletions test/integration/deep/kind-ipv6.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
kind: Cluster
apiVersion: kind.x-k8s.io/v1alpha4
networking:
ipFamily: ipv6

0 comments on commit 40d0e7e

Please sign in to comment.