mirror of
https://git.vectorsigma.ru/public/k3s.git
synced 2026-08-06 03:29:32 +00:00
7ea6f13154
* netpol: Add dual-stack support This change allows to define two cluster CIDRs for compatibility with Kubernetes dual-stuck, with an assumption that two CIDRs are usually IPv4 and IPv6. It does that by levearaging changes in out kube-router fork, with the following downstream release: https://github.com/k3s-io/kube-router/releases/tag/v1.3.2%2Bk3s Signed-off-by: Michal Rostecki <vadorovsky@gmail.com> Signed-off-by: Derek Nola <derek.nola@suse.com> * Add s390x arch support for k3s (#5018) * Update docs to include s390x arch Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Add s390x drone pipeline Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Install trivy linux arch only for amd64 This is done so that trivy is not installed for s390x arch Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Add s390x arch if condition for Dockerfile.test Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Add s390x arch in install script Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Add s390x GOARCH in build script Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Add SUFFIX s390x in scripts Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Skip image scan for s390x arch Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Update klipper-lb to version v0.3.5 Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Update traefik version to v2.6.2 Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Update registry to v2.8.1 in tests which supports s390x Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Skip compact tests for s390x arch This is done because compact test require a previous k3s version which supports s390x and it is not available Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> Signed-off-by: Derek Nola <derek.nola@suse.com> * Increase k3s-root version to v0.10.0 which includes s390x support Signed-off-by: Derek Nola <derek.nola@suse.com> Co-authored-by: Michal Rostecki <vadorovsky@gmail.com> Co-authored-by: Sakala Venkata Krishna Rohit <rohitsakala@gmail.com>
67 lines
1.5 KiB
Bash
Executable File
67 lines
1.5 KiB
Bash
Executable File
#!/bin/bash
|
|
set -e -x
|
|
|
|
cd $(dirname $0)/..
|
|
|
|
. ./scripts/version.sh
|
|
|
|
GO=${GO-go}
|
|
|
|
for i in crictl kubectl k3s-agent k3s-server k3s-etcd-snapshot k3s-secrets-encrypt k3s-certificate k3s ; do
|
|
rm -f bin/$i
|
|
ln -s containerd bin/$i
|
|
done
|
|
|
|
for i in bridge flannel host-local loopback portmap; do
|
|
rm -f bin/$i
|
|
ln -s cni bin/$i
|
|
done
|
|
|
|
cp contrib/util/check-config.sh bin/check-config
|
|
|
|
rm -rf build/data
|
|
mkdir -p build/data build/out
|
|
mkdir -p dist/artifacts
|
|
|
|
(
|
|
set +x
|
|
cd bin
|
|
find . -not -path '*/\.*' -type f -exec sha256sum {} \; | sed -e 's| \./| |' | sort -k2 >.sha256sums
|
|
(
|
|
for f in $(find . -type l); do
|
|
echo $f $(readlink $f)
|
|
done
|
|
) | sed -e 's|^\./||' | sort >.links
|
|
set -x
|
|
)
|
|
|
|
tar cvf ./build/out/data.tar ./bin ./etc
|
|
zstd --no-progress -T0 -16 -f --long=25 --rm ./build/out/data.tar -o ./build/out/data.tar.zst
|
|
HASH=$(sha256sum ./build/out/data.tar.zst | awk '{print $1}')
|
|
|
|
cp ./build/out/data.tar.zst ./build/data/${HASH}.tar.zst
|
|
|
|
BIN_SUFFIX="-${ARCH}"
|
|
if [ ${ARCH} = amd64 ]; then
|
|
BIN_SUFFIX=""
|
|
elif [ ${ARCH} = arm ]; then
|
|
BIN_SUFFIX="-armhf"
|
|
elif [ ${ARCH} = s390x ]; then
|
|
BIN_SUFFIX="-s390x"
|
|
fi
|
|
|
|
CMD_NAME=dist/artifacts/k3s${BIN_SUFFIX}
|
|
|
|
"${GO}" generate
|
|
LDFLAGS="
|
|
-X github.com/rancher/k3s/pkg/version.Version=$VERSION
|
|
-X github.com/rancher/k3s/pkg/version.GitCommit=${COMMIT:0:8}
|
|
-w -s
|
|
"
|
|
STATIC="-extldflags '-static'"
|
|
CGO_ENABLED=0 "${GO}" build -ldflags "$LDFLAGS $STATIC" -o ${CMD_NAME} ./cmd/k3s/main.go
|
|
|
|
stat ${CMD_NAME}
|
|
|
|
./scripts/build-upload ${CMD_NAME} ${COMMIT}
|