diff --git a/package/Dockerfile.shipyard-dapper-base b/package/Dockerfile.shipyard-dapper-base index 0143cf50..a53c437d 100644 --- a/package/Dockerfile.shipyard-dapper-base +++ b/package/Dockerfile.shipyard-dapper-base @@ -4,7 +4,7 @@ FROM fedora:41 # good balance between compression time and resulting image size. ARG UPX_LEVEL=-5 ENV DAPPER_HOST_ARCH=amd64 SHIPYARD_DIR=/opt/shipyard SHELL=/bin/bash \ - DAPPER_RUN_ARGS="--net=kind" + DAPPER_RUN_ARGS="--net=kind --cap-add=NET_ADMIN --privileged=true" ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH} PATH=/go/bin:/root/.local/bin:/usr/local/go/bin:$PATH \ GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm=armv6l GOLANG_ARCH=GOLANG_ARCH_${DAPPER_HOST_ARCH} \ GOPATH=/go GO111MODULE=on GOPROXY=https://proxy.golang.org \ diff --git a/scripts/shared/lib/clusters_kind b/scripts/shared/lib/clusters_kind index 953d5da5..0babde3c 100755 --- a/scripts/shared/lib/clusters_kind +++ b/scripts/shared/lib/clusters_kind @@ -196,12 +196,24 @@ EOF function deploy_kind_ovn(){ export K8S_VERSION - export NET_CIDR_IPV4="${cluster_CIDRs[${cluster}]}" - export SVC_CIDR_IPV4="${service_CIDRs[${cluster}]}" + export SVC_CIDR_IPV4 + export NET_CIDR_IPV4 + export SVC_CIDR_IPV6 + export NET_CIDR_IPV6 export KIND_CLUSTER_NAME="${cluster}" local ovn_flags=() [[ "$OVN_IC" != true ]] || ovn_flags=( -ic -npz 1 -wk 3 ) + + if [[ "$IPV6_STACK" ]]; then + ovn_flags+=( -n4 -i6 -sw) + SVC_CIDR_IPV6="${service_IPv6_CIDRs[${cluster}]}" + NET_CIDR_IPV6="${cluster_IPv6_CIDRs[${cluster}]}" + else + NET_CIDR_IPV4="${cluster_CIDRs[${cluster}]}" + SVC_CIDR_IPV4="${service_CIDRs[${cluster}]}" + fi + delete_cluster_on_fail ./ovn-kubernetes/contrib/kind.sh -ov "$OVN_IMAGE" -cn "${KIND_CLUSTER_NAME}" -ric "${ovn_flags[@]}" -lr -dd "${KIND_CLUSTER_NAME}.local" --disable-ovnkube-identity [[ "$AIR_GAPPED" = true ]] && air_gap_iptables