mirror of
https://git.vectorsigma.ru/public/k3s.git
synced 2026-08-09 08:30:03 +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>
126 lines
3.5 KiB
Bash
Executable File
126 lines
3.5 KiB
Bash
Executable File
#!/bin/bash
|
|
set -e -x
|
|
|
|
cd $(dirname $0)/..
|
|
|
|
. ./scripts/version.sh
|
|
|
|
GO=${GO-go}
|
|
|
|
PKG="github.com/rancher/k3s"
|
|
PKG_CONTAINERD="github.com/containerd/containerd"
|
|
PKG_K3S_CONTAINERD="github.com/k3s-io/containerd"
|
|
PKG_CRICTL="github.com/kubernetes-sigs/cri-tools"
|
|
PKG_K8S_BASE="k8s.io/component-base"
|
|
PKG_K8S_CLIENT="k8s.io/client-go/pkg"
|
|
|
|
buildDate=$(date -u '+%Y-%m-%dT%H:%M:%SZ')
|
|
|
|
VERSIONFLAGS="
|
|
-X ${PKG}/pkg/version.Version=${VERSION}
|
|
-X ${PKG}/pkg/version.GitCommit=${COMMIT:0:8}
|
|
|
|
-X ${PKG_K8S_CLIENT}/version.gitVersion=${VERSION}
|
|
-X ${PKG_K8S_CLIENT}/version.gitCommit=${COMMIT}
|
|
-X ${PKG_K8S_CLIENT}/version.gitTreeState=${TREE_STATE}
|
|
-X ${PKG_K8S_CLIENT}/version.buildDate=${buildDate}
|
|
|
|
-X ${PKG_K8S_BASE}/version.gitVersion=${VERSION}
|
|
-X ${PKG_K8S_BASE}/version.gitCommit=${COMMIT}
|
|
-X ${PKG_K8S_BASE}/version.gitTreeState=${TREE_STATE}
|
|
-X ${PKG_K8S_BASE}/version.buildDate=${buildDate}
|
|
|
|
-X ${PKG_CRICTL}/version.Version=${VERSION_CRICTL}
|
|
|
|
-X ${PKG_CONTAINERD}/version.Version=${VERSION_CONTAINERD}
|
|
-X ${PKG_CONTAINERD}/version.Package=${PKG_K3S_CONTAINERD}
|
|
-X ${PKG_CRICTL}/pkg/version.Version=${VERSION_CRICTL}
|
|
"
|
|
LDFLAGS="
|
|
-w -s"
|
|
|
|
STATIC="
|
|
-extldflags '-static -lm -ldl -lz -lpthread'
|
|
"
|
|
TAGS="ctrd apparmor seccomp no_btrfs netcgo osusergo providerless"
|
|
RUNC_TAGS="apparmor seccomp"
|
|
RUNC_STATIC="static"
|
|
|
|
if [ "$SELINUX" = "true" ]; then
|
|
TAGS="$TAGS selinux"
|
|
RUNC_TAGS="$RUNC_TAGS selinux"
|
|
fi
|
|
|
|
if [ "$STATIC_BUILD" != "true" ]; then
|
|
STATIC="
|
|
"
|
|
RUNC_STATIC=""
|
|
else
|
|
TAGS="static_build libsqlite3 $TAGS"
|
|
fi
|
|
|
|
mkdir -p bin
|
|
|
|
if [ ${ARCH} = armv7l ] || [ ${ARCH} = arm ]; then
|
|
export GOARCH="arm"
|
|
export GOARM="7"
|
|
fi
|
|
|
|
if [ ${ARCH} = s390x ]; then
|
|
export GOARCH="s390x"
|
|
fi
|
|
|
|
rm -f \
|
|
bin/k3s-agent \
|
|
bin/k3s-server \
|
|
bin/k3s-etcd-snapshot \
|
|
bin/k3s-secrets-encrypt \
|
|
bin/k3s-certificate \
|
|
bin/kubectl \
|
|
bin/crictl \
|
|
bin/ctr \
|
|
bin/containerd \
|
|
bin/containerd-shim \
|
|
bin/containerd-shim-runc-v2 \
|
|
bin/runc
|
|
|
|
cleanup() {
|
|
exit_status=$?
|
|
rm -rf $TMPDIR
|
|
exit ${exit_status}
|
|
}
|
|
|
|
INSTALLBIN=$(pwd)/bin
|
|
if [ ! -x ${INSTALLBIN}/cni ]; then
|
|
(
|
|
echo Building cni
|
|
TMPDIR=$(mktemp -d)
|
|
trap cleanup EXIT
|
|
WORKDIR=$TMPDIR/src/github.com/containernetworking/plugins
|
|
git clone -b $VERSION_CNIPLUGINS https://github.com/rancher/plugins.git $WORKDIR
|
|
cd $WORKDIR
|
|
GO111MODULE=off GOPATH=$TMPDIR CGO_ENABLED=0 "${GO}" build -tags "$TAGS" -ldflags "$LDFLAGS $STATIC" -o $INSTALLBIN/cni
|
|
)
|
|
fi
|
|
|
|
echo Building k3s
|
|
CGO_ENABLED=1 "${GO}" build -tags "$TAGS" -ldflags "$VERSIONFLAGS $LDFLAGS $STATIC" -o bin/containerd ./cmd/server/main.go
|
|
ln -s containerd ./bin/k3s-agent
|
|
ln -s containerd ./bin/k3s-server
|
|
ln -s containerd ./bin/k3s-etcd-snapshot
|
|
ln -s containerd ./bin/k3s-secrets-encrypt
|
|
ln -s containerd ./bin/k3s-certificate
|
|
ln -s containerd ./bin/kubectl
|
|
ln -s containerd ./bin/crictl
|
|
ln -s containerd ./bin/ctr
|
|
|
|
echo Building runc
|
|
rm -f ./build/src/github.com/opencontainers/runc/runc
|
|
GO111MODULE=off make GOPATH=$(pwd)/build EXTRA_LDFLAGS="-w -s" BUILDTAGS="$RUNC_TAGS" -C ./build/src/github.com/opencontainers/runc $RUNC_STATIC
|
|
cp -f ./build/src/github.com/opencontainers/runc/runc ./bin/runc
|
|
|
|
echo Building containerd-shim-runc-v2
|
|
rm -f ./vendor/github.com/containerd/containerd/bin/containerd-shim-runc-v2
|
|
GO111MODULE=off make -C ./vendor/github.com/containerd/containerd bin/containerd-shim-runc-v2
|
|
cp -f ./vendor/github.com/containerd/containerd/bin/containerd-shim-runc-v2 ./bin/containerd-shim-runc-v2
|